diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-11-07 17:07:37 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-11-07 17:07:37 +0000 |
| commit | cd2a0487bcb69d032ec3cdd938388d9ebea7fa23 (patch) | |
| tree | 25a00989db8b5cf525a50c7a58d834db9e95101c /sys-freebsd/freebsd-mk-defs | |
| parent | fix sed calls with gnu sed when bsd sed is not available (diff) | |
| download | gentoo-2-cd2a0487bcb69d032ec3cdd938388d9ebea7fa23.tar.gz gentoo-2-cd2a0487bcb69d032ec3cdd938388d9ebea7fa23.tar.bz2 gentoo-2-cd2a0487bcb69d032ec3cdd938388d9ebea7fa23.zip | |
more fixes for the gnu patch
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd/freebsd-mk-defs')
| -rw-r--r-- | sys-freebsd/freebsd-mk-defs/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch | 45 |
2 files changed, 49 insertions, 2 deletions
diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog index baf3bcfe2619..02acb438dc1e 100644 --- a/sys-freebsd/freebsd-mk-defs/ChangeLog +++ b/sys-freebsd/freebsd-mk-defs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-freebsd/freebsd-mk-defs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.39 2011/11/07 13:54:04 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.40 2011/11/07 17:07:37 aballier Exp $ + + 07 Nov 2011; Alexis Ballier <aballier@gentoo.org> + files/freebsd-mk-defs-9.0-gnu.patch: + more fixes for the gnu patch 07 Nov 2011; Alexis Ballier <aballier@gentoo.org> freebsd-mk-defs-9.0_rc1.ebuild, +files/freebsd-mk-defs-9.0-gnu.patch: diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch index a591622b8589..bd7d7e6116c3 100644 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch +++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch @@ -2,7 +2,50 @@ Index: work/share/mk/bsd.lib.mk =================================================================== --- work.orig/share/mk/bsd.lib.mk +++ work/share/mk/bsd.lib.mk -@@ -245,13 +245,6 @@ _EXTRADEPEND: +@@ -146,11 +146,7 @@ _LIBS= lib${LIB}.a + lib${LIB}.a: ${OBJS} ${STATICOBJS} + @${ECHO} building static ${LIB} library + @rm -f ${.TARGET} +-.if !defined(NM) +- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} +-.else +- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} +-.endif ++ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} + ${RANLIB} ${.TARGET} + .endif + +@@ -163,11 +159,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o= + lib${LIB}_p.a: ${POBJS} + @${ECHO} building profiled ${LIB} library + @rm -f ${.TARGET} +-.if !defined(NM) +- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} +-.else +- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} +-.endif ++ @${AR} cq ${.TARGET} ${POBJS} ${ARADD} + ${RANLIB} ${.TARGET} + .endif + +@@ -189,15 +181,9 @@ ${SHLIB_NAME}: ${SOBJS} + .if defined(SHLIB_LINK) + @ln -fs ${.TARGET} ${SHLIB_LINK} + .endif +-.if !defined(NM) + @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \ + -o ${.TARGET} -Wl,-soname,${SONAME} \ +- `lorder ${SOBJS} | tsort -q` ${LDADD} +-.else +- @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \ +- -o ${.TARGET} -Wl,-soname,${SONAME} \ +- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} +-.endif ++ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} + @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \ + (${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \ + ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}) +@@ -245,13 +231,6 @@ _EXTRADEPEND: .if !target(install) |