public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/, dev-util/kbuild/files/
@ 2017-10-20  8:28 Lars Wendler
  0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2017-10-20  8:28 UTC (permalink / raw
  To: gentoo-commits

commit:     1ad141de5578cd3389a9e36f18473e588bf27601
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 20 08:27:06 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Oct 20 08:28:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ad141de

dev-util/kbuild: Bump to version 0.1.9998_pre20131130

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 dev-util/kbuild/Manifest                           |  1 +
 .../files/kbuild-0.1.9998_pre20171020-gold.patch   | 11 ++++
 dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild | 62 ++++++++++++++++++++++
 3 files changed, 74 insertions(+)

diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index dca309fd1f5..a483ba76729 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -1,2 +1,3 @@
 DIST kBuild-0.1.9998-pre20131130-src.tar.xz 1707632 SHA256 def0a44cc0a91b6aa8a80f73ace0cfc315f298ba3e0d3d81fe52834091b68586 SHA512 66f418c0e052389d2b5cfc4d46bc8598ceaeded369151047e455e921bef494ec42099cdc368d24b572eacd809bb7c124d07e0fab54788af01664b72f571fb047 WHIRLPOOL 95caf78eaa6ead0d9a009879a2ba9a01b138760345eb38a6786ceaf0262520e1827b5e4401884cd6d3849bfa5528f45a9a5cdac5ae61e6cbd1753dec0ba0da2f
 DIST kbuild-0.1.9998_pre20131130-tools_and_units_updates.patch.xz 7344 SHA256 0dcfb79274a96f1a67aa466ca468bebf00a39544517ad0d05c09595341d11e1a SHA512 91aac638e9f4cc321f7d06c89be1a4ce4e57aa88165c71a4f68a73ad51f049f631b2d7427178014408b551fac5678f0c0bf806a61f9d749daf5019f1b6a61bb0 WHIRLPOOL bb0a295e93870364ab176eaca3d07e18567148e5ba431a205085220b305b5cd78c210bea8896611bd4b9b47a71a527afc55a9a30a64b707993c576466609ee8a
+DIST kbuild-0.1.9998_pre20171020-src.tar.xz 2190856 SHA256 96b031b183ffb63cbbf77b1c68325868c1064d377c799ffcab0cdfb61d01aea7 SHA512 53c55a520f3711d1141b10eaeb3bec5dc57bb8476c6b658826e05dbb525eda43a0007dd94dcdde31ea39ad0bb29223ef8ad2a72da1404e53919e444039794043 WHIRLPOOL 86ce166505191eca0a83a238d61c6d2935fc43bd6d6a93c0b0dcec529a797d8a9589be4bf9498934bf7b6b80dcbfe5cf4193cd2969bf1fff5bc41209a51e5af0

diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch
new file mode 100644
index 00000000000..4c98942c0f3
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch
@@ -0,0 +1,11 @@
+--- kbuild-0.1.9998_pre20171020/src/kmk/Makefile.kmk
++++ kbuild-0.1.9998_pre20171020/src/kmk/Makefile.kmk
+@@ -57,7 +57,7 @@
+ 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 = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread
+ ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
+ 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/kbuild-0.1.9998_pre20171020.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild
new file mode 100644
index 00000000000..612e8ebbab1
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils 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 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="
+	sys-apps/texinfo
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/yacc
+"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${PN}-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_pre20171020-gold.patch"
+)
+
+src_prepare() {
+	rm -rf "${S}/kBuild/bin"
+
+	default
+
+	mv src/kmk/configure.{in,ac} || die
+
+	cd "${S}/src/kmk" || die
+	eautoreconf
+	cd "${S}/src/sed" || die
+	# AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104)
+	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
+	eautoreconf
+
+	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
+		-i "${S}"/Config.kmk || die #332225
+	tc-export CC 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"
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/, dev-util/kbuild/files/
@ 2020-08-16 22:46 Thomas Deutschmann
  0 siblings, 0 replies; 7+ messages in thread
From: Thomas Deutschmann @ 2020-08-16 22:46 UTC (permalink / raw
  To: gentoo-commits

commit:     66de2d4026054822aab89ac443e9bc726c9aae25
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 21:17:38 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 22:46:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66de2d40

dev-util/kbuild: fix building against glibc-2.32+

Closes: https://bugs.gentoo.org/736635
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../files/kbuild-0.1.9998.3407-glibc-2.32+.patch   | 59 ++++++++++++++++++++++
 dev-util/kbuild/kbuild-0.1.9998.3407.ebuild        |  1 +
 2 files changed, 60 insertions(+)

diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch
new file mode 100644
index 00000000000..68a39fc68de
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch
@@ -0,0 +1,59 @@
+http://trac.netlabs.org/kbuild/changeset?format=diff&new=3408&old=3407&new_path=%2Ftrunk&old_path=%2Ftrunk
+
+--- a/src/kash/jobs.c
++++ b/src/kash/jobs.c
+@@ -390,4 +390,5 @@
+ 				fmtstr(s + col, 16, "Done");
+ 		} else {
++			const char *pszSigNm;
+ #if JOBS
+ 			if (WIFSTOPPED(ps->status))
+@@ -397,6 +398,7 @@
+ 				st = WTERMSIG(ps->status);
+ 			st &= 0x7f;
+-			if (st < NSIG && sys_siglist[st])
+-				scopyn(sys_siglist[st], s + col, 32);
++			pszSigNm = st < NSIG ? strsignal(st) : NULL;
++			if (pszSigNm)
++				scopyn(pszSigNm, s + col, 32);
+ 			else
+ 				fmtstr(s + col, 16, "Signal %d", st);
+--- a/src/kash/shinstance.h
++++ b/src/kash/shinstance.h
+@@ -381,10 +381,6 @@
+ /*# define SIGBREAK         21 */
+ /*# define SIGABRT          22 */
+-
+-#   define sys_siglist      sys_signame
++const char *strsignal(int iSig);
+ #endif /* _MSC_VER */
+-#ifdef __sun__
+-#   define sys_siglist      _sys_siglist
+-#endif
+ #ifndef HAVE_SYS_SIGNAME
+ extern char sys_signame[NSIG][16];
+--- a/src/kash/sys_signame.c
++++ b/src/kash/sys_signame.c
+@@ -12,5 +12,5 @@
+ void init_sys_signame(void)
+ {
+-    unsigned i;
++	unsigned i;
+ 	if (sys_signame_initialized)
+ 		return;
+@@ -120,2 +120,14 @@
+ 	sys_signame_initialized = 1;
+ }
++
++#if defined(_MSC_VER)
++const char *strsignal(int iSig)
++{
++    if (!sys_signame_initialized)
++	init_sys_signame();
++    if (iSig < NSIG)
++	return sys_signame(iSig);
++    return NULL;
++}
++#endif
++
+ 

diff --git a/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
index e6a93dc696e..3c367b7ff0c 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
@@ -35,6 +35,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
 	"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
 	"${FILESDIR}/${PN}-0.1.9998.3407-gold.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3407-glibc-2.32+.patch"
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/, dev-util/kbuild/files/
@ 2020-11-27 12:37 Lars Wendler
  0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2020-11-27 12:37 UTC (permalink / raw
  To: gentoo-commits

commit:     8c781e8391d176d572d480551bd72687b10ad309
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 12:36:03 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 12:36:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c781e83

dev-util/kbuild: Removed old

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-util/kbuild/Manifest                           |  1 -
 .../files/kbuild-0.1.9998_pre20171020-gold.patch   | 11 ----
 .../files/kbuild-unknown-configure-opt.patch       | 11 ----
 dev-util/kbuild/kbuild-0.1.9998.3149.ebuild        | 73 ----------------------
 4 files changed, 96 deletions(-)

diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 266a61f5a37..52494588fed 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -1,2 +1 @@
-DIST kbuild-0.1.9998.3149-src.tar.xz 2314792 BLAKE2B 84aa1dbbaefc64a3ecc954c383d0516d88efd1a1791180164dd7bc3b26cd82a4a8c35c4b308e9fc960f114c40e77ea4a27acd94b62883c379acefb324a7c3f72 SHA512 74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c
 DIST kbuild-0.1.9998.3407-src.tar.xz 2351596 BLAKE2B ed562a739831c465ba66b2c357b1ab52cb072e61fa597d96d9e66e1b57a7f790c7e37fc82ef7ff49114b0cb4cb623e558d96864e98ca36bd42fe16e58e863dc7 SHA512 0a1fddff595f7ccfdb65a1a660c82860f132796b42149b8b40808d0df489312dcd96402236150c8ec5ec32c1cc142ce7af1150e10fdb83bf798e4d690dd64314

diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch
deleted file mode 100644
index 4c98942c0f3..00000000000
--- a/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kbuild-0.1.9998_pre20171020/src/kmk/Makefile.kmk
-+++ kbuild-0.1.9998_pre20171020/src/kmk/Makefile.kmk
-@@ -57,7 +57,7 @@
- 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 = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread
- ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
- 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-unknown-configure-opt.patch b/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch
deleted file mode 100644
index 36cabae2b13..00000000000
--- a/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/bootstrap.gmk
-+++ b/bootstrap.gmk
-@@ -179,7 +179,7 @@
- 	echo done > $@
- 
- $(OUTDIR)/sed/ts-configured: $(OUTDIR)/sed/ts-autoreconf
--	cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --without-libintl --disable-nls
-+	cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --disable-nls
- 	echo done > $@
- 
- $(OUTDIR)/sed/config.h: $(OUTDIR)/sed/ts-configured

diff --git a/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
deleted file mode 100644
index a3c63589918..00000000000
--- a/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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=""
-
-DEPEND="
-	sys-apps/texinfo
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/yacc
-"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-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_pre20171020-gold.patch"
-)
-
-pkg_setup() {
-	# Package fails with distcc (bug #255371)
-	export DISTCC_DISABLE=1
-}
-
-src_prepare() {
-	rm -rf "${S}/kBuild/bin"
-
-	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
-
-	# bootstrapping breaks because of missing po/Makefile.in.in (r3149)
-	sed '/^AC_CONFIG_FILES/s@ po/Makefile\.in@@' \
-		-i src/kmk/configure.ac || die
-
-	cd "${S}/src/kmk" || die
-	eautoreconf
-	cd "${S}/src/sed" || die
-	# AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104)
-	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || 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"
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/, dev-util/kbuild/files/
@ 2021-08-25  8:39 Lars Wendler
  0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2021-08-25  8:39 UTC (permalink / raw
  To: gentoo-commits

commit:     68e5e01daa13f366aa7faccc63c10575e6f972e9
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 25 08:36:15 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> 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: <genBTC <AT> gmx.com>
Bug: https://bugs.gentoo.org/787572
Bug: https://bugs.gentoo.org/788691
Signed-off-by: Lars Wendler <polynomial-c <AT> 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
+		<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"
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/, dev-util/kbuild/files/
@ 2022-11-20  8:31 Viorel Munteanu
  0 siblings, 0 replies; 7+ messages in thread
From: Viorel Munteanu @ 2022-11-20  8:31 UTC (permalink / raw
  To: gentoo-commits

commit:     12d392710984ee1d107824136f8080ab0c351fd7
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  4 16:48:57 2022 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 08:30:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d39271

dev-util/kbuild: add 0.1.9998.3572

Add this unkeyworded, needs more testing.

It can be used to compile virtualbox-7+, but fails for 6.x

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 dev-util/kbuild/Manifest                           |  1 +
 .../files/kbuild-0.1.9998.3572-fix-bison.patch     | 15 +++++
 .../files/kbuild-0.1.9998.3572-fix-lto.patch       | 11 ++++
 dev-util/kbuild/kbuild-0.1.9998.3572.ebuild        | 66 ++++++++++++++++++++++
 4 files changed, 93 insertions(+)

diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 2b1360cda901..bcd3da9adc45 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -1,2 +1,3 @@
 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
+DIST kbuild-0.1.9998.3572-src.tar.xz 3973848 BLAKE2B 103e42d719fd77bc5c55aea48bdfd01c8ad136529cc76cc8c1297f87e21e5d4e2e7149f9321c5174808613a84331dbea8bb4c0a7662eb2de9e1045c8ad365047 SHA512 96bb5e1759990bf3acaca4b0ba7c02926c6607b0cd94f7fca222b13eee5c3364c64b35e3473c5cee45fa094cb2b851ac9f3a3a9fe60cff894baf46238ccb4006

diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch
new file mode 100644
index 000000000000..822194b1c98b
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch
@@ -0,0 +1,15 @@
+--- a/src/kash/Makefile.kmk	2022-11-12 16:42:14.195927909 +0200
++++ b/src/kash/Makefile.kmk	2022-11-12 17:09:46.212159615 +0200
+@@ -210,8 +210,11 @@
+ kash_USES = lex yacc
+ kash_LEXTOOL = FLEX
+ kash_LEXFLAGS = -8
+-#kash_YACCTOOL = BISON
++ifneq (,$(shell bison -V))
++kash_YACCTOOL = BISON
++else
+ kash_YACCTOOL = YACC
++endif
+ kash_YACCFLAGS = -ld
+ kash_SOURCES += \
+ 	arith.y \

diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch
new file mode 100644
index 000000000000..94eb14ee6cb6
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch
@@ -0,0 +1,11 @@
+--- a/src/kmk/remake.c
++++ b/src/kmk/remake.c
+@@ -417,7 +417,7 @@
+       if (!keep_going_flag && file->parent == 0)
+         {
+           const char *msg_joke = 0;
+-          extern struct dep *goals;
++          extern struct goaldep *goals;
+ 
+           /* classics */
+           if (!strcmp (file->name, "fire")

diff --git a/dev-util/kbuild/kbuild-0.1.9998.3572.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3572.ebuild
new file mode 100644
index 000000000000..185af8e39997
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.9998.3572.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 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"
+
+LICENSE="GPL-3+"
+SLOT="0"
+#KEYWORDS="~amd64 ~x86"	# for testing only.  This version is buggy
+IUSE=""
+
+BDEPEND="
+	sys-apps/texinfo
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	virtual/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_pre20120806-qa.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"
+)
+
+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" \
+		-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
+}
+
+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"
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/, dev-util/kbuild/files/
@ 2022-11-27 10:08 Viorel Munteanu
  0 siblings, 0 replies; 7+ messages in thread
From: Viorel Munteanu @ 2022-11-27 10:08 UTC (permalink / raw
  To: gentoo-commits

commit:     f2059dfcf305fa26ba92d034ae6d889e15e6fb29
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 11:13:48 2022 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 10:06:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2059dfc

dev-util/kbuild: fix compilation with clang

Closes: https://bugs.gentoo.org/875449
Closes: https://bugs.gentoo.org/734302
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 .../kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch | 23 +++++++++++++++++
 .../kbuild-0.1.9998.3499-int-conversion.patch      | 26 +++++++++++++++++++
 ...-9999.ebuild => kbuild-0.1.9998.3499-r2.ebuild} | 30 +++++++++++-----------
 ...-9999.ebuild => kbuild-0.1.9998.3572-r2.ebuild} | 23 ++++++-----------
 dev-util/kbuild/kbuild-9999.ebuild                 |  2 ++
 5 files changed, 74 insertions(+), 30 deletions(-)

diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch
new file mode 100644
index 000000000000..7d7f1f7232eb
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch
@@ -0,0 +1,23 @@
+A few files are compiled with gcc regardless of setting CC
+
+This file seems to do some guesswork, override it with CC if set
+
+Bug: https://bugs.gentoo.org/734302
+
+--- a/kBuild/tools/GCC3.kmk
++++ b/kBuild/tools/GCC3.kmk
+@@ -84,6 +84,14 @@
+  TOOL_GCC3_CXX += -fmessage-length=0
+ endif
+ 
++ifneq ($(CC),)
++	TOOL_GCC3_CC = $(CC)
++	TOOL_GCC3_LD = $(CC)
++endif
++ifneq ($(AR),)
++	TOOL_GCC3_AR = $(AR)
++endif
++
+ # General Properties used by kBuild
+ TOOL_GCC3_COBJSUFF         ?= .o
+ TOOL_GCC3_CFLAGS           ?=

diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch
new file mode 100644
index 000000000000..6afdeeb6e7a6
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch
@@ -0,0 +1,26 @@
+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)
+@@ -59,7 +61,7 @@
+   install_variable_buffer (&pbuf, &plen);
+ 
+   s = xstrdup (buffer);
+-  eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (strlen (s) /** @todo suboptimal */));
++  eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (strchr (s, 0) /** @todo suboptimal */));
+   free (s);
+ 
+   restore_variable_buffer (pbuf, plen);

diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3499-r2.ebuild
similarity index 72%
copy from dev-util/kbuild/kbuild-9999.ebuild
copy to dev-util/kbuild/kbuild-0.1.9998.3499-r2.ebuild
index 79e18d1b7a14..63ab7642a44d 100644
--- a/dev-util/kbuild/kbuild-9999.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3499-r2.ebuild
@@ -5,19 +5,15 @@ EAPI=8
 
 inherit autotools toolchain-funcs
 
+MY_P="${P}-src"
 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
+#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=""
 
 BDEPEND="
@@ -33,10 +29,16 @@ 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.3407-gold.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"
 )
 
 pkg_setup() {
@@ -47,11 +49,9 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	if [[ "${PV}" != *9999 ]] ; then
-		# Add a file with the svn revision this package was pulled from
-		printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \
-			> SvnInfo.kmk || die
-	fi
+	# 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

diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3572-r2.ebuild
similarity index 74%
copy from dev-util/kbuild/kbuild-9999.ebuild
copy to dev-util/kbuild/kbuild-0.1.9998.3572-r2.ebuild
index 79e18d1b7a14..cd4193e79001 100644
--- a/dev-util/kbuild/kbuild-9999.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3572-r2.ebuild
@@ -7,17 +7,11 @@ inherit autotools 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
+SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}-src.tar.xz"
+
 LICENSE="GPL-3+"
 SLOT="0"
