commit:     2cb0d4a7ad23eb95769c6fd08231551e27759a92
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Jan  8 22:15:45 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Jan  8 22:15:45 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=2cb0d4a7

dev-util/kbuild: Add latest version

NOTE: This will only build with >=sys-devel/gcc-5.4.0 due to the build method
for previous versions.

 dev-util/kbuild/Manifest                           | 14 +++
 .../kbuild/files/kbuild-0.1.5-gentoo-docdir.patch  | 11 +++
 .../kbuild-0.1.9998_pre20110817-gcc-4.7.patch      | 11 +++
 .../files/kbuild-0.1.9998_pre20110817-gold.patch   | 16 ++++
 ...ld-0.1.9998_pre20110817-kash-link-pthread.patch | 10 +++
 .../files/kbuild-0.1.9998_pre20120806-qa.patch     | 13 +++
 dev-util/kbuild/files/kbuild-glibc-2.10.patch      | 31 +++++++
 dev-util/kbuild/files/kbuild-missing-headers.patch | 23 +++++
 dev-util/kbuild/files/kbuild-musl.patch            | 66 +++++++++++++++
 dev-util/kbuild/files/kbuild-non-glibc.patch       | 99 ++++++++++++++++++++++
 .../files/kbuild-unknown-configure-opt.patch       | 11 +++
 .../kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild   | 72 ++++++++++++++++
 dev-util/kbuild/metadata.xml                       | 16 ++++
 13 files changed, 393 insertions(+)

diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
new file mode 100644
index 0000000..07e838f
--- /dev/null
+++ b/dev-util/kbuild/Manifest
@@ -0,0 +1,14 @@
+AUX kbuild-0.1.5-gentoo-docdir.patch 358 SHA256 
eb1746772092e184d94d923806f9e5c2eafb9d9d2950afd973df62f9f190ff4d SHA512 
468dd844de34867c7ccafabafab4d5870fcb63f38fcb8d53580787cf9600027db91cb5ad962862d6a654dcec2b58654cc62fd6146fb0903c1b2d2079a7016020
 WHIRLPOOL 
73f584911dd34360bfa68ac7c9649011ffbbf89293441429f73c28b44a7a7a69fb6d9c18af59f2c8181d87223bac631d925039051acef81128552d0698a57df3
+AUX kbuild-0.1.9998_pre20110817-gcc-4.7.patch 315 SHA256 
34a340193b7f6154ab8f5a6d5f828677a967f110c72ced74b0394a02857ad5d8 SHA512 
843a90f52dc6163936a3bff5d11aedb92642baf66ec4adacf0705b484b4a2d624995ffa59dfbfde3218e0e2e763f64338a03ebf935ec23fdad66093824ced7e1
 WHIRLPOOL 
f06a8c58049e540862c1bb456062c312ddb022895dee8c86e0a5c7d57100f5246d586aafc0008249ce5004bd67aa4fdd82e129f3ae48a703b4be7d1eb925cd93
+AUX kbuild-0.1.9998_pre20110817-gold.patch 795 SHA256 
2c2de2d1abf4d9d71c8f14c60701a98223e83a86387dcbb3ce892022e2b67080 SHA512 
6ea5d896fdd632355985bdaa69e36aa091fdddc925049dfcb7eab37472c88fde954c6b987a0e647e65832cec5c91ccad7ad8270376a112af95df90d4a60687f9
 WHIRLPOOL 
d3f4413b0c6c493095a8d9344ee94fd02afd446421ad3b0713477846dc186da82c0602e232beacaae5ca97a17bf784f1f18cf172e42dc488a17a1977eb8fd973
+AUX kbuild-0.1.9998_pre20110817-kash-link-pthread.patch 296 SHA256 
9370231d3ff856b8be43d352e2c6e29e66079467e99169ed234c3b0761666e90 SHA512 
178da856a83631ca4d86a9b8c20e74b75b76426c177b87c26d4c4b3df86e72f3b6339e8f61948498ab9c4bf047119588f3df8ce78448160afa0840b2cf3aeabb
 WHIRLPOOL 
