commit: 6e087164a8b12d812d02dfd99eb32452ad2a20d9 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Sat Mar 1 09:51:39 2025 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Sat Mar 1 10:01:33 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e087164
dev-build/kbuild: add missing attributes to clang patch When converting K&R -> ANSI I missed a few attributes resultimg in compile errors on x86. Closes: https://bugs.gentoo.org/948107 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> dev-build/kbuild/Manifest | 1 + dev-build/kbuild/kbuild-0.1.9998.3660-r1.ebuild | 75 +++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/dev-build/kbuild/Manifest b/dev-build/kbuild/Manifest index 095b7cae2350..548cb72fd604 100644 --- a/dev-build/kbuild/Manifest +++ b/dev-build/kbuild/Manifest @@ -2,4 +2,5 @@ DIST kbuild-0.1.9998.3499-fix-clang-16.patch.bz2 10271 BLAKE2B fe40a3a0afafefa10 DIST kbuild-0.1.9998.3499-src.tar.xz 2371580 BLAKE2B 847c5c67ded37ca87228ff7164d6c7f2f670a57f2fd94d6d0bf4f8896266e7fe5442666c03dbda016564a52dc91d10be83f0d4b0ef5093db0f5210ac8d5f3aaa SHA512 eebdcd1d2fa71313edd764d45a4aa3580078af22d7c5fed32d3d139a4f41c4e028282fdfdda0ee9b617ed0e8e63b8f5d065b3cf6647f08fe446560938b7577fc DIST kbuild-0.1.9998.3592-src.tar.xz 3975348 BLAKE2B 4b1862238f6f6c35ba1b586e11e17baca3b66c4ba3a97b17168ced902d7fcc9f1baa9a4b8669489902346b9bab67095f4ff4d008187c36cd2ef4b7841d4134be SHA512 b9ca1723b426db81571b048db5afe4b7c3d2d8a881003812e9a5f9df44c5109b628d77af415cf56eb44a8775c590a6f0e343efccf562ef83213c5525e081e59b DIST kbuild-0.1.9998.3660-fix-clang-16.patch.bz2 11762 BLAKE2B 48c083a8c008da3cac4e0e175b65d487f4c2ed49bd46baa7fca8d847f8894b52bb5e21d5c99bab8d06141a2de0924e69b61930e63fb8061d54d291469d28afb7 SHA512 cc45721a69b970062a24c95e1426865c097df190c63bfe9cc86ebb76ba66a7f892c30e76d33298ec0d9e0a24ba81ac22e99de3eb5f0b6da3d53b95f4334b5820 +DIST kbuild-0.1.9998.3660-r1-fix-clang-16.patch.bz2 11810 BLAKE2B a9f8c084a8b1b7fd76531ad882d5f29ca6bb8e287634e5eef194670dd7716781dc87a105f7765336cae6864864fe08ad9a71a4c608444d0662ebab808e383a10 SHA512 b76ed04f438058618e39748e8243cea98097bc478fe64d3faa4f3ffda8efe30d2bb75f9e9fb1ae0b1b5dac5428a07927095db37af77225dd8448b96866804e57 DIST kbuild-0.1.9998.3660-src.tar.xz 5281800 BLAKE2B 6c8ca902efddbbdce4588a046edc243ad76bd56cc319c94b4ffb7c25dad7c3ad9e5f816c960c6d80a13374995469d6f1d4c91a20860321a2d12b2456c21ba26f SHA512 d993de9a481a30aef7f4db2bbd6c19ffbeba6e5e505ae2ea63e7479007198d3eb89308860b90a5df8728997fb239ff5e553e6050c136468522c780a2a1e593e2 diff --git a/dev-build/kbuild/kbuild-0.1.9998.3660-r1.ebuild b/dev-build/kbuild/kbuild-0.1.9998.3660-r1.ebuild new file mode 100644 index 000000000000..004c44ac8ea1 --- /dev/null +++ b/dev-build/kbuild/kbuild-0.1.9998.3660-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +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.3660-r1-fix-clang-16.patch.bz2 +" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND=" + sys-apps/texinfo + app-alternatives/lex + sys-devel/gettext + virtual/pkgconfig + app-alternatives/yacc +" + +PATCHES=( + "${FILESDIR}/${PN}-0.1.9998.3407-unknown_configure_opt.patch" + "${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch" + "${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch" + "${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch" + "${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch" + "${FILESDIR}/${PN}-0.1.9998.3660-int-conversion.patch" + "${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch" + "${FILESDIR}/${PN}-0.1.9998.3660-gcc-15.patch" + + "${WORKDIR}/${PN}-0.1.9998.3660-r1-fix-clang-16.patch" +) + +pkg_setup() { + # Package fails with distcc (bug #255371) + export DISTCC_DISABLE=1 +} + +src_prepare() { + default + + # 905419 - build fails if /bin/sh is something other than bash + sed 's:ln -s /bin/sh:ln -s /bin/bash:' -i bootstrap.gmk || die + + # Add a file with the svn revision this package was pulled from + printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \ + > 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 # bug #923130: AR must be both here and below +} + +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" +}