+#KEYWORDS="~amd64 ~x86"	# for testing only.  This version is buggy
 IUSE=""
 
 BDEPEND="
@@ -33,10 +27,11 @@ 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.3407-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.3499-fix-CC.patch"
 )
 
 pkg_setup() {
@@ -47,11 +42,9 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	if [[ "${PV}" != *9999 ]] ; then
-		# Add a file with the svn revision this package was pulled from
-		printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \
-			> SvnInfo.kmk || die
-	fi
+	# 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

diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild
index 79e18d1b7a14..889cf6178062 100644
--- a/dev-util/kbuild/kbuild-9999.ebuild
+++ b/dev-util/kbuild/kbuild-9999.ebuild
@@ -37,6 +37,8 @@ PATCHES=(
 	"${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"
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/, dev-util/kbuild/files/
@ 2023-01-11 15:38 Viorel Munteanu
  0 siblings, 0 replies; 7+ messages in thread
From: Viorel Munteanu @ 2023-01-11 15:38 UTC (permalink / raw
  To: gentoo-commits

commit:     400674952a39af6c1b89d239d877bf45201874d3
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 15:30:39 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 15:30:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40067495

dev-util/kbuild: drop 0.1.9998.3407

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 dev-util/kbuild/Manifest                           |  1 -
 .../files/kbuild-0.1.9998.3407-glibc-2.32+.patch   | 59 -----------------
 dev-util/kbuild/kbuild-0.1.9998.3407.ebuild        | 73 ----------------------
 3 files changed, 133 deletions(-)

diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index bcd3da9adc45..4632dc45dd6d 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -1,3 +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
 DIST kbuild-0.1.9998.3572-src.tar.xz 3973848 BLAKE2B 103e42d719fd77bc5c55aea48bdfd01c8ad136529cc76cc8c1297f87e21e5d4e2e7149f9321c5174808613a84331dbea8bb4c0a7662eb2de9e1045c8ad365047 SHA512 96bb5e1759990bf3acaca4b0ba7c02926c6607b0cd94f7fca222b13eee5c3364c64b35e3473c5cee45fa094cb2b851ac9f3a3a9fe60cff894baf46238ccb4006

diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch
deleted file mode 100644
index 68a39fc68deb..000000000000
--- a/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-http://trac.netlabs.org/kbuild/changeset?format=diff&new=3408&old=3407&new_path=%2Ftrunk&old_path=%2Ftrunk
-
---- a/src/kash/jobs.c
-+++ b/src/kash/jobs.c
-@@ -390,4 +390,5 @@
- 				fmtstr(s + col, 16, "Done");
- 		} else {
-+			const char *pszSigNm;
- #if JOBS
- 			if (WIFSTOPPED(ps->status))
-@@ -397,6 +398,7 @@
- 				st = WTERMSIG(ps->status);
- 			st &= 0x7f;
--			if (st < NSIG && sys_siglist[st])
--				scopyn(sys_siglist[st], s + col, 32);
-+			pszSigNm = st < NSIG ? strsignal(st) : NULL;
-+			if (pszSigNm)
-+				scopyn(pszSigNm, s + col, 32);
- 			else
- 				fmtstr(s + col, 16, "Signal %d", st);
---- a/src/kash/shinstance.h
-+++ b/src/kash/shinstance.h
-@@ -381,10 +381,6 @@
- /*# define SIGBREAK         21 */
- /*# define SIGABRT          22 */
--
--#   define sys_siglist      sys_signame
-+const char *strsignal(int iSig);
- #endif /* _MSC_VER */
--#ifdef __sun__
--#   define sys_siglist      _sys_siglist
--#endif
- #ifndef HAVE_SYS_SIGNAME
- extern char sys_signame[NSIG][16];
---- a/src/kash/sys_signame.c
-+++ b/src/kash/sys_signame.c
-@@ -12,5 +12,5 @@
- void init_sys_signame(void)
- {
--    unsigned i;
-+	unsigned i;
- 	if (sys_signame_initialized)
- 		return;
-@@ -120,2 +120,14 @@
- 	sys_signame_initialized = 1;
- }
-+
-+#if defined(_MSC_VER)
-+const char *strsignal(int iSig)
-+{
-+    if (!sys_signame_initialized)
-+	init_sys_signame();
-+    if (iSig < NSIG)
-+	return sys_signame(iSig);
-+    return NULL;
-+}
-+#endif
-+
- 

diff --git a/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
deleted file mode 100644
index 647c3de17e25..000000000000
--- a/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 app-alternatives/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.3407-gold.patch"
-	"${FILESDIR}/${PN}-0.1.9998.3407-glibc-2.32+.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"
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-01-11 15:38 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-20  8:28 [gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/, dev-util/kbuild/files/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2020-08-16 22:46 Thomas Deutschmann
2020-11-27 12:37 Lars Wendler
2021-08-25  8:39 Lars Wendler
2022-11-20  8:31 Viorel Munteanu
2022-11-27 10:08 Viorel Munteanu
2023-01-11 15:38 Viorel Munteanu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox