From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E59611580B9 for ; Wed, 25 Aug 2021 08:39:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2DC8E0874; Wed, 25 Aug 2021 08:39:48 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CC212E0876 for ; Wed, 25 Aug 2021 08:39:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66B99342B78 for ; Wed, 25 Aug 2021 08:39:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A7FA87B for ; Wed, 25 Aug 2021 08:39:45 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1629880770.68e5e01daa13f366aa7faccc63c10575e6f972e9.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/, dev-util/kbuild/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/kbuild/Manifest dev-util/kbuild/files/kbuild-0.1.9998.3499-gold.patch dev-util/kbuild/files/kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch dev-util/kbuild/kbuild-0.1.9998.3499.ebuild X-VCS-Directories: dev-util/kbuild/ dev-util/kbuild/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 68e5e01daa13f366aa7faccc63c10575e6f972e9 X-VCS-Branch: master Date: Wed, 25 Aug 2021 08:39:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2e7ed230-6b45-4db9-a69e-f649ab0a564a X-Archives-Hash: b86100ed1bf1f6e1543915a11ccbb102 commit: 68e5e01daa13f366aa7faccc63c10575e6f972e9 Author: Lars Wendler gentoo org> AuthorDate: Wed Aug 25 08:36:15 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Aug 25 08:39:30 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e5e01d dev-util/kbuild: Bump to version 0.1.9998.3499 Thanks-to: gmx.com> Bug: https://bugs.gentoo.org/787572 Bug: https://bugs.gentoo.org/788691 Signed-off-by: Lars Wendler gentoo.org> dev-util/kbuild/Manifest | 1 + .../kbuild/files/kbuild-0.1.9998.3499-gold.patch | 15 +++++ ...98.3499-kash-no_separate_parser_allocator.patch | 11 ++++ dev-util/kbuild/kbuild-0.1.9998.3499.ebuild | 75 ++++++++++++++++++++++ 4 files changed, 102 insertions(+) diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest index 52494588fed..2b1360cda90 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 00000000000..ee870da2ee5 --- /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 00000000000..24265b96e13 --- /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 00000000000..574abc5324a --- /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 + 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" +}