1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
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
|
GitWeb