From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F405F1381F3 for ; Wed, 17 Jul 2013 11:16:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B405E0853; Wed, 17 Jul 2013 11:16:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1FEE0E0853 for ; Wed, 17 Jul 2013 11:16:48 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0945333DD01 for ; Wed, 17 Jul 2013 11:16:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A5FF4E468F for ; Wed, 17 Jul 2013 11:16:45 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1374059787.666349d5e58fd96b21fecd12c15d2604876a6fc7.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: sys-freebsd/freebsd-mk-defs/Manifest sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gnu.patch sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.9999_p253216.ebuild X-VCS-Directories: sys-freebsd/freebsd-mk-defs/files/ sys-freebsd/freebsd-mk-defs/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: 666349d5e58fd96b21fecd12c15d2604876a6fc7 X-VCS-Branch: master Date: Wed, 17 Jul 2013 11:16:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ca6554f6-d3d6-43fd-961a-409862173be5 X-Archives-Hash: 1350c5755ae053f688b4ef0d68e6194a commit: 666349d5e58fd96b21fecd12c15d2604876a6fc7 Author: Yuta SATOH gentoo gr jp> AuthorDate: Wed Jul 17 11:16:27 2013 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Wed Jul 17 11:16:27 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=666349d5 added freebsd-mk-defs-9.9999-gnu.patch --- sys-freebsd/freebsd-mk-defs/Manifest | 3 +- .../files/freebsd-mk-defs-9.9999-gnu.patch | 79 ++++++++++++++++++++++ .../freebsd-mk-defs-9.9999_p253216.ebuild | 2 +- 3 files changed, 82 insertions(+), 2 deletions(-) diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest index e03204f..bb9416f 100644 --- a/sys-freebsd/freebsd-mk-defs/Manifest +++ b/sys-freebsd/freebsd-mk-defs/Manifest @@ -3,4 +3,5 @@ AUX freebsd-mk-defs-9.0-gnu.patch 2353 SHA256 49c84f315d006d443c4cef4123cd02aee7 AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe WHIRLPOOL 65946289e0e62ca575e3ce1acd22955e41143eefe0412f5dc6f6d358d95d08c2325d4870475d664a9565cc5492a0debe73d4f24a8ca34dce03ea20b46306f924 AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6 AUX freebsd-mk-defs-9.9999-gentoo.patch 12160 SHA256 a1f6fbf7815130790726022ea5c4b41ac6b01925c8f9641c4c3ceee9f9d7013f SHA512 7c7cd5d8baecda1188441bcca90ee2852e7c6d2434f4da5e72f08cca13102cac22c777a03d51dacc3a9b2f4cabd722d0f53878f88aff108aaab4719b878ff81a WHIRLPOOL 2163f6fca01490244cb813cd11373434bcec6cb825284e2c7deed98b0c4baea45eb0cf71da629908322dff2f2a093d8e61b9a96f4b724ec8d8e4998b2e7512cd -EBUILD freebsd-mk-defs-9.9999_p253216.ebuild 773 SHA256 71d299b8108c607500cfa489d0d889ddabceee47bda1ffd731ee7e3923593d22 SHA512 c0a3da9b72ead3b00c9024e0743a2726ec64163dd562226ada159968efd8afcc078daf8cf4b99a9ca3864b9dd34b3908e397b35fb329a06c3fbc805ba167d25b WHIRLPOOL 5bacda2c2ff1b4f2dc40dc351320a49a088e1fff2022689d22d6a06f16bac85ae6e96083671f815cff5e0dcf2c9504c25c00728fa97c103768f2854e981fb980 +AUX freebsd-mk-defs-9.9999-gnu.patch 2242 SHA256 95305f335a360549703c73056898e778640c30a60c9f6b104709e7fc0cf75926 SHA512 a5b5c341972bee204d2a5b1f59cefda03aa48fdb7c7c713ceb9d4477e266aecfd137c2101988c48c73c527652ff0828e0a60b8c474904b146238c640c25d7416 WHIRLPOOL 7f7a45ad858a0b1c0cb099cedef05772fb90a752567ec778ec6f379f04e2cc86a8d4756c5c70d18685d42346fe43088622977eced076cf2c5bdbfb90fbb53362 +EBUILD freebsd-mk-defs-9.9999_p253216.ebuild 776 SHA256 0f4d781eaa9ad3f071cab656002d15631baf296c58ecdf0e7362fbd5ef28729e SHA512 c05b75c5d62c621cccaa94b34c328a3733866a3b15fc6cc2bc7a24c07528a0ce9f34bf9f47329531db6d2950e8d55cee70cd178d84141aca6116005307bf9dbf WHIRLPOOL f025bb01f24f90b72e7f9870ae1488005e9f85028faa6a1a6a4a1c51aabc050eeba9386781bd5011a0811aad0f171d5628049e4189e9309a5712ec5d9b53e51c diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gnu.patch new file mode 100644 index 0000000..1b2a207 --- /dev/null +++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gnu.patch @@ -0,0 +1,79 @@ +diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk +index 131b90e..60c7207 100644 +--- a/share/mk/bsd.lib.mk ++++ b/share/mk/bsd.lib.mk +@@ -153,11 +153,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 + +@@ -170,11 +166,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po} + 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 + +@@ -201,15 +193,9 @@ ${SHLIB_NAME_FULL}: ${SOBJS} + .if defined(SHLIB_LINK) + @${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK} + .endif +-.if !defined(NM) + @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ + -o ${.TARGET} -Wl,-soname,${SONAME} \ +- `lorder ${SOBJS} | tsort -q` ${LDADD} +-.else +- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ +- -o ${.TARGET} -Wl,-soname,${SONAME} \ +- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} +-.endif ++ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} + .if ${MK_CTF} != "no" + ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} + .endif +@@ -267,13 +253,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 3c8fe5e..7916787 100644 +--- a/share/mk/bsd.prog.mk ++++ b/share/mk/bsd.prog.mk +@@ -176,13 +176,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-9.9999_p253216.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.9999_p253216.ebuild index 4e0796f..93b8a01 100644 --- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.9999_p253216.ebuild +++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.9999_p253216.ebuild @@ -25,7 +25,7 @@ S="${WORKDIR}/share/mk" src_prepare() { epatch "${FILESDIR}/${PN}-9.9999-gentoo.patch" - use userland_GNU && epatch "${FILESDIR}/${PN}-9.1-gnu.patch" + use userland_GNU && epatch "${FILESDIR}/${PN}-9.9999-gnu.patch" } src_compile() { :; }