f1054aa09c6fcea126450441235fa32a3cce815ba7f54280d1a41793bca1572c3023d997d7d210e41f2511f15e0f059dbd4a99636fd3b11a5dd4593ffd6532aa
+AUX kbuild-0.1.9998_pre20120806-qa.patch 292 SHA256 
ca14e0327ba1690ad12e37ea80d8fba04891ab0350e1fefcdb67ab64ce30cce7 SHA512 
2a311e2e79c1e85c3c2c26b3d187355167c237c334687494a8e532b84232340df44b0d896fe6638bf1a9d4ba1c5f1efb29978de3bac0490fe04f2e57f7fb1874
 WHIRLPOOL 
50c63c97ac5e7784e4b1540459a1b3ffdfffecb590dd966f8d713a6e5e9f7250f37a8f234f845c326e578b43fd59b9a12f22975794138aba3784f20fdcee1bbc
+AUX kbuild-glibc-2.10.patch 756 SHA256 
d76d27fa7e4082d6a06434ff9006465d4c29a8ff2add8e3c25456c5bf412687d SHA512 
dd8a9464c7014205bbed655a42325653618ad902493d7c73d714f7504a539159771d64b7e0d82aaaf76fadf3eb46dd663e62b5960c17077b8c80ac5f414555ce
 WHIRLPOOL 
dabea273f7b662195ec366bed94f2e6d06395ff17f4be856a7853857b32f0ff06a9a589877d63547b90b8c46b245c1c70d1cc755681c20a1bf41c820075e7256
+AUX kbuild-missing-headers.patch 952 SHA256 
208e9c9a3b5bf2e0524ce9d9f7b4d3b6c524bc97788c579c2d9ae177706c92f0 SHA512 
785ea04f4464723a6aae00f07915de5d2c229ab48691870a11077ee2c7a78bd1e962d940252cc085a53eb5676ae6e7eb301edcd2b78abede4fc771b984b4745f
 WHIRLPOOL 
dd111cf037c8547d3f9478882f1b6fe0fd839a16b1936c23ba54d59066eef484bfb7d27322653633ee398762b0adec037432d5dba5f872001850f3f3f388e3e4
+AUX kbuild-musl.patch 2677 SHA256 
41d38b5f50de207a21634c171dbaa71f3bc6dcdee7b491ae5bb4e045044c106a SHA512 
431e017843de65508422c5de6cf4b9f2da338c2ee1996229a6748362bc41c00e928e752fd2985e518e768e830007f66c84f608128579526e2ceeeb8841c72dc6
 WHIRLPOOL 
c32f059de79c3e9dfcabf913a5e42e3317baaad91b87327ab13398c90b6cbb153eba6122fed361bc8c1eb03ee690e3b585ddeb0fe5fc5d009d5752b7e0b0c8d9
+AUX kbuild-non-glibc.patch 3659 SHA256 
72f65f93d3dc18e97a61d4356743c45e4e35ff7dfcef0d196e33e3feb67ecd26 SHA512 
e21d12a451ccd60c32ab2b3cb6a644084d7d1c9cac1a4b8a50bb11ff1b8dbf849c922fa347a38752329703e56cae7702b9bea9a078093917df718e499d945527
 WHIRLPOOL 
69a9eb554926185b04636faa502dd6a145cb95f4cae181940b6786d2a90bf3c17d35bbc0f1290d8b1ebd115dcb8c45d844ced953bb8f63a17b7df9da0fd62461
+AUX kbuild-unknown-configure-opt.patch 355 SHA256 
078c95e432c9774e81a2894096855b422a42f53650462cbdca16b72c78a05ef2 SHA512 
26ae63facf7133be4fba606ad0b9488ea4c2ad2290a1e33a0f0c3283e0c8267eaae41bde6efaa52895b444178ec101a800ad580d2d85d0e69c56dc7db32b1105
 WHIRLPOOL 
700ffe9298bfd5c7f0259851214eb60cd9ce9152d64dbff4838fc9f1c1adbe14f66f4662d602cf6c0aba504a443af61562f0c118b066e00546762caa86ef6e87
+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
+EBUILD kbuild-0.1.9998_pre20131130-r1.ebuild 1941 SHA256 
e0600fa7fd678066745808d7d8ba5ff1f7966a24ef5e91c07d00787b576448da SHA512 
3d287e1ed92e556927eef6b8c43856cac77243e3363623559b0e975b716a7e51a7d6050e02dada5fef1c592d9f1dba13f88e820768eea9eb31a5593a4aa75e32
 WHIRLPOOL 
