rpms/kBuild
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: rpms:rawhide
Branches Tags
rpms:rawhide
rpms:f43
rpms:main
rpms:f42
rpms:f41
rpms:f40
rpms:f39
rpms:epel7
rpms:f38
rpms:epel8
rpms:epel9
rpms:f35
rpms:f36
rpms:f37
rpms:epel8-playground
rpms:f34
rpms:f33
rpms:f32
rpms:f31
rpms:f30
rpms:f29
rpms:el6
rpms:f28
rpms:f26
rpms:f27
rpms:f23
rpms:f24
rpms:f25
rpms:f22
rpms:f21
rpms:f19
rpms:f20
rpms:f18
rpms:f17
rpms:f15
rpms:f16
rpms:f11
rpms:f14
rpms:f9
rpms:el5
rpms:f10
rpms:f12
rpms:f13
rpms:kBuild-0_1_5-6_p2_el6
rpms:kBuild-0_1_5-6_p2_fc13
rpms:kBuild-0_1_5-6_p2_fc14
rpms:EL-6-start
rpms:EL-6-split
rpms:F-13-start
rpms:F-13-split
rpms:kBuild-0_1_5-6_p1_fc12
rpms:F-12-start
rpms:F-12-split
rpms:kBuild-0_1_5-5_p1_fc11
rpms:kBuild-0_1_5-5_p1_fc12
rpms:kBuild-0_1_5-4_fc11
rpms:F-11-start
rpms:F-11-split
rpms:kBuild-0_1_5-3_fc11
rpms:kBuild-0_1_5-2_fc11
rpms:kBuild-0_1_5-2_fc9
rpms:kBuild-0_1_5-1_el5
rpms:kBuild-0_1_5-1_fc9
rpms:kBuild-0_1_5-1_fc10
rpms:kBuild-0_1_5-1_fc11
rpms:kBuild-0_1_5-0_1_20081106svn_fc9
rpms:kBuild-0_1_5-0_1_20081106svn_fc10
rpms:kBuild-0_1_5-0_1_20081106svn_el5
rpms:kBuild-0_1_5-0_1_20081106svn_fc11
rpms:kBuild-0_1_4-1_fc9
rpms:kBuild-0_1_4-1_fc10
rpms:kBuild-0_1_4-1_el5
rpms:kBuild-0_1_4-1_fc11
rpms:F-9-start
rpms:F-9-split
rpms:F-10-start
rpms:F-10-split
rpms:EL-5-start
rpms:EL-5-split
..
compare: rpms:f38
Branches Tags
rpms:f43
rpms:main
rpms:rawhide
rpms:f42
rpms:f41
rpms:f40
rpms:f39
rpms:epel7
rpms:f38
rpms:epel8
rpms:epel9
rpms:f35
rpms:f36
rpms:f37
rpms:epel8-playground
rpms:f34
rpms:f33
rpms:f32
rpms:f31
rpms:f30
rpms:f29
rpms:el6
rpms:f28
rpms:f26
rpms:f27
rpms:f23
rpms:f24
rpms:f25
rpms:f22
rpms:f21
rpms:f19
rpms:f20
rpms:f18
rpms:f17
rpms:f15
rpms:f16
rpms:f11
rpms:f14
rpms:f9
rpms:el5
rpms:f10
rpms:f12
rpms:f13
rpms:kBuild-0_1_5-6_p2_el6
rpms:kBuild-0_1_5-6_p2_fc13
rpms:kBuild-0_1_5-6_p2_fc14
rpms:EL-6-start
rpms:EL-6-split
rpms:F-13-start
rpms:F-13-split
rpms:kBuild-0_1_5-6_p1_fc12
rpms:F-12-start
rpms:F-12-split
rpms:kBuild-0_1_5-5_p1_fc11
rpms:kBuild-0_1_5-5_p1_fc12
rpms:kBuild-0_1_5-4_fc11
rpms:F-11-start
rpms:F-11-split
rpms:kBuild-0_1_5-3_fc11
rpms:kBuild-0_1_5-2_fc11
rpms:kBuild-0_1_5-2_fc9
rpms:kBuild-0_1_5-1_el5
rpms:kBuild-0_1_5-1_fc9
rpms:kBuild-0_1_5-1_fc10
rpms:kBuild-0_1_5-1_fc11
rpms:kBuild-0_1_5-0_1_20081106svn_fc9
rpms:kBuild-0_1_5-0_1_20081106svn_fc10
rpms:kBuild-0_1_5-0_1_20081106svn_el5
rpms:kBuild-0_1_5-0_1_20081106svn_fc11
rpms:kBuild-0_1_4-1_fc9
rpms:kBuild-0_1_4-1_fc10
rpms:kBuild-0_1_4-1_el5
rpms:kBuild-0_1_4-1_fc11
rpms:F-9-start
rpms:F-9-split
rpms:F-10-start
rpms:F-10-split
rpms:EL-5-start
rpms:EL-5-split

