From 65c1a6f8d7210639cbdc1565ccee4758f45dfc45 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Nov 2022 13:02:32 +0000 Subject: gentoo auto-resync : 20:11:2022 - 13:02:32 --- dev-util/Manifest.gz | Bin 69281 -> 69278 bytes dev-util/kbuild/Manifest | 10 +++- .../files/kbuild-0.1.9998.3572-fix-bison.patch | 15 +++++ .../files/kbuild-0.1.9998.3572-fix-lto.patch | 11 ++++ dev-util/kbuild/kbuild-0.1.9998.3499.ebuild | 41 ++++--------- dev-util/kbuild/kbuild-0.1.9998.3572.ebuild | 66 +++++++++++++++++++++ dev-util/kbuild/kbuild-9999.ebuild | 43 ++++---------- dev-util/kbuild/metadata.xml | 5 +- dev-util/rebar/Manifest | 2 +- dev-util/rebar/rebar-3.20.0.ebuild | 11 ++-- 10 files changed, 132 insertions(+), 72 deletions(-) create mode 100644 dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch create mode 100644 dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch create mode 100644 dev-util/kbuild/kbuild-0.1.9998.3572.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index bc144cdd1298..b57fed48cdb3 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest index e32242fb6d19..40e888b39c12 100644 --- a/dev-util/kbuild/Manifest +++ b/dev-util/kbuild/Manifest @@ -4,11 +4,15 @@ AUX kbuild-0.1.9998.3407-gold.patch 590 BLAKE2B 654459b94017d4bacae37151c71d4b43 AUX kbuild-0.1.9998.3407-unknown_configure_opt.patch 697 BLAKE2B 5f974bc451a12f4b4c02656b501d07515c14499c53ee1fca00aec00cf28d6dd5faf690f262b79f34861a3bfd317a5bd37eb78cbeb61ce833d8117c2cd74e7813 SHA512 63435effcf109b40390574da09453314ffac109ffee79419cef81705b4f7ceb145f692c9a81b54dd0d58f69a1a6f80b9dc412baa5d416066f05300cc9eccc11e AUX kbuild-0.1.9998.3499-gold.patch 934 BLAKE2B 486b6154eeba1541f87856e0d4bddd89ee689393669161f60ae9f6b5ce3a199cf72187ac77d766e5c26b707af79b63b13f2cc597e7ee15ee1c46972401fe80d3 SHA512 5e885b504c095c062da0c2ed7836821c5ab95aa6b90e847070a87228a3e1456b9ae2dc2c463e0771552a504f0f309569e762667cd11aa891f5236b5402b77a08 AUX kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch 374 BLAKE2B 9ea9ac286217760b6933821ec3901a4e102bf8fe98517805b23e19e86a8ac86a81c93c72c13d69490d91c80c2e01581b5926f358f988b6b0de8e04ed0ba93820 SHA512 f83bcd523241d3b6bda3038d1c2a6a18ba2497d166f5a9704ba5f4a96b2d6857ea810ab2969b931b60b5818b69ea24cbeab2068cb92765704f7666874751e27d +AUX kbuild-0.1.9998.3572-fix-bison.patch 375 BLAKE2B ab316943b88fac929e747d0c1062f827a2049238d29eaa26e81590b0982462f6428e5be52a82ca5325c6ed11e0771cf22ee2f70f719162ad4915199bb24bb1ff SHA512 870f8d8f5be776b490a21b018fe5aa5fd12251eb0319098cb4c2785524482e7174a77e45e8b1d28252b244de7571209b006bb36c16f616803dba64111e5f8a10 +AUX kbuild-0.1.9998.3572-fix-lto.patch 314 BLAKE2B 42a7c1d3f735870b92c6ffdaf0400c1db63389b430890a892c9b48b90a126508729baeef2fc45bd747c089856a26ec3d10b8a9bfedd4e25a6d6ffd6606ef770b SHA512 7bb2526b4c59533dbfc8ad7c53fb38985fec4cab17740f4a3965fa3e982ba42faaabfe8d78d94c83bd74c771dde9088b1446a6937f96d37808fe9597d6a049f9 AUX kbuild-0.1.9998_pre20110817-kash-link-pthread.patch 296 BLAKE2B ffa7b0167e4a65c59510e20089a63d5c1949b5f14ce167725ee057d9ab75369758e491727d939a111de5bd63719b53a7744b08efe84d34cc81b4d7bba80a3522 SHA512 178da856a83631ca4d86a9b8c20e74b75b76426c177b87c26d4c4b3df86e72f3b6339e8f61948498ab9c4bf047119588f3df8ce78448160afa0840b2cf3aeabb AUX kbuild-0.1.9998_pre20120806-qa.patch 292 BLAKE2B 628ee52d1c147864dba48e37ae25a2ff9e82e38bc907f2771ee3599e9401b26e5b5d4e53a3958a4f8edb2a7c35794677bae141561cf515fd3587b9ac095a7bdd SHA512 2a311e2e79c1e85c3c2c26b3d187355167c237c334687494a8e532b84232340df44b0d896fe6638bf1a9d4ba1c5f1efb29978de3bac0490fe04f2e57f7fb1874 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 +DIST kbuild-0.1.9998.3572-src.tar.xz 3973848 BLAKE2B 103e42d719fd77bc5c55aea48bdfd01c8ad136529cc76cc8c1297f87e21e5d4e2e7149f9321c5174808613a84331dbea8bb4c0a7662eb2de9e1045c8ad365047 SHA512 96bb5e1759990bf3acaca4b0ba7c02926c6607b0cd94f7fca222b13eee5c3364c64b35e3473c5cee45fa094cb2b851ac9f3a3a9fe60cff894baf46238ccb4006 EBUILD kbuild-0.1.9998.3407.ebuild 1780 BLAKE2B 52b4b1e13d6049fddc6e11edcbb3d881ba8abb1af48dfa6853331b5eec5a0d346d435f0a3e4e6ea747d1a27fcf6df190bbdfb950b12845c7192fbddd0fae6f16 SHA512 59976d3b48a2b65c2ac1d9e28e4a216bc641b1b0a6b64c0107ea864a57a95dee41d813cc5433e626b9223cee92151e7c361fee37bd7420fc20f03c7a74f49c8b -EBUILD kbuild-0.1.9998.3499.ebuild 2482 BLAKE2B 2fe292cb15b169c1d96d8bd56293c88b946d0c147816acac41c4baabb3234320a261464b0e1ebef89d6176b82526fd90bea0fa67de36b83eafd183fc329dc5bd SHA512 4eab16d45ee87d399c26a9a8825acb192e1c43e01b8a3d68298db86c3dc576e0c0e40e4fc3456c442b0a032dd444b68c8240925beeab9fcc00f59475a129bcc2 -EBUILD kbuild-9999.ebuild 2496 BLAKE2B 6f281f51a26449a6e7996e735d7a6ef542bdac79706b003a1ec7326b18e34b9b55f648c755656704bbd22628086b41c6c4e5812cf7b0a7a9610e5935356e2059 SHA512 91470baceec88b442caa17802c1728ed14de9986f224706c780686387f2d6d2ed586216a6822e6957e5e752f1e853e7622ac980d19fffc82ffce02dcdd1fb84d -MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 +EBUILD kbuild-0.1.9998.3499.ebuild 1909 BLAKE2B 67d33e930f6923bb2b5f83f4b24331dd9ad9d40d5b069b4a9654152d58bae2c7406bca0911b5d320fd4d1d51b27b54e762da2c3caab66676640ed78ed04500bf SHA512 fd84d39fa55c8560d50c1e7a535a9e79635499cae4da0b782e739a6a226c7a32c0b4b681c0006810ed3d5da01e7eacdadd74d239e761ca15b0782b32450fccd8 +EBUILD kbuild-0.1.9998.3572.ebuild 1713 BLAKE2B c6d6932ba08056f6d5c1f22ec93cd423c74e748b2aa41096f8f5d095f288d533ea35dd9fc91855fa4a1663512b565f9751d9dc72aff40466ac27a6b2b22df3e3 SHA512 1c4e662032e13d43fb47021ae11e28ec0b13348779fe665573665e51c12dbea2d6819c7341a3b48dd6d91aff37936b3e508a833e9883e24a1c6ca850b9385dac +EBUILD kbuild-9999.ebuild 1941 BLAKE2B fa08124413eff8318c819d1e769cb39823d8094e8a170600c863cbe60e1be92cb294fc8ce4842fa551c862cc73166cb39f302c59978903c610c668b462046481 SHA512 826ab3a5d4c52e981992725ebca72d599e6f6972dd51ade9de2004c39a98bf1943cacfcfb1d73b63b0fffb20216f7e888974988666d7000512f61c30f87bd3a0 +MISC metadata.xml 249 BLAKE2B 3bc7510e014ef8df90da064f4ef969eab6cc3311951a6dd556ca7b6f4e2e74e229f12a16ceb641393d1ec1f89d1942718267ecc664a8136df194c40de94a58e4 SHA512 63f88d798d410e4fb6670d199a86a665ab61b09cb9508b4047f13fe73070c682231d35a27c9d2c1fd82a1b8a84676d857b534c96bd09f4562cf13d7fc8de36b2 diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch new file mode 100644 index 000000000000..822194b1c98b --- /dev/null +++ b/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch @@ -0,0 +1,15 @@ +--- a/src/kash/Makefile.kmk 2022-11-12 16:42:14.195927909 +0200 ++++ b/src/kash/Makefile.kmk 2022-11-12 17:09:46.212159615 +0200 +@@ -210,8 +210,11 @@ + kash_USES = lex yacc + kash_LEXTOOL = FLEX + kash_LEXFLAGS = -8 +-#kash_YACCTOOL = BISON ++ifneq (,$(shell bison -V)) ++kash_YACCTOOL = BISON ++else + kash_YACCTOOL = YACC ++endif + kash_YACCFLAGS = -ld + kash_SOURCES += \ + arith.y \ diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch new file mode 100644 index 000000000000..94eb14ee6cb6 --- /dev/null +++ b/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch @@ -0,0 +1,11 @@ +--- a/src/kmk/remake.c ++++ b/src/kmk/remake.c +@@ -417,7 +417,7 @@ + if (!keep_going_flag && file->parent == 0) + { + const char *msg_joke = 0; +- extern struct dep *goals; ++ extern struct goaldep *goals; + + /* classics */ + if (!strcmp (file->name, "fire") diff --git a/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild index ef85feb53592..2954327d377c 100644 --- a/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild +++ b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools toolchain-funcs MY_P="${P}-src" DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks" -HOMEPAGE="http://svn.netlabs.org/kbuild/wiki" +HOMEPAGE="https://trac.netlabs.org/kbuild/wiki" #SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz" SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz" @@ -16,20 +16,13 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -# We cannot depend on virtual/yacc until bug #734354 has been fixed -DEPEND=" +BDEPEND=" sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/pkgconfig - || ( - dev-util/byacc - dev-util/yacc - 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 " SvnInfo.kmk || die + + cd "${S}/src/kmk" || die + eautoreconf + cd "${S}/src/sed" || die + eautoreconf + + sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \ + -e "s@_CFLAGS\.$(tc-arch)*.*=@& ${CFLAGS}@g" \ + -e "s@_CXXFLAGS\.$(tc-arch)*.*=@& ${CXXFLAGS}@g" \ + -i "${S}"/Config.kmk || die #332225 + tc-export CC PKG_CONFIG RANLIB #AR does not work here +} + +src_compile() { + kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \ + || die "bootstrap failed" +} + +src_install() { + kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \ + || die "install failed" +} diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild index b4bfd88222e3..15625b4196bf 100644 --- a/dev-util/kbuild/kbuild-9999.ebuild +++ b/dev-util/kbuild/kbuild-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools toolchain-funcs DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks" -HOMEPAGE="http://svn.netlabs.org/kbuild/wiki" +HOMEPAGE="https://trac.netlabs.org/kbuild/wiki" if [[ "${PV}" == *9999 ]] ; then inherit subversion ESVN_REPO_URI="http://svn.netlabs.org/repos/kbuild/trunk" @@ -20,19 +20,13 @@ LICENSE="GPL-3+" SLOT="0" IUSE="" -# We cannot depend on virtual/yacc until bug #734354 has been fixed -DEPEND=" +BDEPEND=" sys-apps/texinfo sys-devel/flex sys-devel/gettext - || ( - dev-util/byacc - dev-util/yacc - 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 " - + + ceamac@gentoo.org + Viorel Munteanu + diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest index 20ac0313e2b1..9794f078e4e8 100644 --- a/dev-util/rebar/Manifest +++ b/dev-util/rebar/Manifest @@ -16,5 +16,5 @@ DIST relx-4.7.0.tar 76288 BLAKE2B 99af942824344a617dc19b771d5db697fd8d8a19776a67 DIST ssl_verify_fun-1.1.6.tar 14848 BLAKE2B 31f8a92881803b1b93e2f65cf070449cd53af21b50f6aae7a9d036e28c17b2c093b2cb6238279191663ba011aab7fd604af8366ed8ae91b7b1d7c333f9de9ea8 SHA512 65980368629357ec16b37fd8ea1d42f7dbd7fa86318b329bec756e868b70eb4c93cf1bfe3dd34e1b6c011086ba32e11981d61e18fdad78564b77664e4d155a47 EBUILD rebar-2.6.4-r1.ebuild 671 BLAKE2B e2634bb01418f81f97c9d30a91083efb2ed87416b7e42a48e83acd5f07956ce14e8fed23f782bbba6437139da730c2cdabe7d0c523a447966b43c6e2dabf8033 SHA512 95cd7d605d4a3fe6940be8fe90d42db7b413bd0b1983a4ed44cd511308244e64e88d49a70306c9262556a1717402c41e42849c7420f1e958dfc300ce631eb382 EBUILD rebar-3.19.0.ebuild 2462 BLAKE2B 52b97493bde303b742e274dd294bde9df57a89b4bd4bce81034599e2297a73198373e9588da48fe54dc58e57b3100025a75fb78117c91fa76190a3b8795f8ffe SHA512 93c6921f3d94ebcf7d37f9e4f0d68717cb4e7e7924fac52297f95162940ba4ca8e2160b42cf37139721ad9c51ce63ab9cde1b71ba29491db2c1b409cc5e69c79 -EBUILD rebar-3.20.0.ebuild 1332 BLAKE2B 82f3176ba43bc84bc34f5ea45c415d824710d83b883fc4b0c25376e2e91fbe0f06857a8d1fbecc6f06de185ffaf0ab7914eb38cbfef70dd579bf1d69b9ede152 SHA512 8defe8a116fde21e602121cbb929041696d57debbef8a59d637507461783442ea6b1c954c5f1fcf3bcc601e24243053e13c3d5fe70f0b2a64b14dc258afc8647 +EBUILD rebar-3.20.0.ebuild 1360 BLAKE2B fa2e84097c9ff5e329262d17145ff7abca7122f357f560a59a35f168204e01fc46f18794e2e2660cebe7b33e77a62694a5482eebc56c5386890fcda726098dbd SHA512 7cbbd1cc19ac0e03c8e601340f7d315f82541bab665dda3513f93c7cc8024cbb0372b0fab139ba5c8aaaded723f4892daa254f66c6b91b50325b4d00a26d6d40 MISC metadata.xml 361 BLAKE2B d58dbad87667d782d0b5d81f0d9166b4e93dc0dea86b7b665acd6463c945949425746085f1a36cc952ad0ca3bcd7acb949a855c2aa57eae8a18bfd16120da1ae SHA512 aa1aae5e0688d6e921d4018714a37f079a333282baff352d7faeef3b1810471be421c99a705b1b97de0cb5c846efb69b3ec4f018033cb56efc307164fb8871c3 diff --git a/dev-util/rebar/rebar-3.20.0.ebuild b/dev-util/rebar/rebar-3.20.0.ebuild index 64591ebffb41..976fc3c4ceba 100644 --- a/dev-util/rebar/rebar-3.20.0.ebuild +++ b/dev-util/rebar/rebar-3.20.0.ebuild @@ -31,10 +31,13 @@ DEPEND="${RDEPEND}" src_unpack() { unpack ${P}.tar.gz - mkdir "${S}"/vendor/meck || die - tar -O -xf "${DISTDIR}"/meck-${MECK_PV}.tar contents.tar.gz | - tar -xzf - -C "${S}"/vendor/meck - assert + + if use test; then + mkdir "${S}"/vendor/meck || die + tar -O -xf "${DISTDIR}"/meck-${MECK_PV}.tar contents.tar.gz | + tar -xzf - -C "${S}"/vendor/meck + assert + fi } src_compile() { -- cgit v1.2.3