diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2021-08-25 10:36:15 +0200 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2021-08-25 10:39:30 +0200 |
commit | 68e5e01daa13f366aa7faccc63c10575e6f972e9 (patch) | |
tree | 042556d10b41d7035455b41f1d4705a3c2d8b19b /dev-util/kbuild | |
parent | dev-python/translate-toolkit: python3_10 (diff) | |
download | gentoo-68e5e01daa13f366aa7faccc63c10575e6f972e9.tar.gz gentoo-68e5e01daa13f366aa7faccc63c10575e6f972e9.tar.bz2 gentoo-68e5e01daa13f366aa7faccc63c10575e6f972e9.zip |
dev-util/kbuild: Bump to version 0.1.9998.3499
Thanks-to: <genBTC@gmx.com>
Bug: https://bugs.gentoo.org/787572
Bug: https://bugs.gentoo.org/788691
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'dev-util/kbuild')
4 files changed, 102 insertions, 0 deletions
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest index 52494588fed6..2b1360cda901 100644 --- a/dev-util/kbuild/Manifest +++ b/dev-util/kbuild/Manifest @@ -1 +1,2 @@ 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 diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3499-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3499-gold.patch new file mode 100644 index 000000000000..ee870da2ee55 --- /dev/null +++ b/dev-util/kbuild/files/kbuild-0.1.9998.3499-gold.patch @@ -0,0 +1,15 @@ +--- kbuild-0.1.9998.3499/src/kmk/Makefile.kmk ++++ kbuild-0.1.9998.3499/src/kmk/Makefile.kmk +@@ -60,9 +60,9 @@ + ifneq ($(KBUILD_TARGET),os2) + TEMPLATE_BIN-KMK_INCS += glob + endif +-TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) +-TEMPLATE_BIN-KMK_LIBS.x86 = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS.x86) +-TEMPLATE_BIN-KMK_LIBS.amd64 = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS.amd64) ++TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread ++TEMPLATE_BIN-KMK_LIBS.x86 = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS.x86) pthread ++TEMPLATE_BIN-KMK_LIBS.amd64 = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS.amd64) pthread + ifdef ELECTRIC_HEAP # for electric heap (see electric.c). + ifeq ($(KBUILD_TARGET),win) + TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1 diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch new file mode 100644 index 000000000000..24265b96e137 --- /dev/null +++ b/dev-util/kbuild/files/kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch @@ -0,0 +1,11 @@ +--- kbuild-0.1.9998.3499/src/kash/Makefile.kmk ++++ kbuild-0.1.9998.3499/src/kash/Makefile.kmk +@@ -35,7 +35,7 @@ + kash_TEMPLATE = BIN-THREADED + kash_NAME = kmk_ash + kash_ASTOOL = YASM +-kash_DEFS = lint SHELL SMALL KASH_SEPARATE_PARSER_ALLOCATOR ++kash_DEFS = lint SHELL SMALL + if "$(KBUILD_TARGET)" != "win" || defined(KASH_WIN_FORKED_MODE) + kash_DEFS += SH_FORKED_MODE + else diff --git a/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild new file mode 100644 index 000000000000..574abc5324a7 --- /dev/null +++ b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" +#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz" +SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +# We cannot depend on virtual/yacc until bug #734354 has been fixed +DEPEND=" + sys-apps/texinfo + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + || ( + dev-util/byacc + dev-util/yacc + <sys-devel/bison-3.7 + ) +" +RDEPEND="" +BDEPEND="virtual/pkgconfig" + +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" + + # Please check on version bumps if this can be removed + "${FILESDIR}/${PN}-0.1.9998.3499-kash-no_separate_parser_allocator.patch" +) + +pkg_setup() { + # Package fails with distcc (bug #255371) + export DISTCC_DISABLE=1 +} + +src_prepare() { + default + + # 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" \ + -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" +} |