diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-11-21 14:30:39 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-11-21 14:30:39 +0000 |
| commit | 9c8d5c5113810b7977f31fb7b5476071de6ec77e (patch) | |
| tree | 43d19a13540a65b140ba8b4a1cc55f89b2b06625 /sys-freebsd | |
| parent | Disable stripping from bsdmk.eclass rather than changing the mk defs. (diff) | |
| download | gentoo-2-9c8d5c5113810b7977f31fb7b5476071de6ec77e.tar.gz gentoo-2-9c8d5c5113810b7977f31fb7b5476071de6ec77e.tar.bz2 gentoo-2-9c8d5c5113810b7977f31fb7b5476071de6ec77e.zip | |
Don't change the mk definitions files to avoid -Werror and stripping during install, handle that in bsdmk.eclass.
(Portage version: 2.1.2_rc2-r1)
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/freebsd-mk-defs/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch | 41 |
2 files changed, 6 insertions, 42 deletions
diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog index 49f0bb67e9fe..009d8f432c09 100644 --- a/sys-freebsd/freebsd-mk-defs/ChangeLog +++ b/sys-freebsd/freebsd-mk-defs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-freebsd/freebsd-mk-defs # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.24 2006/11/19 01:38:37 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.25 2006/11/21 14:30:39 flameeyes Exp $ + + 21 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + files/freebsd-mk-defs-6.2-2-gentoo.patch: + Don't change the mk definitions files to avoid -Werror and stripping during + install, handle that in bsdmk.eclass. *freebsd-mk-defs-6.2_rc1 (19 Nov 2006) diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch index 7a44c27e0458..613aac808b1a 100644 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch +++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch @@ -262,44 +262,3 @@ Index: fbsd-6.2b3/share/mk/bsd.libnames.mk LIBLN?= "don't use LIBLN, use LIBL" .if !defined(NO_BIND) LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a -Index: fbsd-6.2b3/share/mk/bsd.own.mk -=================================================================== ---- fbsd-6.2b3.orig/share/mk/bsd.own.mk -+++ fbsd-6.2b3/share/mk/bsd.own.mk -@@ -157,10 +157,8 @@ NLSMODE?= ${NOBINMODE} - - INCLUDEDIR?= /usr/include - --# Common variables --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -+# Don't strip things with install command, leave that to portage -+STRIP= - - COMPRESS_CMD?= gzip -cn - COMPRESS_EXT?= .gz -Index: fbsd-6.2b3/share/mk/bsd.sys.mk -=================================================================== ---- fbsd-6.2b3.orig/share/mk/bsd.sys.mk -+++ fbsd-6.2b3/share/mk/bsd.sys.mk -@@ -27,9 +27,6 @@ CFLAGS += -std=${CSTD} - . if defined(WARNS) - . if ${WARNS} >= 1 - CWARNFLAGS += -Wsystem-headers --. if !defined(NO_WERROR) --CWARNFLAGS += -Werror --. endif - . endif - . if ${WARNS} >= 2 - CWARNFLAGS += -Wall -Wno-format-y2k -@@ -60,9 +57,6 @@ WFORMAT = 1 - . if ${WFORMAT} > 0 - #CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args - CWARNFLAGS += -Wformat=2 -Wno-format-extra-args --. if !defined(NO_WERROR) --CWARNFLAGS += -Werror --. endif - . endif - . endif - .endif |