commit: e1737ef53af2ce2a7fccd2741fa37d89f569d6e8
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat May 17 09:05:53 2014 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sat May 17 09:05:53 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=e1737ef5
freebsd-{lib,share}-9.9999: fix die "failed to set sys symlink"
---
sys-freebsd/freebsd-lib/Manifest | 2 +-
sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild | 4 +++-
sys-freebsd/freebsd-share/Manifest | 2 +-
sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild | 4 +++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 960d13f..d2fd05a 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -26,4 +26,4 @@ AUX libmap.conf 201 SHA256
36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd
AUX libusb-1.0.pc.in 207 SHA256
edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512
93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93
WHIRLPOOL
7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
AUX libusb.pc.in 208 SHA256
9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512
e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c
WHIRLPOOL
e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
EBUILD freebsd-lib-10.0.9999.ebuild 19158 SHA256
7cceb08cea700054e4113cf9e97981a0583e394bf8279b80acd58e6fdcdbb6b6 SHA512
fbdd1cdbc5fcce047d30b0de835e4803d3205294f244a71ed4943d4e5f8ea71c6ede423666705860efec12d3a9a7ee54c36c1b2fc9e9a3066a4af5966b32b563
WHIRLPOOL
e3dfa5e2b4bb7b292ac11347c9a5df3f7cf13f7baa63211acf2ab74e7bd663a08ad12381572e95c7e000ef4156a0b68f988dd9816869c953329d4c93e17ea248
-EBUILD freebsd-lib-9.9999.ebuild 18176 SHA256
a48d43d4ccbd7f6bb26aa678704eb1f8bbbc77f92eb196e841c77b3295f16980 SHA512
82bd6ee4f59196e296f467650a5ebee0efbf526f4fcfdfc95fbf8f96a711b32596e17e327da56b10aef501104f79070f14ce178a431a52c9ee5e0ba6ddf3b666
WHIRLPOOL
c38510eb23aeb312214872dc75231b9f18dc6b8a0840d9dc7f6acfa99ccfdba97bccbf3d12cf3821f9e651ad48552c1587b76d5a7be11f382cc4143b96e15261
+EBUILD freebsd-lib-9.9999.ebuild 18221 SHA256
c45e817337cfead70472d5f9520ffaf1d635fb6db5004af4f45c96b5c4cfdb02 SHA512
996b157741fce88ee78389ce1220c681dc408296cc1e075435a6f120c0efaa1a306e494408ecb1ad95ca88f11dd086e620c650d5250a084c020ef2d064694d0b
WHIRLPOOL
754621d3194e2f400a6b7c59c4d612becb32fb1a41e57686477b3f7fc5a4b935063634eae68b2904ca225b07306c9dbbf6d79cfc337b9fbc4f47f0896591e39a
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
index c25b8e7..c01ed40 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
@@ -177,7 +177,9 @@ src_prepare() {
fi
if ! is_crosscompile ; then
- ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys
symlink!"
+ if [[ ! -e "${WORKDIR}/sys" ]]; then
+ ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't
make sys symlink!"
+ fi
else
sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
"${S}/libc/rpc/Makefile.inc" \
diff --git a/sys-freebsd/freebsd-share/Manifest
b/sys-freebsd/freebsd-share/Manifest
index 84cd1e9..890ea0a 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -5,5 +5,5 @@ AUX freebsd-share-8.0-gnu-miscfiles.patch 858 SHA256
20b3761bd18d4ff8e7257ab006f
AUX freebsd-share-9.0-gentoowaydir.patch 314 SHA256
68ddc9d6d95c95fc295f3ed3f7d7562de01ff6894b002bd7455d2da72cf4e2f2 SHA512
ef325e79806d78ede26567268829949de3aab02db1b7ea5f1dd834d4deeeddee8338679f7196fee6dc1a5682ccd79c1a0bdd73c96349961a8e1c2153fcf84afd
WHIRLPOOL
10448b2cd090068b698d2d9037f2a217cdc20cebcfce4a13f98111ae4e4a2073ce4cb274ec3a7011c2e89acc1b2ab1b5e8e3d141817c065fdb35d1879ae31c37
AUX freebsd-share-9.2-gnu-miscfiles.patch 1022 SHA256
0484a9ea6d05eb8d26c33efac61928c399230d8bf71a374fa2ae5c22a1acf3d2 SHA512
b220c884a6e3bb9037a1817b3bb1bcf181b1493836dafbef98bf0973e9781d2e2e982d9e17eef78b24056038e985969ed08c471c9ba374557097086bfcff8f3e
WHIRLPOOL
ffa0400172e0834f31897738d426dd53df40e67612e51045cd899cd84cef018db6a14c8600233fe2e23699a708e73f1b6df7654089356bdaa62274f5fc11931b
EBUILD freebsd-share-10.0.9999.ebuild 3043 SHA256
1a7c9dfcf8a1cab305808b29fa8f427b0a9f450aa05b4ae96ac8cf2d6e3ce554 SHA512
5fcf89942246ea345f3986a3ddde62a004443f1bbb7530c946ac8b1873ba62bc61727766ccc40b17a5542bef3ee691e5651c7070deb0c8059cbe641310e6f85a
WHIRLPOOL
dee8dc8eda79a508ee24b845d957ae02a3ddba46ebd5b825939c07ddbf96380c31d5ead653b367f2c19afb7b0bc6e061651329ff50768ca24d6bca4783a1771d
-EBUILD freebsd-share-9.9999.ebuild 2739 SHA256
ccfd053e58a1fdd1f0e5f8f56bd4e4383a408fd778091d330b9df7a0241e6261 SHA512
1d9e354393934052ad8640b4aa6d050342b14e280039622f6c96f1222d81c7693432de84a517e0b33232af186e36452dfd217a000c203f8ff29c72c99abe6c51
WHIRLPOOL
e6329a2149a27a70bc578186c435b8cda4c433821a9f5940bfaa0d658cd626419ac18e30753686e109f1a6909dab0a66d407ddb39cc8682a38a7b649213cf1bd
+EBUILD freebsd-share-9.9999.ebuild 2782 SHA256
19d163221b2339798e26c9f3b3313cefe143561b5f5c308cbb6f2066cd6abb07 SHA512
a0b5f51b35b1d846a2315329e52d7e92e9258a4a16405c4deef086b0425273855da16ec6b74a9a28e3cfa5454374544d0dbe7858b717985abd2ec359536c87a1
WHIRLPOOL
50988e064b4af2c87bada78a7ba09e7dd802e8edd2f2a9caec0cf7aac6ea089db4a957789efe2bc1a9de46f431709e41862c677a0d0a1d5593fa2ca2b72b4b33
MISC metadata.xml 223 SHA256
5c9860c4ce81b51fef51a6c5e87081bfd13e74ba452c27191a1abc0ca5ff0aa0 SHA512
3dc7fea8c9f850d63d4f9f24af639fb41d406c2e87439eb960c401412b37e7dc7ab6822d446ec113eb079aba30967391e95cd71dceb889753ed969bc51f6064e
WHIRLPOOL
577570d1260a6ef86155c1647e3d90c18aa9b83a89027dcea28b70d22df60e413cee353083d7e915d81129f447772dc7dc4ea766e478a9cf363dabce5d9042de
diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild
b/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild
index c371728..fd801d3 100644
--- a/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild
+++ b/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild
@@ -75,7 +75,9 @@ src_unpack() {
"${S}/${sdir}/Makefile" || \
die "Error fixing ${sdir}/Makefile"
done
- ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink"
+ if [[ ! -e "${WORKDIR}/sys" ]]; then
+ ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys
symlink"
+ fi
}
src_compile() {
