diff --git a/dev-build/kbuild/Manifest b/dev-build/kbuild/Manifest deleted file mode 100644 index dca309fd1f..0000000000 --- a/dev-build/kbuild/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -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 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 deleted file mode 100644 index b074a984af..0000000000 --- a/dev-build/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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_pre20110817-gcc-4.7.patch b/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch deleted file mode 100644 index eb71fb02f4..0000000000 --- a/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c -+++ kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c -@@ -781,7 +781,7 @@ - } - - static unsigned char --internal_function __attribute ((pure)) -+internal_function - re_string_fetch_byte_case (re_string_t *pstr) - { - if (BE (!pstr->mbs_allocated, 1)) diff --git a/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch b/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch deleted file mode 100644 index 8ad2ab3269..0000000000 --- a/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch +++ /dev/null @@ -1,16 +0,0 @@ - src/kmk/Makefile.kmk | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/kmk/Makefile.kmk b/src/kmk/Makefile.kmk -index fe2cd43..135431e 100644 ---- a/src/kmk/Makefile.kmk -+++ b/src/kmk/Makefile.kmk -@@ -59,7 +59,7 @@ TEMPLATE_BIN-KMK_INCS.dragonfly = glob - TEMPLATE_BIN-KMK_INCS.freebsd = glob - TEMPLATE_BIN-KMK_INCS.openbsd = glob - TEMPLATE_BIN-KMK_INCS.solaris = glob --TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) -+TEMPLATE_BIN-KMK_LIBS = $(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-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 deleted file mode 100644 index d2b20176ca..0000000000 --- a/dev-build/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 9b0df4204e..0000000000 --- a/dev-build/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/files/kbuild-glibc-2.10.patch b/dev-build/kbuild/files/kbuild-glibc-2.10.patch deleted file mode 100644 index d24a8f7439..0000000000 --- a/dev-build/kbuild/files/kbuild-glibc-2.10.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- kBuild-0.1.5/src/ash/output.c -+++ kBuild-0.1.5/src/ash/output.c -@@ -230,6 +230,7 @@ - va_end(ap); - } - -+#if 0 - void - dprintf(const char *fmt, ...) - { -@@ -240,6 +241,7 @@ - va_end(ap); - flushout(out2); - } -+#endif - - void - fmtstr(char *outbuf, size_t length, const char *fmt, ...) ---- kBuild-0.1.5/src/ash/output.h -+++ kBuild-0.1.5/src/ash/output.h -@@ -65,8 +65,10 @@ - __attribute__((__format__(__printf__,2,3))); - void out1fmt(const char *, ...) - __attribute__((__format__(__printf__,1,2))); -+#if 0 - void dprintf(const char *, ...) - __attribute__((__format__(__printf__,1,2))); -+#endif - void fmtstr(char *, size_t, const char *, ...) - __attribute__((__format__(__printf__,3,4))); - void doformat(struct output *, const char *, va_list); diff --git a/dev-build/kbuild/files/kbuild-missing-headers.patch b/dev-build/kbuild/files/kbuild-missing-headers.patch deleted file mode 100644 index 1139860506..0000000000 --- a/dev-build/kbuild/files/kbuild-missing-headers.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur kBuild-0.1.9998-pre20131130.orig/src/kObjCache/kObjCache.c kBuild-0.1.9998-pre20131130/src/kObjCache/kObjCache.c ---- kBuild-0.1.9998-pre20131130.orig/src/kObjCache/kObjCache.c 2016-11-16 12:43:46.303891466 -0800 -+++ kBuild-0.1.9998-pre20131130/src/kObjCache/kObjCache.c 2016-11-16 12:48:21.106674374 -0800 -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -Naur kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/ftsfake.h kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/ftsfake.h ---- kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/ftsfake.h 2016-11-16 12:43:46.362892063 -0800 -+++ kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/ftsfake.h 2016-11-16 12:48:39.365859284 -0800 -@@ -34,6 +34,8 @@ - #ifndef _FTS_H_ - #define _FTS_H_ - -+#include -+ - #ifdef _MSC_VER - # include "kmkbuiltin/mscfakes.h" - #endif diff --git a/dev-build/kbuild/files/kbuild-musl.patch b/dev-build/kbuild/files/kbuild-musl.patch deleted file mode 100644 index 04495b45a0..0000000000 --- a/dev-build/kbuild/files/kbuild-musl.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Naur kBuild-0.1.9998-pre20131130.orig/src/ash/jobs.c kBuild-0.1.9998-pre20131130/src/ash/jobs.c ---- kBuild-0.1.9998-pre20131130.orig/src/ash/jobs.c 2016-11-16 12:43:46.369892134 -0800 -+++ kBuild-0.1.9998-pre20131130/src/ash/jobs.c 2016-11-16 13:00:43.891220488 -0800 -@@ -46,9 +46,6 @@ - #endif /* not lint */ - - #include --#ifdef __sun__ --#define sys_siglist _sys_siglist --#endif - #include - #include - #include -@@ -463,8 +460,8 @@ - #endif - st = WTERMSIG(ps->status); - st &= 0x7f; -- if (st < NSIG && sys_siglist[st]) -- scopyn(sys_siglist[st], s + col, 32); -+ if (st < NSIG && strsignal(st)) -+ scopyn(strsignal(st), s + col, 32); - else - fmtstr(s + col, 16, "Signal %d", st); - if (WCOREDUMP(ps->status)) { -diff -Naur kBuild-0.1.9998-pre20131130.orig/src/kash/jobs.c kBuild-0.1.9998-pre20131130/src/kash/jobs.c ---- kBuild-0.1.9998-pre20131130.orig/src/kash/jobs.c 2016-11-16 12:43:46.309891526 -0800 -+++ kBuild-0.1.9998-pre20131130/src/kash/jobs.c 2016-11-16 13:00:43.892220498 -0800 -@@ -396,8 +396,8 @@ - #endif - st = WTERMSIG(ps->status); - st &= 0x7f; -- if (st < NSIG && sys_siglist[st]) -- scopyn(sys_siglist[st], s + col, 32); -+ if (st < NSIG && strsignal(st)) -+ scopyn(strsignal(st), s + col, 32); - else - fmtstr(s + col, 16, "Signal %d", st); - if (WCOREDUMP(ps->status)) { -diff -Naur kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/chmod.c kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/chmod.c ---- kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/chmod.c 2016-11-16 12:43:46.360892043 -0800 -+++ kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/chmod.c 2016-11-16 13:00:48.929272615 -0800 -@@ -66,6 +66,10 @@ - #include "getopt.h" - #include "kmkbuiltin.h" - -+#if !defined(ALLPERMS) -+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ -+#endif -+ - extern void * bsd_setmode(const char *p); - extern mode_t bsd_getmode(const void *bbox, mode_t omode); - extern void bsd_strmode(mode_t mode, char *p); -diff -Naur kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/install.c kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/install.c ---- kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/install.c 2016-11-16 12:43:46.362892063 -0800 -+++ kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/install.c 2016-11-16 13:00:48.929272615 -0800 -@@ -127,6 +127,10 @@ - # define IS_SLASH(ch) ((ch) == '/') - #endif - -+#if !defined(ALLPERMS) -+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */ -+#endif -+ - static gid_t gid; - static uid_t uid; - static int dobackup, docompare, dodir, dopreserve, dostrip, nommap, safecopy, verbose, mode_given; diff --git a/dev-build/kbuild/files/kbuild-non-glibc.patch b/dev-build/kbuild/files/kbuild-non-glibc.patch deleted file mode 100644 index 834241a77b..0000000000 --- a/dev-build/kbuild/files/kbuild-non-glibc.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -Naur kBuild-0.1.9998-pre20131130.orig/src/kmk/Makefile.kmk kBuild-0.1.9998-pre20131130/src/kmk/Makefile.kmk ---- kBuild-0.1.9998-pre20131130.orig/src/kmk/Makefile.kmk 2016-11-16 12:43:46.365892093 -0800 -+++ kBuild-0.1.9998-pre20131130/src/kmk/Makefile.kmk 2016-11-16 12:51:37.071658898 -0800 -@@ -60,6 +60,7 @@ - TEMPLATE_BIN-KMK_INCS.haiku = glob - TEMPLATE_BIN-KMK_INCS.openbsd = glob - TEMPLATE_BIN-KMK_INCS.solaris = glob -+TEMPLATE_BIN-KMK_INCS.linux = glob - TEMPLATE_BIN-KMK_LIBS = $(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) -@@ -108,7 +109,7 @@ - glob/fnmatch.c - - kmkmissing_SOURCES.linux += \ -- kmkbuiltin/strlcpy.c -+ glob/glob.c - - kmkmissing_SOURCES.openbsd = \ - kmkbuiltin/openbsd.c \ -diff -Naur kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/cp.c kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/cp.c ---- kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/cp.c 2016-11-16 12:43:46.359892033 -0800 -+++ kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/cp.c 2016-11-16 12:51:37.071658898 -0800 -@@ -81,7 +81,7 @@ - #include "kmkbuiltin.h" - #include "kbuild_protection.h" - --#if defined(_MSC_VER) || defined(__gnu_linux__) || defined(__linux__) -+#if defined(_MSC_VER) || defined(__gnu_linux__) && !defined(__UCLIBC__) - extern char *strlcpy(char *, const char *, size_t); - #endif - -diff -Naur kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/fts.c kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/fts.c ---- kBuild-0.1.9998-pre20131130.orig/src/kmk/kmkbuiltin/fts.c 2016-11-16 12:43:46.362892063 -0800 -+++ kBuild-0.1.9998-pre20131130/src/kmk/kmkbuiltin/fts.c 2016-11-16 12:51:37.072658908 -0800 -@@ -75,7 +75,7 @@ - #endif - - #if ! HAVE_NBTOOL_CONFIG_H --# if !defined(__sun__) && !defined(__gnu_linux__) && !defined(__HAIKU__) -+# if !defined(__sun__) && !defined(__linux__) && !defined(__HAIKU__) - # define HAVE_STRUCT_DIRENT_D_NAMLEN 1 - # endif - #endif -diff -Naur kBuild-0.1.9998-pre20131130.orig/src/lib/k/kDefs.h kBuild-0.1.9998-pre20131130/src/lib/k/kDefs.h ---- kBuild-0.1.9998-pre20131130.orig/src/lib/k/kDefs.h 2016-11-16 12:43:46.434892792 -0800 -+++ kBuild-0.1.9998-pre20131130/src/lib/k/kDefs.h 2016-11-16 12:51:37.073658918 -0800 -@@ -82,7 +82,7 @@ - # define K_OS K_OS_FREEBSD - # elif defined(__HAIKU__) - # define K_OS K_OS_HAIKU --# elif defined(__gnu_linux__) -+# elif defined(__linux__) - # define K_OS K_OS_LINUX - # elif defined(__NetBSD__) /*??*/ - # define K_OS K_OS_NETBSD -diff -Naur kBuild-0.1.9998-pre20131130.orig/src/sed/Makefile.kmk kBuild-0.1.9998-pre20131130/src/sed/Makefile.kmk ---- kBuild-0.1.9998-pre20131130.orig/src/sed/Makefile.kmk 2016-11-16 12:43:46.384892286 -0800 -+++ kBuild-0.1.9998-pre20131130/src/sed/Makefile.kmk 2016-11-16 12:53:02.704528817 -0800 -@@ -56,36 +56,30 @@ - sed/mbcs.c \ - lib/getopt1.c \ - lib/getopt.c \ -+ lib/obstack.c \ - lib/utils.c - kmk_sed_SOURCES.darwin = \ - lib/strverscmp.c \ -- lib/obstack.c \ - lib/getline.c - kmk_sed_SOURCES.dragonfly = \ - lib/strverscmp.c \ -- lib/obstack.c \ - lib/getline.c - kmk_sed_SOURCES.freebsd = \ - lib/strverscmp.c \ -- lib/obstack.c \ - lib/getline.c - kmk_sed_SOURCES.haiku = \ -- lib/strverscmp.c \ -- lib/obstack.c -+ lib/strverscmp.c - kmk_sed_SOURCES.openbsd = \ - lib/strverscmp.c \ -- lib/obstack.c \ - lib/getline.c - kmk_sed_SOURCES.solaris = \ -- lib/strverscmp.c \ -- lib/obstack.c -+ lib/strverscmp.c - ifdef KBUILD_SOLARIS_10 - kmk_sed_SOURCES.solaris += \ - lib/getline.c - endif - kmk_sed_SOURCES.win = \ - lib/strverscmp.c \ -- lib/obstack.c \ - lib/mkstemp.c \ - lib/getline.c \ - ../lib/startuphacks-win.c diff --git a/dev-build/kbuild/files/kbuild-unknown-configure-opt.patch b/dev-build/kbuild/files/kbuild-unknown-configure-opt.patch deleted file mode 100644 index 36cabae2b1..0000000000 --- a/dev-build/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-build/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild b/dev-build/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild deleted file mode 100644 index 3f2eaf37c5..0000000000 --- a/dev-build/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# 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=kBuild-${PV/_/-}-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 - https://dev.gentoo.org/~polynomial-c/${P}-tools_and_units_updates.patch.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="sys-apps/texinfo - sys-devel/flex - sys-devel/gettext - app-alternatives/yacc" -RDEPEND="" - -S=${WORKDIR}/${MY_P/-src} - -PATCHES=( - "${FILESDIR}/${PN}-unknown-configure-opt.patch" - "${FILESDIR}/${PN}-glibc-2.10.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_pre20110817-gold.patch" - "${FILESDIR}/${PN}-0.1.9998_pre20110817-gcc-4.7.patch" - "${WORKDIR}/${P}-tools_and_units_updates.patch" - - # Musl patching - "${FILESDIR}/${PN}-musl.patch" - "${FILESDIR}/${PN}-missing-headers.patch" - "${FILESDIR}/${PN}-non-glibc.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" -} diff --git a/dev-build/kbuild/metadata.xml b/dev-build/kbuild/metadata.xml deleted file mode 100644 index 64eeab8c3b..0000000000 --- a/dev-build/kbuild/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - swapon@gmail.com - Alessio Cassibba - - - polynomial-c@gentoo.org - Lars Wendler - - - proxy-maint@gentoo.org - Proxy Maintainers - -