commit: 12078ea6233fad9ae13bb1295daa73848edb3806
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Wed Oct 29 12:13:44 2014 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Wed Oct 29 12:13:44 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=12078ea6
catalyst-2.0.15-fbsd-extra.patch: added x86-fbsd 9.0 stage3 and
amd64-fbsd/clang 9.1 stage3 support.
---
dev-util/catalyst/Manifest | 2 +-
dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 522dc45..27df8a8 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1,6 @@
AUX catalyst-2.0.12.1-fbsd.patch 9713 SHA256
c66f856b7f3b0b9988984cf7eac1ab332d6103ac4bbcc855dbfdb0f4de8e6692 SHA512
335b29e7bda61c1875a66694031924a3f04851b056651b6ee8f3572209bf216d5f63520513223ca996f3b9404eeefacf7cfe40d0feddbebd5c3782bf8db36d4d
WHIRLPOOL
b63adab3d5ead0950a06d9a6490cfbef9d07ca420e45eaee99b9bef87f3b96d93cdaada2212faa368c1473360f917db094f8319f34bdbc1dd673390fb55cc9bf
AUX catalyst-2.0.14-fbsd.patch 10559 SHA256
c4f53aa4a29eceb01a19b76b08b898efab1244b045b7657430c81ac796ebd8f3 SHA512
344193243bea083c8af3c641f69b70362635af7eaec9887cb0a5aa92957f951b53bbc8ea68f62e66395a2efa63b3b69bb2da7aeac489f88df70abf117a6108b7
WHIRLPOOL
3c54e14b0a05e272403ff738c2a5ba25eaa5c034148f35317809c5ccb758f245490ccead2d6554b36ef3f4e6a592faa2988974f901f01096eefe1466de058272
-AUX catalyst-2.0.15-fbsd-extra.patch 3631 SHA256
9ff22dbe1e9a2289dd800fae9d61df391ba8b099f51988d6eb6946aeac3b4f7c SHA512
81757926891d27b3e78fa92ac1c26fa7b69dca488e4e7504ee83458a41cce72df93fb3a9443a27408c1388e4a40d03f03f0bb49291b0d70986b229ee21b7b534
WHIRLPOOL
d97927a3eb264ed2c44758ad82092cbaa0126d71aff66dcabaf7594019ad9b4f33b813701b59e5a58142b96def2eab152562639f849750268279958b9491d56a
+AUX catalyst-2.0.15-fbsd-extra.patch 3972 SHA256
0f66298139b65fc46aaa198afe5bee6d2a7eb1c3e50a5b9d003967fe5467a9fe SHA512
7d5346fe10f24a10ddc4a933e523268300df5dfa5471df9e3ed4fbd68488d304f08631a5259b744f424a281b69020e7138311c057748740a033bfb205f94a0d4
WHIRLPOOL
4cdd3eb20a151ea8010047ce76ace4ca496ec62f8f9689d7495712d3034fb96ec9ccdd850a6a5d1473eb0b5bd71efb7036c1101266a53766e0662b1fb4eb05c0
DIST catalyst-2.0.12.2.tar.bz2 907893 SHA256
411d531b6de8c8c1bc9fa9502af3a4882e94e9db8b911bb48e4a0fcfc1efe7e8 SHA512
12349f6249363a94a72a71d05b2fe6ee13593b5ea67e1cb9a054c5ece896ff68f89d1af6341b98238ba6a6510e2737f81dcc2606649c10681235315663ab04ae
WHIRLPOOL
1769a78f615c8e0eec2167dd9d6ab873e24801ecb5e4634037898933c6f5a1dbb189d967a628be6f8811f6769eadc91c5003ddbb6bd58eb05efbbd5110f740c7
DIST catalyst-2.0.15.tar.bz2 873335 SHA256
80fc39e6f6b7c32fb84f51333d8bf62a56a1ee068eb83cf2b03cb21c1f163e51 SHA512
9e61ba61eaa806424041f7edd1680b55dfd69bdea5b292aff305b4b3ef03349d82a47d8ab876baf7bf888e03810d79c6a00d74dc748082a1ed180ec1ed7043bd
WHIRLPOOL
03c0f1137f59c57d106df4210104000c498a4c7ff2ae5bcc6e6c7a23d3d0c4c35ed125c036a0468859706da82af799641c1abe1b18c716c230c6ab657b4b765c
DIST catalyst-2.0.17.tar.bz2 861341 SHA256
5f4142598d921e5174ff06f9571856760a324e79db5f3b63caf0d1a16adc813c SHA512
9d7b9ad383dcc5d4ba058596c0b607eb9601b28025d9300f63e68d78cbd5bca8fa3f3e03a81dc6b233021e773ba4301df0bf5cec51ca4368eb3577a68d33a92c
WHIRLPOOL
e97fc120141cc4f9f5c297652d8b43313780f615429c0eb3d9b85cba40aeca01dcbc6efb0f8d388cc5e7debabb2563cfc9b5a5aa00e3d00d306aed0f799fc642
diff --git a/dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch
b/dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch
index 596ce5f..87a7401 100644
--- a/dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch
+++ b/dev-util/catalyst/files/catalyst-2.0.15-fbsd-extra.patch
@@ -1,19 +1,24 @@
diff --git a/catalyst-2.0.17/targets/stage1/stage1-chroot.sh
b/catalyst-2.0.17/targets/stage1/stage1-chroot.sh
old mode 100755
new mode 100644
-index ed83f38..0819b2e
+index ed83f38..1f7137e
--- a/catalyst-2.0.17/targets/stage1/stage1-chroot.sh
+++ b/catalyst-2.0.17/targets/stage1/stage1-chroot.sh
-@@ -21,17 +21,42 @@ then
+@@ -21,17 +21,48 @@ then
fi
## Setup seed pkgmgr to ensure latest
+
+if [[ ! -e /usr/lib/python-exec ]]; then
+ emerge -p --nodeps dev-lang/python-exec
-+ [[ $? -eq 0 ]] && clst_root_path=/ run_merge "--buildpkg=n --newuse
--nodeps dev-lang/python-exec"
++ if [[ $? -eq 0 ]]; then
++ clst_root_path=/ run_merge "--buildpkg=n --newuse --nodeps
dev-lang/python-exec"
++ else
++ find /usr/portage/profiles -name eapi -exec bash -c 'echo 4 >
{}' \;
++ fi
+fi
clst_root_path=/ setup_pkgmgr
++[[ 4 -eq $(cat /usr/portage/profiles/eapi) ]] && find /usr/portage/profiles
-name eapi -exec bash -c 'echo 5 > {}' \;
# Update stage3
if [ -n "${clst_update_seed}" ]; then
@@ -34,6 +39,7 @@ index ed83f38..0819b2e
+ [[ -e /etc/portage/profile/package.use.mask ]] && sed
-i '/sys-freebsd/freebsd-libexec abi_x86_32/d'
/etc/portage/profile/package.use.mask
+ clst_root_path=/ USE="-build-kernel" run_merge
"--buildpkg=n --update --newuse freebsd-bin freebsd-lib freebsd-libexec
freebsd-mk-defs freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin
freebsd-usbin"
+ clst_root_path=/ USE="internal-glib" run_merge
"--buildpkg=n --update --newuse dev-util/pkgconfig"
++ [[ -e /usr/lib/libc++.so ]] && clst_root_path=/
run_merge "--buildpkg=n --update --newuse sys-libs/libcxx sys-libs/libcxxrt"
+ clst_root_path=/ run_merge "--buildpkg=n
dev-libs/libxml2 dev-libs/libxslt dev-libs/glib app-arch/libarchive
sys-libs/zlib"
+ unset CHOST
+ clst_root_path=/ run_merge "--buildpkg=n
sys-devel/libtool"
