From 08c5e4df7a4b66ba8dbb827ca2e3a973d4f19ab0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 17 Jan 2024 20:06:58 +0000 Subject: gentoo auto-resync : 17:01:2024 - 20:06:58 --- dev-build/kbuild/Manifest | 21 ++++++ .../kbuild/files/kbuild-0.1.5-gentoo-docdir.patch | 11 +++ .../kbuild/files/kbuild-0.1.9998.3407-gold.patch | 11 +++ ...build-0.1.9998.3407-unknown_configure_opt.patch | 20 ++++++ .../kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch | 23 +++++++ .../kbuild/files/kbuild-0.1.9998.3499-gold.patch | 15 ++++ ...1.9998.3499-implicit-function-declaration.patch | 74 ++++++++++++++++++++ .../kbuild-0.1.9998.3499-int-conversion.patch | 26 +++++++ ...98.3499-kash-no_separate_parser_allocator.patch | 11 +++ .../files/kbuild-0.1.9998.3572-fix-bison.patch | 15 ++++ .../files/kbuild-0.1.9998.3572-fix-lto.patch | 11 +++ ...ld-0.1.9998_pre20110817-kash-link-pthread.patch | 10 +++ .../files/kbuild-0.1.9998_pre20120806-qa.patch | 13 ++++ dev-build/kbuild/kbuild-0.1.9998.3499-r4.ebuild | 79 ++++++++++++++++++++++ dev-build/kbuild/kbuild-0.1.9998.3572-r4.ebuild | 74 ++++++++++++++++++++ dev-build/kbuild/kbuild-0.1.9998.3592.ebuild | 76 +++++++++++++++++++++ dev-build/kbuild/kbuild-9999.ebuild | 78 +++++++++++++++++++++ dev-build/kbuild/metadata.xml | 8 +++ 18 files changed, 576 insertions(+) create mode 100644 dev-build/kbuild/Manifest create mode 100644 dev-build/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch create mode 100644 dev-build/kbuild/files/kbuild-0.1.9998.3407-gold.patch create mode 100644 dev-build/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch create mode 100644 dev-build/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch create mode 100644 dev-build/kbuild/files/kbuild-0.1.9998.3499-gold.patch create mode 100644 dev-build/kbuild/files/kbuild-0.1.9998.3499-implicit-function-declaration.patch create mode 100644 dev-build/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch create mode 100644 dev-build/kbuild/files/kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch create mode 100644 dev-build/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch create mode 100644 dev-build/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch create mode 100644 dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch create mode 100644 dev-build/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch create mode 100644 dev-build/kbuild/kbuild-0.1.9998.3499-r4.ebuild create mode 100644 dev-build/kbuild/kbuild-0.1.9998.3572-r4.ebuild create mode 100644 dev-build/kbuild/kbuild-0.1.9998.3592.ebuild create mode 100644 dev-build/kbuild/kbuild-9999.ebuild create mode 100644 dev-build/kbuild/metadata.xml (limited to 'dev-build/kbuild') diff --git a/dev-build/kbuild/Manifest b/dev-build/kbuild/Manifest new file mode 100644 index 000000000000..d85e959a07db --- /dev/null +++ b/dev-build/kbuild/Manifest @@ -0,0 +1,21 @@ +AUX kbuild-0.1.5-gentoo-docdir.patch 358 BLAKE2B 978d4081821098a4e035fdd41b801c72f297e24187d2681ff7aaa2b09fa0fed35ce780884bf1cf0b0ea4428a16402c20b14fcc0e918d7175b98f04e94ba74449 SHA512 468dd844de34867c7ccafabafab4d5870fcb63f38fcb8d53580787cf9600027db91cb5ad962862d6a654dcec2b58654cc62fd6146fb0903c1b2d2079a7016020 +AUX kbuild-0.1.9998.3407-gold.patch 590 BLAKE2B 654459b94017d4bacae37151c71d4b43b3d9a76d934a2a220bada87e0b96e2a8a13a6f446199eb5475faf604129966bcca6e3e34691e588df6b40fe65e4e4ded SHA512 3cf6827b482661704a8cdcdcf3152fa07d18c80a6e9cbe8979b732173f0127a5bc5009590c5cc155cdd11bed1e95d918835e697b6fecc1a1bc51127d2f13845f +AUX kbuild-0.1.9998.3407-unknown_configure_opt.patch 697 BLAKE2B 5f974bc451a12f4b4c02656b501d07515c14499c53ee1fca00aec00cf28d6dd5faf690f262b79f34861a3bfd317a5bd37eb78cbeb61ce833d8117c2cd74e7813 SHA512 63435effcf109b40390574da09453314ffac109ffee79419cef81705b4f7ceb145f692c9a81b54dd0d58f69a1a6f80b9dc412baa5d416066f05300cc9eccc11e +AUX kbuild-0.1.9998.3499-fix-CC.patch 504 BLAKE2B cb30a2f3dbdc374d1570cc089d9fbdda38b0d6e35eb9023c7d5f989e1a9538ede6eaf1b857b8ae92bb0e6bb139232d02e461851f2a4fc6343a3a774017f0cdef SHA512 16728f446bcc8ab15fc2b4a556ab79eb84385a217b3624f53297fde341b28a0d523caf357d871b5f1a58907adb61915a5480beca4fec56bafe92fa957176919b +AUX kbuild-0.1.9998.3499-gold.patch 934 BLAKE2B 486b6154eeba1541f87856e0d4bddd89ee689393669161f60ae9f6b5ce3a199cf72187ac77d766e5c26b707af79b63b13f2cc597e7ee15ee1c46972401fe80d3 SHA512 5e885b504c095c062da0c2ed7836821c5ab95aa6b90e847070a87228a3e1456b9ae2dc2c463e0771552a504f0f309569e762667cd11aa891f5236b5402b77a08 +AUX kbuild-0.1.9998.3499-implicit-function-declaration.patch 1444 BLAKE2B 21bbdeb7502bfb024ff0dcdee2b7cf6f793910289d02fea9fb0bb21b3292dd25b98aab86cfa2f6733c50ecdec1c12ec59d6d7a5f577ce1943a971cdeabd558e5 SHA512 f579eb7516f7f9b7d885a33621167fee915f1665d225d5d9abf6f64d60a3ede0a9730e80a51ef2afbedbf36aaadef25872f1575f8034a1b3b10eceb6a78e1f0a +AUX kbuild-0.1.9998.3499-int-conversion.patch 719 BLAKE2B 77d4efe872b1114b2fa155bca466816018e0909678b83249f37d543c0831f0126b45a7d7356f378acf77b60c2f719452f8b4c7112253ba95b57c851ec521386f SHA512 f2199d2cf55fa90ad7327f94400aaee311830aef22b1c5a7bea009e375171ea6e0fd1d253c2d60d2079daa11ce14322bebd3723c98d3ff937e65d0b07b5dc5cf +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_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.3572-src.tar.xz 3973848 BLAKE2B 103e42d719fd77bc5c55aea48bdfd01c8ad136529cc76cc8c1297f87e21e5d4e2e7149f9321c5174808613a84331dbea8bb4c0a7662eb2de9e1045c8ad365047 SHA512 96bb5e1759990bf3acaca4b0ba7c02926c6607b0cd94f7fca222b13eee5c3364c64b35e3473c5cee45fa094cb2b851ac9f3a3a9fe60cff894baf46238ccb4006 +DIST kbuild-0.1.9998.3592-src.tar.xz 3975348 BLAKE2B 4b1862238f6f6c35ba1b586e11e17baca3b66c4ba3a97b17168ced902d7fcc9f1baa9a4b8669489902346b9bab67095f4ff4d008187c36cd2ef4b7841d4134be SHA512 b9ca1723b426db81571b048db5afe4b7c3d2d8a881003812e9a5f9df44c5109b628d77af415cf56eb44a8775c590a6f0e343efccf562ef83213c5525e081e59b +EBUILD kbuild-0.1.9998.3499-r4.ebuild 2186 BLAKE2B cd0e1543b9139b8bf62602a2387a61dd4378ffbed970ef8319cd9ec626f3f1d92afdf15230b4d903c2abe6ae3b542f5c12fb801256d7c2b6c4f6a3fc74a37d7b SHA512 4ece814e56c73f48a36c4587736d1603fb937a4d97a9c4f1fac93142e99be827b473e5ee3ce816f168009e1d1dfdd1748c50a3b7ec1aaf6c3d968fc8183d2448 +EBUILD kbuild-0.1.9998.3572-r4.ebuild 2053 BLAKE2B 6d3ed28a987b94c8ecd146fe703b47a9dace4896f2495ecb95ee107f0e7fd54e67e7c46424679375d601b41f1fdc7f6bd6e07d2d07904e4d2fb4a5b051083754 SHA512 1d69eb35501e21bfa29e831179ef3c7af7e8c4eef591e50e134ec0082ecaa888b40967f9ed18f92ef740a4b00a9eb1c54a01a8646de2fc834f6c7ff5d6fbcd74 +EBUILD kbuild-0.1.9998.3592.ebuild 2128 BLAKE2B 7b05945eaa6bb1afd241652bc1da82759c668d5fb15d2f23b574ccf8ace9e9a11b64e4c9081779d81f174805ff6d2ac73d87f510cedeeb83b69a72beb7c64a77 SHA512 0a9d9c9668108a42c107e8a1a5f611052aa09aa4c34de3c927c385ef30c512aaadc9d1ab7d2bd57375f01f657e43b175a7fa4f3a34e7a81cf7f51b756e5bc175 +EBUILD kbuild-9999.ebuild 2131 BLAKE2B b499c02d359bfd6a78f625d81b59b74fe8a978c62e041dc6e830296928fa45cba5d67bf0979c9acd6501e3916f748369f78ad670434aed8f085ccdbb5bf04a5f SHA512 1952521ad4a6760efd64aaff624d80a3950bd31e7321bc85177fd4f905b78e1572b55b306895e5df5fa9a63f5aef3837da3191ae3569c8a63d5a594f802f8282 +MISC metadata.xml 249 BLAKE2B 3bc7510e014ef8df90da064f4ef969eab6cc3311951a6dd556ca7b6f4e2e74e229f12a16ceb641393d1ec1f89d1942718267ecc664a8136df194c40de94a58e4 SHA512 63f88d798d410e4fb6670d199a86a665ab61b09cb9508b4047f13fe73070c682231d35a27c9d2c1fd82a1b8a84676d857b534c96bd09f4562cf13d7fc8de36b2 diff --git a/dev-build/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch b/dev-build/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch new file mode 100644 index 000000000000..b074a984af4c --- /dev/null +++ b/dev-build/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch @@ -0,0 +1,11 @@ +--- a/Config.kmk ++++ b/Config.kmk +@@ -147,7 +147,7 @@ + MY_INST_DATA := $(MY_INST_ROOT)share/kBuild/ + endif + ifndef MY_INST_DOC +- MY_INST_DOC := $(MY_INST_ROOT)share/doc/kBuild-$(KBUILD_VERSION)/ ++ MY_INST_DOC := $(MY_INST_ROOT)share/doc/$(PF)/ + endif + if !defined(MY_INST_BIN_MODE) && defined(MY_INST_MODE) + MY_INST_BIN_MODE := $(MY_INST_MODE),a+x diff --git a/dev-build/kbuild/files/kbuild-0.1.9998.3407-gold.patch b/dev-build/kbuild/files/kbuild-0.1.9998.3407-gold.patch new file mode 100644 index 000000000000..14d5ec7cc422 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-0.1.9998.3407-gold.patch @@ -0,0 +1,11 @@ +--- kbuild-0.1.9998.3407/src/kmk/Makefile.kmk ++++ kbuild-0.1.9998.3407/src/kmk/Makefile.kmk +@@ -60,7 +60,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). + ifeq ($(KBUILD_TARGET),win) + TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1 diff --git a/dev-build/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch b/dev-build/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch new file mode 100644 index 000000000000..2714716b7806 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch @@ -0,0 +1,20 @@ +--- kbuild-0.1.9998.3407/bootstrap.gmk ++++ kbuild-0.1.9998.3407/bootstrap.gmk +@@ -151,7 +151,7 @@ + $(OUTDIR)/kmk/ts-configured: \ + $(OUTDIR)/kmk/ts-autoreconf \ + $(OUTDIR)/kmk/fts.h +- cd $(OUTDIR)/kmk && $(SRCDIR)/src/kmk/configure --disable-load --without-guile ++ cd $(OUTDIR)/kmk && $(SRCDIR)/src/kmk/configure --disable-load + echo done > $@ + + ifeq ($(KBUILD_HOST),solaris) +@@ -182,7 +182,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-build/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch b/dev-build/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch new file mode 100644 index 000000000000..7d7f1f7232eb --- /dev/null +++ b/dev-build/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-build/kbuild/files/kbuild-0.1.9998.3499-gold.patch b/dev-build/kbuild/files/kbuild-0.1.9998.3499-gold.patch new file mode 100644 index 000000000000..ee870da2ee55 --- /dev/null +++ b/dev-build/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-build/kbuild/files/kbuild-0.1.9998.3499-implicit-function-declaration.patch b/dev-build/kbuild/files/kbuild-0.1.9998.3499-implicit-function-declaration.patch new file mode 100644 index 000000000000..2d25eacb9826 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-0.1.9998.3499-implicit-function-declaration.patch @@ -0,0 +1,74 @@ +Add a few includes to fix this warning: -Wimplicit-function-declaration +Bug: https://bugs.gentoo.org/882143 + +--- a/src/sed/lib/utils.c ++++ b/src/sed/lib/utils.c +@@ -27,7 +27,8 @@ + + #ifdef HAVE_STRINGS_H + # include +-#else ++#endif ++#ifdef HAVE_STRING_H + # include + #endif /* HAVE_STRINGS_H */ + +--- a/src/sed/sed/execute.c ++++ b/src/sed/sed/execute.c +@@ -46,7 +46,8 @@ + + #ifdef HAVE_STRINGS_H + # include +-#else ++#endif ++#ifdef HAVE_STRING_H + # include + #endif /*HAVE_STRINGS_H*/ + #ifdef HAVE_MEMORY_H +--- a/src/sed/sed/fmt.c ++++ b/src/sed/sed/fmt.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #if HAVE_LIMITS_H + # include +--- a/src/sed/sed/mbcs.c ++++ b/src/sed/sed/mbcs.c +@@ -17,6 +17,7 @@ + + #include "sed.h" + #include ++#include + + int mb_cur_max; + +--- a/src/sed/sed/regexp.c ++++ b/src/sed/sed/regexp.c +@@ -22,6 +22,9 @@ + #ifdef HAVE_STDLIB_H + # include + #endif ++#ifdef HAVE_STRING_H ++# include ++#endif + + #ifdef gettext_noop + # define N_(String) gettext_noop(String) +--- a/src/sed/sed/sed.c ++++ b/src/sed/sed/sed.c +@@ -26,9 +26,10 @@ + #include + #ifdef HAVE_STRINGS_H + # include +-#else +-# include + #endif /*HAVE_STRINGS_H*/ ++#ifdef HAVE_STRING_H ++# include ++#endif /*HAVE_STRING_H*/ + #ifdef HAVE_MEMORY_H + # include + #endif diff --git a/dev-build/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch b/dev-build/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch new file mode 100644 index 000000000000..6afdeeb6e7a6 --- /dev/null +++ b/dev-build/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 ++ + /* 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-build/kbuild/files/kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch b/dev-build/kbuild/files/kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch new file mode 100644 index 000000000000..24265b96e137 --- /dev/null +++ b/dev-build/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-build/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch b/dev-build/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch new file mode 100644 index 000000000000..822194b1c98b --- /dev/null +++ b/dev-build/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-build/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch b/dev-build/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch new file mode 100644 index 000000000000..94eb14ee6cb6 --- /dev/null +++ b/dev-build/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-build/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch b/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch new file mode 100644 index 000000000000..d2b20176ca82 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch @@ -0,0 +1,10 @@ +--- kBuild-0.1.9998-pre20110817/src/kash/Makefile.kmk ++++ kBuild-0.1.9998-pre20110817/src/kash/Makefile.kmk +@@ -59,6 +59,7 @@ + if "$(USER)" == "bird" && "$(KBUILD_TARGET)" != "win" + kash_CFLAGS += -std=gnu99 + endif ++kash_LIBS += pthread + kash_CFLAGS.win.amd64 = -GS- + kash_SOURCES = \ + main.c \ diff --git a/dev-build/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch b/dev-build/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch new file mode 100644 index 000000000000..9b0df4204e35 --- /dev/null +++ b/dev-build/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch @@ -0,0 +1,13 @@ +--- kBuild-0.1.9998-pre20120806/src/sed/lib/utils.c ++++ kBuild-0.1.9998-pre20120806/src/sed/lib/utils.c +@@ -35,6 +35,10 @@ + # include + #endif /* HAVE_STDLIB_H */ + ++#ifdef HAVE_UNISTD_H ++# include ++#endif /* HAVE_UNISTD_H */ ++ + #include "utils.h" + + const char *myname; diff --git a/dev-build/kbuild/kbuild-0.1.9998.3499-r4.ebuild b/dev-build/kbuild/kbuild-0.1.9998.3499-r4.ebuild new file mode 100644 index 000000000000..1ed4a97698af --- /dev/null +++ b/dev-build/kbuild/kbuild-0.1.9998.3499-r4.ebuild @@ -0,0 +1,79 @@ +# 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.3499-fix-clang-16.patch.bz2 +" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +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_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" + + "${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" + + "${WORKDIR}/${PN}-0.1.9998.3499-fix-clang-16.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" +} diff --git a/dev-build/kbuild/kbuild-0.1.9998.3572-r4.ebuild b/dev-build/kbuild/kbuild-0.1.9998.3572-r4.ebuild new file mode 100644 index 000000000000..31c91dcacac0 --- /dev/null +++ b/dev-build/kbuild/kbuild-0.1.9998.3572-r4.ebuild @@ -0,0 +1,74 @@ +# 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.3499-fix-clang-16.patch.bz2 +" + +LICENSE="GPL-3+" +SLOT="0" +#KEYWORDS="~amd64 ~x86" # for testing only. This version is buggy +IUSE="" + +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_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" + "${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" + + "${WORKDIR}/${PN}-0.1.9998.3499-fix-clang-16.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" +} diff --git a/dev-build/kbuild/kbuild-0.1.9998.3592.ebuild b/dev-build/kbuild/kbuild-0.1.9998.3592.ebuild new file mode 100644 index 000000000000..0d1386d186ec --- /dev/null +++ b/dev-build/kbuild/kbuild-0.1.9998.3592.ebuild @@ -0,0 +1,76 @@ +# 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.3499-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_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" + "${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" + + "${WORKDIR}/${PN}-0.1.9998.3499-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 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" +} diff --git a/dev-build/kbuild/kbuild-9999.ebuild b/dev-build/kbuild/kbuild-9999.ebuild new file mode 100644 index 000000000000..0c7ecee2efa6 --- /dev/null +++ b/dev-build/kbuild/kbuild-9999.ebuild @@ -0,0 +1,78 @@ +# 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" +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 +LICENSE="GPL-3+" +SLOT="0" +IUSE="" + +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_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() { + # Package fails with distcc (bug #255371) + export DISTCC_DISABLE=1 +} + +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 + + 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" +} diff --git a/dev-build/kbuild/metadata.xml b/dev-build/kbuild/metadata.xml new file mode 100644 index 000000000000..b22a815172dd --- /dev/null +++ b/dev-build/kbuild/metadata.xml @@ -0,0 +1,8 @@ + + + + + ceamac@gentoo.org + Viorel Munteanu + + -- cgit v1.2.3