No commits in common. "rawhide" and "f38" have entirely different histories.
rawhide ... f38

11 changed files with 241 additions and 890 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -10,6 +10,3 @@ kBuild-0.1.5-p2-src.tar.gz
/kBuild-r3296.20190122.tar.gz
/kBuild-r3564.20220308.tar.gz
/kBuild-r3572.20221024.tar.gz
/kBuild-r3589.20230220.tar.gz
/kBuild-r3605.20240424.tar.gz
/kBuild-r3674.20250422.tar.gz

47
changeset_3572.diff
View file

@ -1,47 +0,0 @@
Index: trunk/Config.kmk
===================================================================
--- trunk/Config.kmk (revision 3571)
+++ trunk/Config.kmk (revision 3572)
@@ -124,4 +124,11 @@
TOOL_FLEX_LEX = gflex
endif
+# Not all compiler tools currently do the same quoting of DEFS, so here's a
+# temporary workaround.
+ifn1of ($(KBUILD_TARGET), win)
+ TMP_QUOTE_SLASH :=
+else
+ TMP_QUOTE_SLASH := \$(NO_SUCH_VARIABLE)
+endif
#
@@ -183,6 +190,6 @@
DEFS += \
- KBUILD_PATH=\"/$(patsubst %/,%,$(MY_INST_DATA))\" \
- KBUILD_BIN_PATH=\"/$(patsubst %/,%,$(MY_INST_BIN))\"
+ KBUILD_PATH=$(TMP_QUOTE_SLASH)"/$(patsubst %/,%,$(MY_INST_DATA))$(TMP_QUOTE_SLASH)" \
+ KBUILD_BIN_PATH=$(TMP_QUOTE_SLASH)"/$(patsubst %/,%,$(MY_INST_BIN))$(TMP_QUOTE_SLASH)"
endif
Index: trunk/src/kmk/Makefile.kmk
===================================================================
--- trunk/src/kmk/Makefile.kmk (revision 3571)
+++ trunk/src/kmk/Makefile.kmk (revision 3572)
@@ -39,5 +39,5 @@
$(TEMPLATE_BIN_DEFS) \
KBUILD_SVN_REV=$(KBUILD_SVN_REV) \
- KBUILD_TYPE=\"$(KBUILD_TYPE)\"
+ KBUILD_TYPE=$(TMP_QUOTE_SLASH)"$(KBUILD_TYPE)$(TMP_QUOTE_SLASH)"
TEMPLATE_BIN-KMK_DEPS = \
$(kmk_0_OUTDIR)/config.h \
@@ -235,7 +235,7 @@
CONFIG_WITH_MEMORY_OPTIMIZATIONS \
\
- KBUILD_HOST=\"$(KBUILD_TARGET)\" \
- KBUILD_HOST_ARCH=\"$(KBUILD_TARGET_ARCH)\" \
- KBUILD_HOST_CPU=\"$(KBUILD_TARGET_CPU)\"
+ KBUILD_HOST=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET)$(TMP_QUOTE_SLASH)" \
+ KBUILD_HOST_ARCH=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET_ARCH)$(TMP_QUOTE_SLASH)" \
+ KBUILD_HOST_CPU=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET_CPU)$(TMP_QUOTE_SLASH)"
# kmk_DEFS += CONFIG_WITH_COMPILER # experimental, doesn't work 101% right it seems.
kmk_DEFS.x86 = CONFIG_WITH_OPTIMIZATION_HACKS

761
changeset_trunk_3566.diff
View file

