diff options
| author |   Yuta Satoh <nigoro.dev@gmail.com> | 2016-10-11 21:37:39 +0900 |
|---|---|---|
| committer |   Alexis Ballier <aballier@gentoo.org> | 2016-10-11 16:47:48 +0200 |
| commit | e1bd456fcf9272cfdeaf542618c6b1f3ce3d1118 (patch) | |
| tree | 6eb8e704f2281853b01e1abcd5770ad59d798e86 /sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch | |
| parent | eclass/freebsd.eclass: added FreeBSD 11.0 support. (diff) | |
| download | gentoo-e1bd456fcf9272cfdeaf542618c6b1f3ce3d1118.tar.gz gentoo-e1bd456fcf9272cfdeaf542618c6b1f3ce3d1118.tar.bz2 gentoo-e1bd456fcf9272cfdeaf542618c6b1f3ce3d1118.zip | |
sys-freebsd: bump to 11.0
Diffstat (limited to 'sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch')
| -rw-r--r-- | sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch new file mode 100644 index 000000000000..97e882d51aac --- /dev/null +++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch @@ -0,0 +1,63 @@ +diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk +index 92df111..88c75d9 100644 +--- a/share/mk/bsd.lib.mk ++++ b/share/mk/bsd.lib.mk +@@ -184,7 +184,7 @@ _LIBS= lib${LIB_PRIVATE}${LIB}.a + lib${LIB_PRIVATE}${LIB}.a: ${OBJS} ${STATICOBJS} + @${ECHO} building static ${LIB} library + @rm -f ${.TARGET} +- ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} ++ ${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} + ${RANLIB} ${RANLIBFLAGS} ${.TARGET} + .endif + +@@ -199,7 +199,7 @@ CLEANFILES+= ${POBJS} + lib${LIB_PRIVATE}${LIB}_p.a: ${POBJS} + @${ECHO} building profiled ${LIB} library + @rm -f ${.TARGET} +- ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${POBJS} | tsort -q` ${ARADD} ++ ${AR} ${ARFLAGS} ${.TARGET} {POBJS} ${ARADD} + ${RANLIB} ${RANLIBFLAGS} ${.TARGET} + .endif + +@@ -247,7 +247,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS} + .endif + ${_LD:N${CCACHE_BIN}} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ + -o ${.TARGET} -Wl,-soname,${SONAME} \ +- `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${SOBJS} | tsort -q` ${LDADD} ++ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} + .if ${MK_CTF} != "no" + ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} + .endif +@@ -312,13 +312,6 @@ _EXTRADEPEND: + + .if !target(install) + +-.if defined(PRECIOUSLIB) +-.if !defined(NO_FSCHG) +-SHLINSTALLFLAGS+= -fschg +-.endif +-SHLINSTALLFLAGS+= -S +-.endif +- + _INSTALLFLAGS:= ${INSTALLFLAGS} + .for ie in ${INSTALLFLAGS_EDIT} + _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} +diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk +index 3b1ecf8..26ac9c5 100644 +--- a/share/mk/bsd.prog.mk ++++ b/share/mk/bsd.prog.mk +@@ -196,13 +196,6 @@ _EXTRADEPEND: + + .if !target(install) + +-.if defined(PRECIOUSPROG) +-.if !defined(NO_FSCHG) +-INSTALLFLAGS+= -fschg +-.endif +-INSTALLFLAGS+= -S +-.endif +- + _INSTALLFLAGS:= ${INSTALLFLAGS} + .for ie in ${INSTALLFLAGS_EDIT} + _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} |