diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
| commit | 46eedbedafdb0040c37884982d4c775ce277fb7b (patch) | |
| tree | db33a91259730be84999e13a8d8168c799f50ac0 /dev-util/kbuild | |
| parent | e23a08d0c97a0cc415aaa165da840b056f93c997 (diff) | |
gentoo resync : 20.10.2021
Diffstat (limited to 'dev-util/kbuild')
| -rw-r--r-- | dev-util/kbuild/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/kbuild/kbuild-0.1.9998.3499.ebuild | 21 | ||||
| -rw-r--r-- | dev-util/kbuild/kbuild-9999.ebuild | 22 |
3 files changed, 42 insertions, 5 deletions
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest index 6d35af61dafa..6f752dd29fa1 100644 --- a/dev-util/kbuild/Manifest +++ b/dev-util/kbuild/Manifest @@ -9,6 +9,6 @@ AUX kbuild-0.1.9998_pre20120806-qa.patch 292 BLAKE2B 628ee52d1c147864dba48e37ae2 DIST kbuild-0.1.9998.3407-src.tar.xz 2351596 BLAKE2B ed562a739831c465ba66b2c357b1ab52cb072e61fa597d96d9e66e1b57a7f790c7e37fc82ef7ff49114b0cb4cb623e558d96864e98ca36bd42fe16e58e863dc7 SHA512 0a1fddff595f7ccfdb65a1a660c82860f132796b42149b8b40808d0df489312dcd96402236150c8ec5ec32c1cc142ce7af1150e10fdb83bf798e4d690dd64314 DIST kbuild-0.1.9998.3499-src.tar.xz 2371580 BLAKE2B 847c5c67ded37ca87228ff7164d6c7f2f670a57f2fd94d6d0bf4f8896266e7fe5442666c03dbda016564a52dc91d10be83f0d4b0ef5093db0f5210ac8d5f3aaa SHA512 eebdcd1d2fa71313edd764d45a4aa3580078af22d7c5fed32d3d139a4f41c4e028282fdfdda0ee9b617ed0e8e63b8f5d065b3cf6647f08fe446560938b7577fc EBUILD kbuild-0.1.9998.3407.ebuild 1780 BLAKE2B 52b4b1e13d6049fddc6e11edcbb3d881ba8abb1af48dfa6853331b5eec5a0d346d435f0a3e4e6ea747d1a27fcf6df190bbdfb950b12845c7192fbddd0fae6f16 SHA512 59976d3b48a2b65c2ac1d9e28e4a216bc641b1b0a6b64c0107ea864a57a95dee41d813cc5433e626b9223cee92151e7c361fee37bd7420fc20f03c7a74f49c8b -EBUILD kbuild-0.1.9998.3499.ebuild 1861 BLAKE2B eb486e38f6aba3fc8ba7720dcb61e5cc57dff157b9fdf6a667e42e4f4fe91d2b6f50913fee503e06b806ef74dc1b41b2ff957b2f42f4de57b94e7c8f8a433c08 SHA512 e1169d7823d609b56bcfdfffcb6afbac8dea6211a63d480b42b8eff886ad389365392f742823b5da93392f8d2af2c1e5175ea4200104ebec0039945da055db2e -EBUILD kbuild-9999.ebuild 1879 BLAKE2B 6bf91d0a78367e10cac290e72c3311a47b5ff4b6d147f231aa8e27ecfc7b507e12782dcf57a8824751abbc73de64709ebda1d250a4927c757886801c605c13de SHA512 beee49f9b3528eb2e69af67736b7ff6a3f1608517ce4821d3c0d2dede2df774206d892c6ae70c149eac718de4c6dec98d2d9228af1a9a55ad0ed616aaf1763bd +EBUILD kbuild-0.1.9998.3499.ebuild 2482 BLAKE2B 2fe292cb15b169c1d96d8bd56293c88b946d0c147816acac41c4baabb3234320a261464b0e1ebef89d6176b82526fd90bea0fa67de36b83eafd183fc329dc5bd SHA512 4eab16d45ee87d399c26a9a8825acb192e1c43e01b8a3d68298db86c3dc576e0c0e40e4fc3456c442b0a032dd444b68c8240925beeab9fcc00f59475a129bcc2 +EBUILD kbuild-9999.ebuild 2496 BLAKE2B 6f281f51a26449a6e7996e735d7a6ef542bdac79706b003a1ec7326b18e34b9b55f648c755656704bbd22628086b41c6c4e5812cf7b0a7a9610e5935356e2059 SHA512 91470baceec88b442caa17802c1728ed14de9986f224706c780686387f2d6d2ed586216a6822e6957e5e752f1e853e7622ac980d19fffc82ffce02dcdd1fb84d MISC metadata.xml 252 BLAKE2B 5dd8d0c83d6c9c396753f4e6674725483e0c7a005b4c529d3bd1fba5de36cee7f2b33e53aec48aa75f35ec663173677c2c964fb73f7f954b20631cc9c59533ca SHA512 afee4a606f4b70f265eb14178037c0459e32ddd98378c6c2978b829e906f83dc3607385173bd8f84ad988d307f8e44e1320310c92c070c802a4ccba93a96ae18 diff --git a/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild index 574abc5324a7..ef85feb53592 100644 --- a/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild +++ b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild @@ -65,7 +65,26 @@ src_prepare() { } src_compile() { - kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \ + if [[ -z ${YACC} ]] ; then + # If the user hasn't picked one, let's prefer byacc > yacc > old bison for now. + # See bug #734354 - bison doesn't work here. + # We can remove this once Bison works again! + if has_version -b "dev-util/byacc" ; then + export YACC=byacc + elif has_version -b "dev-util/yacc" ; then + export YACC=yacc + elif has_version -b "<sys-devel/bison-3.7" ; then + export YACC=bison + else + die "This case shouldn't be possible; no suitable YACC impl installed." + fi + + einfo "Chosen YACC=${YACC} for build..." + else + einfo "Chosen user-provided YACC=${YACC} for build..." + fi + + kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" YACC="${YACC}" \ || die "bootstrap failed" } diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild index 92a4a2a25437..b4bfd88222e3 100644 --- a/dev-util/kbuild/kbuild-9999.ebuild +++ b/dev-util/kbuild/kbuild-9999.ebuild @@ -67,8 +67,26 @@ src_prepare() { } src_compile() { - kBuild/env.sh --full \ - emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \ + if [[ -z ${YACC} ]] ; then + # If the user hasn't picked one, let's prefer byacc > yacc > old bison for now. + # See bug #734354 - bison doesn't work here. + # We can remove this once Bison works again! + if has_version -b "dev-util/byacc" ; then + export YACC=byacc + elif has_version -b "dev-util/yacc" ; then + export YACC=yacc + elif has_version -b "<sys-devel/bison-3.7" ; then + export YACC=bison + else + die "This case shouldn't be possible; no suitable YACC impl installed." + fi + + einfo "Chosen YACC=${YACC} for build..." + else + einfo "Chosen user-provided YACC=${YACC} for build..." + fi + + kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" YACC="${YACC}" \ || die "bootstrap failed" } |