@ -1,761 +0,0 @@
Index: trunk/kBuild/header.kmk
===================================================================
--- trunk/kBuild/header.kmk (revision 3565)
+++ trunk/kBuild/header.kmk (revision 3566)
@@ -1714,5 +1714,5 @@
##
# An internal define used by subheader.kmk, subfooter.kmk, and
-# KB_FN_PASS_0_ON_TARGET.
+# KB_FN_DO_PASS0_ON_TARGET.
#
# @param target The target to process.
Index: trunk/kBuild/tools/GCC.kmk
===================================================================
--- trunk/kBuild/tools/GCC.kmk (revision 3565)
+++ trunk/kBuild/tools/GCC.kmk (revision 3566)
@@ -106,5 +106,5 @@
define TOOL_GCC_COMPILE_C_CMDS
$(QUIET)$(TOOL_GCC_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
-o $(obj)\
@@ -132,5 +132,5 @@
define TOOL_GCC_COMPILE_CXX_CMDS
$(QUIET)$(TOOL_GCC_CXX) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
-o $(obj)\
@@ -158,5 +158,5 @@
define TOOL_GCC_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GCC_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
-o $(obj)\
Index: trunk/kBuild/tools/GCC3.kmk
===================================================================
--- trunk/kBuild/tools/GCC3.kmk (revision 3565)
+++ trunk/kBuild/tools/GCC3.kmk (revision 3566)
@@ -138,5 +138,5 @@
--kObjCache-cpp $(outbase).i\
$(TOOL_GCC3_CC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -152,5 +152,5 @@
define TOOL_GCC3_COMPILE_C_CMDS
$(QUIET)$(TOOL_GCC3_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -182,5 +182,5 @@
--kObjCache-cpp $(outbase).ii\
$(TOOL_GCC3_CXX) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -196,5 +196,5 @@
define TOOL_GCC3_COMPILE_CXX_CMDS
$(QUIET)$(TOOL_GCC3_CXX) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -223,5 +223,5 @@
define TOOL_GCC3_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GCC3_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
Index: trunk/kBuild/tools/GCC32.kmk
===================================================================
--- trunk/kBuild/tools/GCC32.kmk (revision 3565)
+++ trunk/kBuild/tools/GCC32.kmk (revision 3566)
@@ -138,5 +138,5 @@
--kObjCache-cpp $(outbase).i\
$(TOOL_GCC32_CC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -152,5 +152,5 @@
define TOOL_GCC32_COMPILE_C_CMDS
$(QUIET)$(TOOL_GCC32_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -182,5 +182,5 @@
--kObjCache-cpp $(outbase).ii\
$(TOOL_GCC32_CXX) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -197,5 +197,5 @@
define TOOL_GCC32_COMPILE_CXX_CMDS
$(QUIET)$(TOOL_GCC32_CXX) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -224,5 +224,5 @@
define TOOL_GCC32_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GCC32_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
Index: trunk/kBuild/tools/GCC3OMF.kmk
===================================================================
--- trunk/kBuild/tools/GCC3OMF.kmk (revision 3565)
+++ trunk/kBuild/tools/GCC3OMF.kmk (revision 3566)
@@ -122,5 +122,5 @@
--kObjCache-cpp $(outbase).i\
$(TOOL_GCC3OMF_CC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -136,5 +136,5 @@
define TOOL_GCC3OMF_COMPILE_C_CMDS
$(QUIET)$(TOOL_GCC3OMF_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
-o $(obj)\
@@ -167,5 +167,5 @@
--kObjCache-cpp $(outbase).ii\
$(TOOL_GCC3OMF_CXX) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -181,5 +181,5 @@
define TOOL_GCC3OMF_COMPILE_CXX_CMDS
$(QUIET)$(TOOL_GCC3OMF_CXX) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
-o $(obj)\
@@ -208,5 +208,5 @@
define TOOL_GCC3OMF_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GCC3OMF_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
Index: trunk/kBuild/tools/GCC3PLAIN.kmk
===================================================================
--- trunk/kBuild/tools/GCC3PLAIN.kmk (revision 3565)
+++ trunk/kBuild/tools/GCC3PLAIN.kmk (revision 3566)
@@ -123,5 +123,5 @@
--kObjCache-cpp $(outbase).i\
$(TOOL_GCC3PLAIN_CC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -137,5 +137,5 @@
define TOOL_GCC3PLAIN_COMPILE_C_CMDS
$(QUIET)$(TOOL_GCC3PLAIN_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -167,5 +167,5 @@
--kObjCache-cpp $(outbase).ii\
$(TOOL_GCC3PLAIN_CXX) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -181,5 +181,5 @@
define TOOL_GCC3PLAIN_COMPILE_CXX_CMDS
$(QUIET)$(TOOL_GCC3PLAIN_CXX) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -208,5 +208,5 @@
define TOOL_GCC3PLAIN_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GCC3PLAIN_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
Index: trunk/kBuild/tools/GCC42MACHO.kmk
===================================================================
--- trunk/kBuild/tools/GCC42MACHO.kmk (revision 3565)
+++ trunk/kBuild/tools/GCC42MACHO.kmk (revision 3566)
@@ -165,5 +165,5 @@
--kObjCache-cpp $(outbase).i\
$(TOOL_GCC42MACHO_CC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -179,5 +179,5 @@
define TOOL_GCC42MACHO_COMPILE_C_CMDS
$(QUIET)$(TOOL_GCC42MACHO_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -209,5 +209,5 @@
--kObjCache-cpp $(outbase).ii\
$(TOOL_GCC42MACHO_CXX) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -223,5 +223,5 @@
define TOOL_GCC42MACHO_COMPILE_CXX_CMDS
$(QUIET)$(TOOL_GCC42MACHO_CXX) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -253,5 +253,5 @@
--kObjCache-cpp $(outbase).ii\
$(TOOL_GCC42MACHO_OBJC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -267,5 +267,5 @@
define TOOL_GCC42MACHO_COMPILE_OBJC_CMDS
$(QUIET)$(TOOL_GCC42MACHO_OBJC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -297,5 +297,5 @@
--kObjCache-cpp $(outbase).mii\
$(TOOL_GCC42MACHO_OBJCXX) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -311,5 +311,5 @@
define TOOL_GCC42MACHO_COMPILE_OBJCXX_CMDS
$(QUIET)$(TOOL_GCC42MACHO_OBJCXX) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -338,5 +338,5 @@
define TOOL_GCC42MACHO_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GCC42MACHO_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
Index: trunk/kBuild/tools/GCC4MACHO.kmk
===================================================================
--- trunk/kBuild/tools/GCC4MACHO.kmk (revision 3565)
+++ trunk/kBuild/tools/GCC4MACHO.kmk (revision 3566)
@@ -165,5 +165,5 @@
--kObjCache-cpp $(outbase).i\
$(TOOL_GCC4MACHO_CC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -179,5 +179,5 @@
define TOOL_GCC4MACHO_COMPILE_C_CMDS
$(QUIET)$(TOOL_GCC4MACHO_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -209,5 +209,5 @@
--kObjCache-cpp $(outbase).ii\
$(TOOL_GCC4MACHO_CXX) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -223,5 +223,5 @@
define TOOL_GCC4MACHO_COMPILE_CXX_CMDS
$(QUIET)$(TOOL_GCC4MACHO_CXX) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -253,5 +253,5 @@
--kObjCache-cpp $(outbase).ii\
$(TOOL_GCC4MACHO_OBJC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -267,5 +267,5 @@
define TOOL_GCC4MACHO_COMPILE_OBJC_CMDS
$(QUIET)$(TOOL_GCC4MACHO_OBJC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -297,5 +297,5 @@
--kObjCache-cpp $(outbase).mii\
$(TOOL_GCC4MACHO_OBJCXX) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -311,5 +311,5 @@
define TOOL_GCC4MACHO_COMPILE_OBJCXX_CMDS
$(QUIET)$(TOOL_GCC4MACHO_OBJCXX) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -338,5 +338,5 @@
define TOOL_GCC4MACHO_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GCC4MACHO_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
Index: trunk/kBuild/tools/GCC64.kmk
===================================================================
--- trunk/kBuild/tools/GCC64.kmk (revision 3565)
+++ trunk/kBuild/tools/GCC64.kmk (revision 3566)
@@ -137,5 +137,5 @@
--kObjCache-cpp $(outbase).i\
$(TOOL_GCC64_CC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -151,5 +151,5 @@
define TOOL_GCC64_COMPILE_C_CMDS
$(QUIET)$(TOOL_GCC64_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -181,5 +181,5 @@
--kObjCache-cpp $(outbase).ii\
$(TOOL_GCC64_CXX) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -195,5 +195,5 @@
define TOOL_GCC64_COMPILE_CXX_CMDS
$(QUIET)$(TOOL_GCC64_CXX) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -222,5 +222,5 @@
define TOOL_GCC64_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GCC64_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
Index: trunk/kBuild/tools/GXX.kmk
===================================================================
--- trunk/kBuild/tools/GXX.kmk (revision 3565)
+++ trunk/kBuild/tools/GXX.kmk (revision 3566)
@@ -121,5 +121,5 @@
define TOOL_GXX_COMPILE_C_CMDS
$(QUIET)$(TOOL_GXX_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
-o $(obj)\
@@ -147,5 +147,5 @@
define TOOL_GXX_COMPILE_CXX_CMDS
$(QUIET)$(TOOL_GXX_CXX) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
@@ -173,5 +173,5 @@
define TOOL_GXX_COMPILE_PCH_CMDS
$(QUIET)$(TOOL_GXX_PCH) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -200,5 +200,5 @@
define TOOL_GXX_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GXX_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
-o $(obj)\
Index: trunk/kBuild/tools/GXX3.kmk
===================================================================
--- trunk/kBuild/tools/GXX3.kmk (revision 3565)
+++ trunk/kBuild/tools/GXX3.kmk (revision 3566)
@@ -148,5 +148,5 @@
--kObjCache-cpp $(outbase).i\
$(TOOL_GXX3_CC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -158,5 +158,5 @@
else
$(QUIET)$(TOOL_GXX3_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -189,5 +189,5 @@
$(TOOL_GXX3_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -199,5 +199,5 @@
else
$(QUIET)$(TOOL_GXX3_CXX) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
@@ -226,5 +226,5 @@
define TOOL_GXX3_COMPILE_PCH_CMDS
$(QUIET)$(TOOL_GXX3_PCH) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -253,5 +253,5 @@
define TOOL_GXX3_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GXX3_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
Index: trunk/kBuild/tools/GXX32.kmk
===================================================================
--- trunk/kBuild/tools/GXX32.kmk (revision 3565)
+++ trunk/kBuild/tools/GXX32.kmk (revision 3566)
@@ -145,5 +145,5 @@
--kObjCache-cpp $(outbase).i\
$(TOOL_GXX32_CC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -155,5 +155,5 @@
else
$(QUIET)$(TOOL_GXX32_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -186,5 +186,5 @@
$(TOOL_GXX32_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -196,5 +196,5 @@
else
$(QUIET)$(TOOL_GXX32_CXX) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
@@ -223,5 +223,5 @@
define TOOL_GXX32_COMPILE_PCH_CMDS
$(QUIET)$(TOOL_GXX32_PCH) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -250,5 +250,5 @@
define TOOL_GXX32_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GXX32_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
Index: trunk/kBuild/tools/GXX3OMF.kmk
===================================================================
--- trunk/kBuild/tools/GXX3OMF.kmk (revision 3565)
+++ trunk/kBuild/tools/GXX3OMF.kmk (revision 3566)
@@ -134,5 +134,5 @@
--kObjCache-cpp $(outbase).i\
$(TOOL_GXX3OMF_CC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -144,5 +144,5 @@
else
$(QUIET)$(TOOL_GXX3OMF_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -175,5 +175,5 @@
$(TOOL_GXX3OMF_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -185,5 +185,5 @@
else
$(QUIET)$(TOOL_GXX3OMF_CXX) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
@@ -212,5 +212,5 @@
define TOOL_GXX3OMF_COMPILE_PCH_CMDS
$(QUIET)$(TOOL_GXX3OMF_PCH) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -239,5 +239,5 @@
define TOOL_GXX3OMF_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GXX3OMF_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
Index: trunk/kBuild/tools/GXX3PLAIN.kmk
===================================================================
--- trunk/kBuild/tools/GXX3PLAIN.kmk (revision 3565)
+++ trunk/kBuild/tools/GXX3PLAIN.kmk (revision 3566)
@@ -131,5 +131,5 @@
--kObjCache-cpp $(outbase).i\
$(TOOL_GXX3PLAIN_CC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -141,5 +141,5 @@
else
$(QUIET)$(TOOL_GXX3PLAIN_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -172,5 +172,5 @@
$(TOOL_GXX3PLAIN_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -182,5 +182,5 @@
else
$(QUIET)$(TOOL_GXX3PLAIN_CXX) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
@@ -209,5 +209,5 @@
define TOOL_GXX3PLAIN_COMPILE_PCH_CMDS
$(QUIET)$(TOOL_GXX3PLAIN_PCH) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -236,5 +236,5 @@
define TOOL_GXX3PLAIN_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GXX3PLAIN_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
Index: trunk/kBuild/tools/GXX42MACHO.kmk
===================================================================
--- trunk/kBuild/tools/GXX42MACHO.kmk (revision 3565)
+++ trunk/kBuild/tools/GXX42MACHO.kmk (revision 3566)
@@ -174,5 +174,5 @@
--kObjCache-cpp $(outbase).i\
$(TOOL_GXX42MACHO_CC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -184,5 +184,5 @@
else
$(QUIET)$(TOOL_GXX42MACHO_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -215,5 +215,5 @@
$(TOOL_GXX42MACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -225,5 +225,5 @@
else
$(QUIET)$(TOOL_GXX42MACHO_CXX) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
@@ -252,5 +252,5 @@
define TOOL_GXX42MACHO_COMPILE_PCH_CMDS
$(QUIET)$(TOOL_GXX42MACHO_PCH) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -282,5 +282,5 @@
--kObjCache-cpp $(outbase).ii\
$(TOOL_GXX42MACHO_OBJC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -296,5 +296,5 @@
define TOOL_GXX42MACHO_COMPILE_OBJC_CMDS
$(QUIET)$(TOOL_GXX42MACHO_OBJC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -326,5 +326,5 @@
--kObjCache-cpp $(outbase).mii\
$(TOOL_GXX42MACHO_OBJCXX) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -340,5 +340,5 @@
define TOOL_GXX42MACHO_COMPILE_OBJCXX_CMDS
$(QUIET)$(TOOL_GXX42MACHO_OBJCXX) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -367,5 +367,5 @@
define TOOL_GXX42MACHO_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GXX42MACHO_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
Index: trunk/kBuild/tools/GXX4MACHO.kmk
===================================================================
--- trunk/kBuild/tools/GXX4MACHO.kmk (revision 3565)
+++ trunk/kBuild/tools/GXX4MACHO.kmk (revision 3566)
@@ -174,5 +174,5 @@
--kObjCache-cpp $(outbase).i\
$(TOOL_GXX4MACHO_CC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -184,5 +184,5 @@
else
$(QUIET)$(TOOL_GXX4MACHO_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -215,5 +215,5 @@
$(TOOL_GXX4MACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -225,5 +225,5 @@
else
$(QUIET)$(TOOL_GXX4MACHO_CXX) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
@@ -252,5 +252,5 @@
define TOOL_GXX4MACHO_COMPILE_PCH_CMDS
$(QUIET)$(TOOL_GXX4MACHO_PCH) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -282,5 +282,5 @@
--kObjCache-cpp $(outbase).mii\
$(TOOL_GXX4MACHO_OBJCXX) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -296,5 +296,5 @@
define TOOL_GXX4MACHO_COMPILE_OBJCXX_CMDS
$(QUIET)$(TOOL_GXX4MACHO_OBJCXX) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -323,5 +323,5 @@
define TOOL_GXX4MACHO_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GXX4MACHO_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
Index: trunk/kBuild/tools/GXX64.kmk
===================================================================
--- trunk/kBuild/tools/GXX64.kmk (revision 3565)
+++ trunk/kBuild/tools/GXX64.kmk (revision 3566)
@@ -145,5 +145,5 @@
--kObjCache-cpp $(outbase).i\
$(TOOL_GXX64_CC) -E -o -\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -155,5 +155,5 @@
else
$(QUIET)$(TOOL_GXX64_CC) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -186,5 +186,5 @@
$(TOOL_GXX64_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
$(abspath $(source))\
@@ -196,5 +196,5 @@
else
$(QUIET)$(TOOL_GXX64_CXX) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
@@ -223,5 +223,5 @@
define TOOL_GXX64_COMPILE_PCH_CMDS
$(QUIET)$(TOOL_GXX64_PCH) -c\
- $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\
@@ -250,5 +250,5 @@
define TOOL_GXX64_COMPILE_AS_CMDS
$(QUIET)$(TOOL_GXX64_AS) -c\
- $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+ $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-o $(obj)\

6
kBuild-0.1.9998-portme.patch
View file

@ -1,9 +1,3 @@
# Only used on el6
# Found the reason why compile fails in detection of powerpc64 in centos 6
# kBuild/src/lib/kStuff/include/k/kDefs.h:356:4: error: #error "Port Me or define K_ENDIAN."
# hack for gcc < 4.6 and ppc64 only
# https://stackoverflow.com/a/40675229/778517
--- kBuild/src/lib/kStuff/include/k/kDefs.h.orig 2018-05-12 03:35:13.703342877 +0100
+++ kBuild/src/lib/kStuff/include/k/kDefs.h 2018-05-12 04:24:52.034917011 +0100
@@ -336,16 +336,19 @@

14
kBuild-c23.patch
View file

@ -1,14 +0,0 @@
diff -Nurp kBuild.orig/src/kmk/glob/fnmatch.c kBuild/src/kmk/glob/fnmatch.c
--- kBuild.orig/src/kmk/glob/fnmatch.c 2025-04-25 21:54:33.000000000 +0100
+++ kBuild/src/kmk/glob/fnmatch.c 2025-04-25 23:20:55.477680324 +0100
@@ -120,10 +120,6 @@ USA. */
/* Avoid depending on library functions or files
whose names are inconsistent. */
-# if !defined _LIBC && !defined getenv && !defined _MSC_VER
-extern char *getenv ();
-# endif
-
# ifndef errno
extern int errno;
# endif

151
kBuild-c99.patch Normal file
View file

@ -0,0 +1,151 @@
Do not treat <strings.h> as an umbrella header for <string.h>
The two are distinct on GNU/Linux.
Also add missing #include <string.h> in some files.
diff --git a/src/sed/lib/getline.c b/src/sed/lib/getline.c
index 4cb9d45b..f39c363f 100644
--- a/src/sed/lib/getline.c
+++ b/src/sed/lib/getline.c
@@ -9,10 +9,10 @@
#include <stdio.h>
#undef getline /* bird */
+#include <string.h>
+
#ifdef HAVE_STRINGS_H
# include <strings.h>
-#else
-# include <string.h>
#endif /* HAVE_STRINGS_H */
#ifdef HAVE_STDLIB_H
diff --git a/src/sed/lib/mkstemp.c b/src/sed/lib/mkstemp.c
index 5b00205c..f36f7ca4 100644
--- a/src/sed/lib/mkstemp.c
+++ b/src/sed/lib/mkstemp.c
@@ -2,10 +2,10 @@
#include "config.h"
#endif
+#include <string.h>
+
#ifdef HAVE_STRINGS_H
# include <strings.h>
-#else
-# include <string.h>
#endif /* HAVE_STRINGS_H */
#ifdef HAVE_STDLIB_H
diff --git a/src/sed/lib/utils.c b/src/sed/lib/utils.c
index 41c61aaf..48a8b57f 100644
--- a/src/sed/lib/utils.c
+++ b/src/sed/lib/utils.c
@@ -25,10 +25,10 @@
extern int errno;
#endif
+#include <string.h>
+
#ifdef HAVE_STRINGS_H
# include <strings.h>
-#else
-# include <string.h>
#endif /* HAVE_STRINGS_H */
#ifdef HAVE_STDLIB_H
diff --git a/src/sed/sed/compile.c b/src/sed/sed/compile.c
index 0ecc2fe2..064bb350 100644
--- a/src/sed/sed/compile.c
+++ b/src/sed/sed/compile.c
@@ -22,14 +22,13 @@
#include "strverscmp.h"
#include <stdio.h>
#include <ctype.h>
+#include <string.h>
#ifdef HAVE_STRINGS_H
# include <strings.h>
# ifdef HAVE_MEMORY_H
# include <memory.h>
# endif
-#else
-# include <string.h>
#endif /* HAVE_STRINGS_H */
#ifdef HAVE_STDLIB_H
diff --git a/src/sed/sed/execute.c b/src/sed/sed/execute.c
index c9038f4f..09080b5b 100644
--- a/src/sed/sed/execute.c
+++ b/src/sed/sed/execute.c
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <ctype.h>
+#include <string.h>
#include <errno.h>
#ifndef errno
@@ -46,8 +47,6 @@ extern int errno;
#ifdef HAVE_STRINGS_H
# include <strings.h>
-#else
-# include <string.h>
#endif /*HAVE_STRINGS_H*/
#ifdef HAVE_MEMORY_H
# include <memory.h>
diff --git a/src/sed/sed/fmt.c b/src/sed/sed/fmt.c
index 64600a06..4374070e 100644
--- a/src/sed/sed/fmt.c
+++ b/src/sed/sed/fmt.c
@@ -22,6 +22,7 @@
#include <stdio.h>
#include <ctype.h>
#include <sys/types.h>
+#include <string.h>
#if HAVE_LIMITS_H
# include <limits.h>
diff --git a/src/sed/sed/mbcs.c b/src/sed/sed/mbcs.c
index 37565472..79e3f843 100644
--- a/src/sed/sed/mbcs.c
+++ b/src/sed/sed/mbcs.c
@@ -17,6 +17,7 @@
#include "sed.h"
#include <stdlib.h>
+#include <string.h>
int mb_cur_max;
diff --git a/src/sed/sed/regexp.c b/src/sed/sed/regexp.c
index d4e7437c..a007494d 100644
--- a/src/sed/sed/regexp.c
+++ b/src/sed/sed/regexp.c
@@ -19,6 +19,7 @@
#include <ctype.h>
#include <stdio.h>
+#include <string.h>
#ifdef HAVE_STDLIB_H
# include <stdlib.h>
#endif
diff --git a/src/sed/sed/sed.c b/src/sed/sed/sed.c
index b3bc2ea2..3829e2c6 100644
--- a/src/sed/sed/sed.c
+++ b/src/sed/sed/sed.c
@@ -22,12 +22,10 @@
#include "sed.h"
-
#include <stdio.h>
+#include <string.h>
#ifdef HAVE_STRINGS_H
# include <strings.h>
-#else
-# include <string.h>
#endif /*HAVE_STRINGS_H*/
#ifdef HAVE_MEMORY_H
# include <memory.h>

48
kBuild-configure-c99.patch Normal file
View file

@ -0,0 +1,48 @@
Fix some typical C99 compatibility issues in old configure scripts.
diff --git a/src/sed/config/getline.m4 b/src/sed/config/getline.m4
index ff8b5f4b..52d2e3e7 100644
--- a/src/sed/config/getline.m4
+++ b/src/sed/config/getline.m4
@@ -27,7 +27,7 @@ AC_DEFUN([AM_FUNC_GETLINE],
if (!in)
return 1;
len = getline (&line, &siz, in);
- exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
+ return (len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1;
}
], am_cv_func_working_getline=yes dnl The library version works.
, am_cv_func_working_getline=no dnl The library version does NOT work.
diff --git a/src/sed/configure b/src/sed/configure
index 0b01618f..b1172113 100755
--- a/src/sed/configure
+++ b/src/sed/configure
@@ -2593,7 +2593,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
- '' \
+ '#include <stdlib.h>' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@@ -3378,8 +3378,8 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return 2;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext
@@ -5747,7 +5747,7 @@ cat >>conftest.$ac_ext <<_ACEOF
if (!in)
return 1;
len = getline (&line, &siz, in);
- exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
+ return (len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1;
}
_ACEOF

73
kBuild.spec
View file

@ -1,13 +1,12 @@
%global svn_revision 3674
%global svn_date 20250422
%global svn_revision 3572
%global svn_date 20221024
Name: kBuild
Version: 0.1.9998%{?svn_revision:.r%{svn_revision}}
Release: 2%{?svn_date:.%{svn_date}}%{?dist}
Release: 3%{?svn_date:.%{svn_date}}%{?dist}
Summary: A cross-platform build environment
# Automatically converted from old format: BSD and GPLv2+ - review is highly recommended.
License: LicenseRef-Callaway-BSD AND GPL-2.0-or-later
License: BSD and GPLv2+
# most tools are from NetBSD, some are from FreeBSD,
# and make and sed are from GNU
URL: http://svn.netlabs.org/kbuild
@ -19,9 +18,8 @@ Patch6: kbuild-dummy_noreturn.diff
Patch8: kBuild-0.1.9998-portme.patch
Patch10: assert.patch
Patch11: relax_automake_version.patch
Patch14: changeset_3572.diff
Patch15: changeset_trunk_3566.diff
Patch16: kBuild-c23.patch
Patch12: kBuild-configure-c99.patch
Patch13: kBuild-c99.patch
BuildRequires: make
BuildRequires: gcc
@ -44,30 +42,26 @@ repository.
%prep
%dnl %setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}}
#%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}}
%setup -q -n %{name}
%patch -P0 -p1 -b .escape
%patch -P1 -p1 -b .pthreads
%patch -P6 -p1 -b .dummy_noreturn
%patch0 -p1 -b .escape
%patch1 -p1 -b .pthreads
%patch6 -p1 -b .dummy_noreturn
%ifarch ppc64
%if 0%{?rhel} && 0%{?rhel} < 7
# Found the reason why compile fails in detection of powerpc64 in centos 6
# kBuild/src/lib/kStuff/include/k/kDefs.h:356:4: error: #error "Port Me or define K_ENDIAN."
# hack for gcc < 4.6 and ppc64 only
# https://stackoverflow.com/a/40675229/778517
%patch -P8 -p1 -b .portme
%patch8 -p1 -b .portme
%endif
%endif
%patch -P10 -p1 -b .portme3
%patch10 -p1 -b .portme3
%if 0%{?rhel} && 0%{?rhel} <= 7
%patch -P11 -p1
%patch11 -p1
%endif
%if 0%{?rhel} && 0%{?rhel} <= 7
# we need revert this 2 commits to build VBox 6 on el7
%patch -P14 -p1 -R -b .revert
%patch -P15 -p1 -R -b .revert2
%endif
%patch -P16 -p1
%patch12 -p1
%patch13 -p1
%build
echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk > SvnInfo.kmk
@ -111,48 +105,13 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
%changelog
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3674-2.20250422
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Apr 25 2025 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3674-1.20250422
- Update to Revision 3674
- (rhbz#2340684) Fix FTBFS
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3605-4.20240424
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 0.1.9998.r3605-3.20240424
- convert license to SPDX
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3605-2.20240424
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Jun 04 2024 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3605-1.20240424
- Update to Revision 3605
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3589-5.20230220
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3589-4.20230220
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Dec 20 2023 Florian Weimer <fweimer@redhat.com> - 0.1.9998.r3589-3.20230220
- Fix another C compatibility issue (#2154544)
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3589-2.20230220
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Mar 09 2023 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3589-1.20230220
- new version
- revert changeset 3572 and 3566 to build VBox 6 on el7
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3572-3.20221024
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Dec 17 2022 Florian Weimer <fweimer@redhat.com> - 0.1.9998.r3572-2.20221024
- C99 compatibility fixes (#2154544)
* Mon Oct 24 2022 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3572-1.20221024
* Mon Oct 24 2022 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3572-2.20221024
- Update to r3572.20221024
- Allow build with automake 1.13.4 on epel7

25
kbuild-dummy_noreturn.diff
View file

@ -11,3 +11,28 @@ Index: src/kmk/kmkbuiltin/expr.c
}
/* NOTREACHED */
}
Index: src/kmk/kmkbuiltin/kbuild_protection.c
===================================================================
--- ./src/kmk/kmkbuiltin/kbuild_protection.c.orig
+++ ./src/kmk/kmkbuiltin/kbuild_protection.c
@@ -29,6 +29,7 @@
#include "config.h"
#include <sys/types.h>
#include <stdlib.h>
+#include <unistd.h>
#include <string.h>
#include <ctype.h>
#include <assert.h>
# Fix one implicit-function-declaration
Index: src/sed/lib/utils.c
===================================================================
--- ./src/sed/lib/utils.c (revision 3127)
+++ ./src/sed/lib/utils.c (working copy)
@@ -19,6 +19,7 @@
#include "config.h"
#include <stdio.h>
+#include <unistd.h>
#include <errno.h>
#ifndef errno

1
relax_automake_version.patch
View file

@ -1,4 +1,3 @@
# Only for epel <= 7
--- kBuild/src/kmk/configure.ac.orig 2022-10-30 19:36:49.966336934 +0000
+++ kBuild/src/kmk/configure.ac 2022-10-30 19:37:07.936270597 +0000
@@ -30,7 +30,7 @@ AC_CONFIG_HEADERS([config.h])

2
sources
View file

@ -1 +1 @@
SHA512 (kBuild-r3674.20250422.tar.gz) = dfb52548f896281ac7473a2ebed93e939ae65e6b22101f16a27d36367a90304a3b0aa67f5470d50af1a37333865f570cc447ac7537250fc0fe57746d6c6ba219
SHA512 (kBuild-r3572.20221024.tar.gz) = 65f1c7f79c8daa5d4f6f7430f05e05081407ef03009fa8d20f794a450bb4b8ab7ad52a449f3700f2a3effde962a04a8fde6ee6c21db26ce9bdf5640c389ebc57