| 1 |
commit: 601368e62b33789d987f8b0cc6f1a05a4be4ab86 |
| 2 |
Author: Yuta SATOH <nigoro.dev <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Oct 11 12:40:39 2016 +0000 |
| 4 |
Commit: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp> |
| 5 |
CommitDate: Tue Oct 11 12:40:39 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=601368e6 |
| 7 |
|
| 8 |
sys-freebsd/freebsd-mk-defs: added freebsd-mk-defs-11.0-gnu.patch |
| 9 |
|
| 10 |
.../files/freebsd-mk-defs-11.0-gnu.patch | 63 ++++++++++++++++++++++ |
| 11 |
.../freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild | 2 +- |
| 12 |
2 files changed, 64 insertions(+), 1 deletion(-) |
| 13 |
|
| 14 |
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 |
| 15 |
new file mode 100644 |
| 16 |
index 0000000..97e882d |
| 17 |
--- /dev/null |
| 18 |
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch |
| 19 |
@@ -0,0 +1,63 @@ |
| 20 |
+diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk |
| 21 |
+index 92df111..88c75d9 100644 |
| 22 |
+--- a/share/mk/bsd.lib.mk |
| 23 |
++++ b/share/mk/bsd.lib.mk |
| 24 |
+@@ -184,7 +184,7 @@ _LIBS= lib${LIB_PRIVATE}${LIB}.a |
| 25 |
+ lib${LIB_PRIVATE}${LIB}.a: ${OBJS} ${STATICOBJS} |
| 26 |
+ @${ECHO} building static ${LIB} library |
| 27 |
+ @rm -f ${.TARGET} |
| 28 |
+- ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} |
| 29 |
++ ${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} |
| 30 |
+ ${RANLIB} ${RANLIBFLAGS} ${.TARGET} |
| 31 |
+ .endif |
| 32 |
+ |
| 33 |
+@@ -199,7 +199,7 @@ CLEANFILES+= ${POBJS} |
| 34 |
+ lib${LIB_PRIVATE}${LIB}_p.a: ${POBJS} |
| 35 |
+ @${ECHO} building profiled ${LIB} library |
| 36 |
+ @rm -f ${.TARGET} |
| 37 |
+- ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${POBJS} | tsort -q` ${ARADD} |
| 38 |
++ ${AR} ${ARFLAGS} ${.TARGET} {POBJS} ${ARADD} |
| 39 |
+ ${RANLIB} ${RANLIBFLAGS} ${.TARGET} |
| 40 |
+ .endif |
| 41 |
+ |
| 42 |
+@@ -247,7 +247,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS} |
| 43 |
+ .endif |
| 44 |
+ ${_LD:N${CCACHE_BIN}} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ |
| 45 |
+ -o ${.TARGET} -Wl,-soname,${SONAME} \ |
| 46 |
+- `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${SOBJS} | tsort -q` ${LDADD} |
| 47 |
++ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} |
| 48 |
+ .if ${MK_CTF} != "no" |
| 49 |
+ ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} |
| 50 |
+ .endif |
| 51 |
+@@ -312,13 +312,6 @@ _EXTRADEPEND: |
| 52 |
+ |
| 53 |
+ .if !target(install) |
| 54 |
+ |
| 55 |
+-.if defined(PRECIOUSLIB) |
| 56 |
+-.if !defined(NO_FSCHG) |
| 57 |
+-SHLINSTALLFLAGS+= -fschg |
| 58 |
+-.endif |
| 59 |
+-SHLINSTALLFLAGS+= -S |
| 60 |
+-.endif |
| 61 |
+- |
| 62 |
+ _INSTALLFLAGS:= ${INSTALLFLAGS} |
| 63 |
+ .for ie in ${INSTALLFLAGS_EDIT} |
| 64 |
+ _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} |
| 65 |
+diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk |
| 66 |
+index 3b1ecf8..26ac9c5 100644 |
| 67 |
+--- a/share/mk/bsd.prog.mk |
| 68 |
++++ b/share/mk/bsd.prog.mk |
| 69 |
+@@ -196,13 +196,6 @@ _EXTRADEPEND: |
| 70 |
+ |
| 71 |
+ .if !target(install) |
| 72 |
+ |
| 73 |
+-.if defined(PRECIOUSPROG) |
| 74 |
+-.if !defined(NO_FSCHG) |
| 75 |
+-INSTALLFLAGS+= -fschg |
| 76 |
+-.endif |
| 77 |
+-INSTALLFLAGS+= -S |
| 78 |
+-.endif |
| 79 |
+- |
| 80 |
+ _INSTALLFLAGS:= ${INSTALLFLAGS} |
| 81 |
+ .for ie in ${INSTALLFLAGS_EDIT} |
| 82 |
+ _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} |
| 83 |
|
| 84 |
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 |
| 85 |
index d0f48cd..e1eb27a 100644 |
| 86 |
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild |
| 87 |
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild |
| 88 |
@@ -31,7 +31,7 @@ src_prepare() { |
| 89 |
epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch" |
| 90 |
epatch "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch" |
| 91 |
epatch "${FILESDIR}/${PN}-11.0-drop-unsupport-cflags.patch" |
| 92 |
- use userland_GNU && epatch "${FILESDIR}/${PN}-10.2-gnu.patch" |
| 93 |
+ use userland_GNU && epatch "${FILESDIR}/${PN}-11.0-gnu.patch" |
| 94 |
|
| 95 |
if [[ ${CHOST} != *-freebsd* ]]; then |
| 96 |
installdir="/usr/share/mk/freebsd" |
Archives