f7de66f697aeeba8ce56e9bbe591bca31f0922246b5bd97e315ace01bf7a97f2f9f9adaf508762c6a0db787f92dcf4b99e211e37d3c7475cf4903cabdd9719da
+MISC metadata.xml 476 SHA256 
ac904817412770747ac1f759096e51a96fa7a292901dc7677976befeb7f1cd92 SHA512 
d5d93ccb4b367dca56516b8c12e476ed9831e5d67e09fd5bfc555be647130d8ed11ca6ad61d092a552f4c284a1c391ccfc21e4b903355855e93eadd0f3eb784f
 WHIRLPOOL 
df7b099b99851b7b9b0b5d6c4eee196a4d27b6f6816ae89bebde99a25289e90453132c6ba4ea0df91418d9e22442589492df24c08affda33cc10e3b855c5f4f0

diff --git a/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch 
b/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch
new file mode 100644
index 0000000..b074a98
--- /dev/null
+++ b/dev-util/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-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch 
b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
new file mode 100644
index 0000000..eb71fb0
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
@@ -0,0 +1,11 @@
+--- 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-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch 
b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch
new file mode 100644
index 0000000..8ad2ab3
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch
@@ -0,0 +1,16 @@
+ 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-util/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch 
b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-kash-link-pthread.patch
new file mode 100644
index 0000000..d2b2017
--- /dev/null
+++ b/dev-util/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-util/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch 
b/dev-util/kbuild/files/kbuild-0.1.9998_pre20120806-qa.patch
new file mode 100644
index 0000000..9b0df42
--- /dev/null
+++ b/dev-util/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 <stdlib.h>
+ #endif /* HAVE_STDLIB_H */
+ 
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif /* HAVE_UNISTD_H */
++
+ #include "utils.h"
+ 
+ const char *myname;

diff --git a/dev-util/kbuild/files/kbuild-glibc-2.10.patch 
b/dev-util/kbuild/files/kbuild-glibc-2.10.patch
new file mode 100644
index 0000000..d24a8f7
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-glibc-2.10.patch
@@ -0,0 +1,31 @@
+--- 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-util/kbuild/files/kbuild-missing-headers.patch 
b/dev-util/kbuild/files/kbuild-missing-headers.patch
new file mode 100644
index 0000000..1139860
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-missing-headers.patch
@@ -0,0 +1,23 @@
+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 <errno.h>
+ #include <assert.h>
+ #include <sys/stat.h>
++#include <sys/file.h>
+ #include <fcntl.h>
+ #include <limits.h>
+ #include <ctype.h>
+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 <sys/types.h>
++
+ #ifdef _MSC_VER
+ # include "kmkbuiltin/mscfakes.h"
+ #endif

diff --git a/dev-util/kbuild/files/kbuild-musl.patch 
b/dev-util/kbuild/files/kbuild-musl.patch
new file mode 100644
index 0000000..04495b4
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-musl.patch
@@ -0,0 +1,66 @@
+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 <fcntl.h>
+-#ifdef __sun__
+-#define sys_siglist _sys_siglist
+-#endif
+ #include <signal.h>
+ #include <errno.h>
+ #include <unistd.h>
+@@ -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-util/kbuild/files/kbuild-non-glibc.patch 
b/dev-util/kbuild/files/kbuild-non-glibc.patch
new file mode 100644
index 0000000..834241a
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-non-glibc.patch
@@ -0,0 +1,99 @@
+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-util/kbuild/files/kbuild-unknown-configure-opt.patch 
b/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch
new file mode 100644
index 0000000..36cabae
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch
@@ -0,0 +1,11 @@
+--- 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_pre20131130-r1.ebuild 
b/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild
new file mode 100644
index 0000000..0456c7e
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="sys-apps/texinfo
+       sys-devel/flex
+       sys-devel/gettext
+       virtual/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-util/kbuild/metadata.xml b/dev-util/kbuild/metadata.xml
new file mode 100644
index 0000000..ce0a75f
--- /dev/null
+++ b/dev-util/kbuild/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+       <maintainer type="person">
+               <email>swa...@gmail.com</email>
+               <name>Alessio Cassibba</name>
+       </maintainer>
+       <maintainer type="person">
+               <email>polynomia...@gentoo.org</email>
+               <name>Lars Wendler</name>
+       </maintainer>
+<maintainer type="project">
+               <email>proxy-ma...@gentoo.org</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
+</pkgmetadata>

Reply via email to