commit: a250962a6b0de522e1b6191bf724a59474edf2c7 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Fri Apr 14 08:15:45 2023 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Fri Apr 14 09:31:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a250962a
dev-util/kbuild: fix compilation on x86 The clang-16 patch broke x86. Fix it and revbump. Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> dev-util/kbuild/Manifest | 1 + ...0.1.9998.3572-r3.ebuild => kbuild-0.1.9998.3499-r4.ebuild} | 11 ++++++++--- ...0.1.9998.3572-r3.ebuild => kbuild-0.1.9998.3572-r4.ebuild} | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest index 4d02cb222e1c..193dad82a8e8 100644 --- a/dev-util/kbuild/Manifest +++ b/dev-util/kbuild/Manifest @@ -1,3 +1,4 @@ +DIST kbuild-0.1.9998.3499-fix-clang-16.patch.bz2 10271 BLAKE2B fe40a3a0afafefa10da6fe675eec72392fe6bcc318d1d8728363b9e855d10e11d0b7189f875cd2d496bf4871f87b96ed2ad6775e6968e044cc107dad23f5fcab SHA512 8f11355f0bfdda431dba4cb4dcd73c5bf0b10d2380495fe91292846b57fb7f80711d711b0b229fb4a865512d90010a181d1e1ab7d2b57d1a1751ce79440b02dc DIST kbuild-0.1.9998.3499-fix-clang.patch.bz2 10161 BLAKE2B a6f5a5c35553825682db92ab5ab0e1bd638e246fd1fa62dfaf97085e33940ca41c8ab29463ebb61d00c19c6775767ddb8fdfe9c28425741e1616cc43799631a5 SHA512 1a3a7509d899ba2d827329dd6658a67ee93520e89b51ea42f3268053c732785d0c7f808961bde5d5312cc604bedaf617df50eadf4efbb8c4216fe404d378473e 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 diff --git a/dev-util/kbuild/kbuild-0.1.9998.3572-r3.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3499-r4.ebuild similarity index 86% copy from dev-util/kbuild/kbuild-0.1.9998.3572-r3.ebuild copy to dev-util/kbuild/kbuild-0.1.9998.3499-r4.ebuild index 2b1532f82b37..12fd9f1de8cb 100644 --- a/dev-util/kbuild/kbuild-0.1.9998.3572-r3.ebuild +++ b/dev-util/kbuild/kbuild-0.1.9998.3499-r4.ebuild @@ -9,12 +9,12 @@ DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks HOMEPAGE="https://trac.netlabs.org/kbuild/wiki"; SRC_URI=" https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}-src.tar.xz - https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-0.1.9998.3499-fix-clang.patch.bz2 + https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-0.1.9998.3499-fix-clang-16.patch.bz2 " LICENSE="GPL-3+" SLOT="0" -#KEYWORDS="~amd64 ~x86" # for testing only. This version is buggy +KEYWORDS="~amd64 ~x86" IUSE="" BDEPEND=" @@ -30,13 +30,18 @@ PATCHES=( "${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch" "${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch" "${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch" + "${FILESDIR}/${PN}-0.1.9998.3499-gold.patch" + + # Please check on version bumps if this can be removed + "${FILESDIR}/${PN}-0.1.9998.3499-kash-no_separate_parser_allocator.patch" + "${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch" "${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch" "${FILESDIR}/${PN}-0.1.9998.3499-implicit-function-declaration.patch" "${FILESDIR}/${PN}-0.1.9998.3499-int-conversion.patch" "${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch" - "${WORKDIR}/${PN}-0.1.9998.3499-fix-clang.patch" + "${WORKDIR}/${PN}-0.1.9998.3499-fix-clang-16.patch" ) pkg_setup() { diff --git a/dev-util/kbuild/kbuild-0.1.9998.3572-r3.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3572-r4.ebuild similarity index 95% rename from dev-util/kbuild/kbuild-0.1.9998.3572-r3.ebuild rename to dev-util/kbuild/kbuild-0.1.9998.3572-r4.ebuild index 2b1532f82b37..53206a6cd816 100644 --- a/dev-util/kbuild/kbuild-0.1.9998.3572-r3.ebuild +++ b/dev-util/kbuild/kbuild-0.1.9998.3572-r4.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks HOMEPAGE="https://trac.netlabs.org/kbuild/wiki"; SRC_URI=" https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}-src.tar.xz - https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-0.1.9998.3499-fix-clang.patch.bz2 + https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-0.1.9998.3499-fix-clang-16.patch.bz2 " LICENSE="GPL-3+" @@ -36,7 +36,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.1.9998.3499-int-conversion.patch" "${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch" - "${WORKDIR}/${PN}-0.1.9998.3499-fix-clang.patch" + "${WORKDIR}/${PN}-0.1.9998.3499-fix-clang-16.patch" ) pkg_setup() {
