diff options
Diffstat (limited to 'dev-build')
-rw-r--r-- | dev-build/Manifest.gz | bin | 7219 -> 7223 bytes | |||
-rw-r--r-- | dev-build/kbuild/Manifest | 7 | ||||
-rw-r--r-- | dev-build/kbuild/files/kbuild-0.1.9998.3660-gcc-15.patch | 19 | ||||
-rw-r--r-- | dev-build/kbuild/files/kbuild-0.1.9998.3660-int-conversion.patch | 17 | ||||
-rw-r--r-- | dev-build/kbuild/kbuild-0.1.9998.3660.ebuild | 75 | ||||
-rw-r--r-- | dev-build/kbuild/kbuild-9999.ebuild | 21 |
6 files changed, 123 insertions, 16 deletions
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz Binary files differindex dc724bf7426a..045046e67ac9 100644 --- a/dev-build/Manifest.gz +++ b/dev-build/Manifest.gz diff --git a/dev-build/kbuild/Manifest b/dev-build/kbuild/Manifest index c8eb298638f1..22c70108d096 100644 --- a/dev-build/kbuild/Manifest +++ b/dev-build/kbuild/Manifest @@ -7,12 +7,17 @@ AUX kbuild-0.1.9998.3499-int-conversion.patch 719 BLAKE2B 77d4efe872b1114b2fa155 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.3660-gcc-15.patch 517 BLAKE2B 3cea6c6a1fc8ac76895161f7fec38fefd4a6cb278056711001b294323ba5a91a6f890d8226b5377f6b5bc46a56ead68107ed05e2b99d51a9280a257913d8f94b SHA512 4332711220300040b91355fc6b55c0504cdf1a6ae1f0a1d82531f207a2caca6b1b9817ad1df22c9368cf24c3c48ad4b5d91a4a03d6e1e8e1bea200e251e0637d +AUX kbuild-0.1.9998.3660-int-conversion.patch 394 BLAKE2B 8e4a294cd9fb46c93f3c7caee1727308266d07c7a83ddf85ceddc137e77499a795f798a7196bcae487ee85bb8598b57be52481dfd11074fb4924f02a760a8064 SHA512 0fc2544c2478d2cf4485a2816dd3ee2b6ad4cb0a3114f606550feda3af08fff2aa87cdebd1121a431b966e2c95aa4acfc47a24ef4bee60b80063698c441114f6 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.3499-fix-clang-16.patch.bz2 10271 BLAKE2B fe40a3a0afafefa10da6fe675eec72392fe6bcc318d1d8728363b9e855d10e11d0b7189f875cd2d496bf4871f87b96ed2ad6775e6968e044cc107dad23f5fcab SHA512 8f11355f0bfdda431dba4cb4dcd73c5bf0b10d2380495fe91292846b57fb7f80711d711b0b229fb4a865512d90010a181d1e1ab7d2b57d1a1751ce79440b02dc 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-src.tar.xz 5281800 BLAKE2B 6c8ca902efddbbdce4588a046edc243ad76bd56cc319c94b4ffb7c25dad7c3ad9e5f816c960c6d80a13374995469d6f1d4c91a20860321a2d12b2456c21ba26f SHA512 d993de9a481a30aef7f4db2bbd6c19ffbeba6e5e505ae2ea63e7479007198d3eb89308860b90a5df8728997fb239ff5e553e6050c136468522c780a2a1e593e2 EBUILD kbuild-0.1.9998.3499-r4.ebuild 2178 BLAKE2B 897369bb29eb47cb2b704aeff61fefdc7f17de9a6a085a9789aea9a8be37757e082ccd85106ed8c8727111ec4b7480d8da136b9175e672f785f58ac0c35e0b9b SHA512 bab0600078b428472b9825506eefdf4d31a5afd2dd2551455aa0eba20b1643e9d5cb2572e10af58779ccf36b47adf1e97833a8a59224e4ed3c56337161abd0c3 EBUILD kbuild-0.1.9998.3592.ebuild 2128 BLAKE2B 7b05945eaa6bb1afd241652bc1da82759c668d5fb15d2f23b574ccf8ace9e9a11b64e4c9081779d81f174805ff6d2ac73d87f510cedeeb83b69a72beb7c64a77 SHA512 0a9d9c9668108a42c107e8a1a5f611052aa09aa4c34de3c927c385ef30c512aaadc9d1ab7d2bd57375f01f657e43b175a7fa4f3a34e7a81cf7f51b756e5bc175 -EBUILD kbuild-9999.ebuild 2122 BLAKE2B 5893c6ba8f21ff8fe34572dfb965c5557325dda112c661b546a681d31dabbc3290ad904f5380c0e5f96805e474a21b12a047997a256f7a39f2c29f735d1572cd SHA512 e0ba648de7ff76a4f0bab558d2216c4261ba7bfa05e8602b1e42bc6980a3c80aa52aed44447dabebf3541edfcaaaadc73c0ca536776d96e4345cce2864f2b8de +EBUILD kbuild-0.1.9998.3660.ebuild 2082 BLAKE2B dcc3354edf6bb375944832c81af6d81d1ecede54649a785b35490a93fb360eec5158ac0eeb8201357da95fe67983979dfee67878430deb5a4f79e20a4cbb3a25 SHA512 2c745d35eb63d16cb2131f53cfb5ff02f735c56f87af3b2c4202b1446a722aabbbf4421b7a8d8b38fa228f1c6efa4c7a59fc8edc701a91e7521b6df1e7268634 +EBUILD kbuild-9999.ebuild 1815 BLAKE2B fe42fec4355cd7c7f95541db1d82435645b06f2dd6f381fc52782ef5a1d755ee21d469400e96f6f577ae92c4479b37951e8c381d2bc3662a64d1be7c80645c6e SHA512 0694478c5e08e1c5b61e703cbc2363ed4340b937a396c92202a18e6650a2becd0aa5076901fc9b6cef884d19d9d50ec210bc92fb2e2d59e1593056306a53f0c1 MISC metadata.xml 249 BLAKE2B 3bc7510e014ef8df90da064f4ef969eab6cc3311951a6dd556ca7b6f4e2e74e229f12a16ceb641393d1ec1f89d1942718267ecc664a8136df194c40de94a58e4 SHA512 63f88d798d410e4fb6670d199a86a665ab61b09cb9508b4047f13fe73070c682231d35a27c9d2c1fd82a1b8a84676d857b534c96bd09f4562cf13d7fc8de36b2 diff --git a/dev-build/kbuild/files/kbuild-0.1.9998.3660-gcc-15.patch b/dev-build/kbuild/files/kbuild-0.1.9998.3660-gcc-15.patch new file mode 100644 index 000000000000..0ab71235a982 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-0.1.9998.3660-gcc-15.patch @@ -0,0 +1,19 @@ +diff --git a/src/kmk/glob/fnmatch.c b/src/kmk/glob/fnmatch.c +index b346e10..008a4a7 100644 +--- a/src/kmk/glob/fnmatch.c ++++ b/src/kmk/glob/fnmatch.c +@@ -120,14 +120,6 @@ USA. */ + /* Avoid depending on library functions or files + whose names are inconsistent. */ + +-# if !defined _LIBC && !defined getenv && !defined _MSC_VER +-extern char *getenv (); +-# endif +- +-# ifndef errno +-extern int errno; +-# endif +- + /* This function doesn't exist on most systems. */ + + # if !defined HAVE___STRCHRNUL && !defined _LIBC diff --git a/dev-build/kbuild/files/kbuild-0.1.9998.3660-int-conversion.patch b/dev-build/kbuild/files/kbuild-0.1.9998.3660-int-conversion.patch new file mode 100644 index 000000000000..9e472abbfdd6 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-0.1.9998.3660-int-conversion.patch @@ -0,0 +1,17 @@ +Fix int to pointer conversion for clang + +Note - this parameter was not actually used inside eval_buffer because of a define. + +Bug: https://bugs.gentoo.org/875449 + +--- a/src/kmk/loadapi.c ++++ b/src/kmk/loadapi.c +@@ -20,6 +20,8 @@ + #include "variable.h" + #include "dep.h" + ++#include <string.h> ++ + /* Allocate a buffer in our context, so we can free it. */ + char * + gmk_alloc (unsigned int len) diff --git a/dev-build/kbuild/kbuild-0.1.9998.3660.ebuild b/dev-build/kbuild/kbuild-0.1.9998.3660.ebuild new file mode 100644 index 000000000000..36fda5b3b52b --- /dev/null +++ b/dev-build/kbuild/kbuild-0.1.9998.3660.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 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-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-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" +} diff --git a/dev-build/kbuild/kbuild-9999.ebuild b/dev-build/kbuild/kbuild-9999.ebuild index bef735b7059a..308b44b81180 100644 --- a/dev-build/kbuild/kbuild-9999.ebuild +++ b/dev-build/kbuild/kbuild-9999.ebuild @@ -3,19 +3,12 @@ EAPI=8 -inherit autotools toolchain-funcs +inherit autotools subversion toolchain-funcs DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks" HOMEPAGE="https://trac.netlabs.org/kbuild/wiki" -if [[ "${PV}" == *9999 ]] ; then - inherit subversion - ESVN_REPO_URI="http://svn.netlabs.org/repos/kbuild/trunk" -else - MY_P="${P}-src" - #SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz" - SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi +ESVN_REPO_URI="http://svn.netlabs.org/repos/kbuild/trunk" + LICENSE="GPL-3+" SLOT="0" @@ -30,14 +23,12 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-0.1.9998.3407-unknown_configure_opt.patch" "${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" "${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.3660-int-conversion.patch" "${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch" + "${FILESDIR}/${PN}-0.1.9998.3660-gcc-15.patch" ) pkg_setup() { @@ -63,7 +54,7 @@ src_prepare() { -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 + tc-export CC PKG_CONFIG RANLIB AR # bug #923130: AR must be both here and below } src_compile() { |