commit: 601368e62b33789d987f8b0cc6f1a05a4be4ab86
Author: Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Tue Oct 11 12:40:39 2016 +0000
Commit: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Tue Oct 11 12:40:39 2016 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=601368e6
sys-freebsd/freebsd-mk-defs: added freebsd-mk-defs-11.0-gnu.patch
.../files/freebsd-mk-defs-11.0-gnu.patch | 63 ++++++++++++++++++++++
.../freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild | 2 +-
2 files changed, 64 insertions(+), 1 deletion(-)
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 0000000..97e882d
--- /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}}
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild
b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild
index d0f48cd..e1eb27a 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild
@@ -31,7 +31,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch"
epatch "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch"
epatch "${FILESDIR}/${PN}-11.0-drop-unsupport-cflags.patch"
- use userland_GNU && epatch "${FILESDIR}/${PN}-10.2-gnu.patch"
+ use userland_GNU && epatch "${FILESDIR}/${PN}-11.0-gnu.patch"
if [[ ${CHOST} != *-freebsd* ]]; then
installdir="/usr/share/mk/freebsd"
