Drop patch revert
Gianfranco Costamagna
1 year, 6 months ago
| 0 | Description: Revert upstream commit 3566, making build FTBFS | |
| 1 | Author: Gianfranco Costamagna <locutusofborg@debian.org> | |
| 2 | Last-Update: 2022-10-22 | |
| 3 | ||
| 4 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/header.kmk | |
| 5 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/header.kmk | |
| 6 | @@ -1713,7 +1713,7 @@ endif | |
| 7 | ||
| 8 | ## | |
| 9 | # An internal define used by subheader.kmk, subfooter.kmk, and | |
| 10 | -# KB_FN_DO_PASS0_ON_TARGET. | |
| 11 | +# KB_FN_PASS_0_ON_TARGET. | |
| 12 | # | |
| 13 | # @param target The target to process. | |
| 14 | # | |
| 15 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC.kmk | |
| 16 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC.kmk | |
| 17 | @@ -105,7 +105,7 @@ TOOL_GCC_COMPILE_C_DEPEND = | |
| 18 | TOOL_GCC_COMPILE_C_DEPORD = | |
| 19 | define TOOL_GCC_COMPILE_C_CMDS | |
| 20 | $(QUIET)$(TOOL_GCC_CC) -c\ | |
| 21 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 22 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 23 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) \ | |
| 24 | -o $(obj)\ | |
| 25 | $(abspath $(source)) | |
| 26 | @@ -131,7 +131,7 @@ TOOL_GCC_COMPILE_CXX_DEPEND = | |
| 27 | TOOL_GCC_COMPILE_CXX_DEPORD = | |
| 28 | define TOOL_GCC_COMPILE_CXX_CMDS | |
| 29 | $(QUIET)$(TOOL_GCC_CXX) -c\ | |
| 30 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 31 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 32 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) \ | |
| 33 | -o $(obj)\ | |
| 34 | $(abspath $(source)) | |
| 35 | @@ -157,7 +157,7 @@ TOOL_GCC_COMPILE_AS_DEPEND = | |
| 36 | TOOL_GCC_COMPILE_AS_DEPORD = | |
| 37 | define TOOL_GCC_COMPILE_AS_CMDS | |
| 38 | $(QUIET)$(TOOL_GCC_AS) -c\ | |
| 39 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 40 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 41 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) \ | |
| 42 | -o $(obj)\ | |
| 43 | $(abspath $(source)) | |
| 44 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC3.kmk | |
| 45 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC3.kmk | |
| 46 | @@ -133,7 +133,7 @@ define TOOL_GCC3_COMPILE_C_CMDS | |
| 47 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 48 | --kObjCache-cpp $(outbase).i\ | |
| 49 | $(TOOL_GCC3_CC) -E -o -\ | |
| 50 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 51 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 52 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 53 | $(abspath $(source))\ | |
| 54 | --kObjCache-cc $(obj)\ | |
| 55 | @@ -147,7 +147,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 56 | TOOL_GCC3_COMPILE_C_OUTPUT = | |
| 57 | define TOOL_GCC3_COMPILE_C_CMDS | |
| 58 | $(QUIET)$(TOOL_GCC3_CC) -c\ | |
| 59 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 60 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 61 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 62 | -o $(obj)\ | |
| 63 | $(abspath $(source)) | |
| 64 | @@ -177,7 +177,7 @@ define TOOL_GCC3_COMPILE_CXX_CMDS | |
| 65 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 66 | --kObjCache-cpp $(outbase).ii\ | |
| 67 | $(TOOL_GCC3_CXX) -E -o -\ | |
| 68 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 69 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 70 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 71 | $(abspath $(source))\ | |
| 72 | --kObjCache-cc $(obj)\ | |
| 73 | @@ -191,7 +191,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 74 | TOOL_GCC3_COMPILE_CXX_OUTPUT = | |
| 75 | define TOOL_GCC3_COMPILE_CXX_CMDS | |
| 76 | $(QUIET)$(TOOL_GCC3_CXX) -c\ | |
| 77 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 78 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 79 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 80 | -o $(obj)\ | |
| 81 | $(abspath $(source)) | |
| 82 | @@ -218,7 +218,7 @@ TOOL_GCC3_COMPILE_AS_DEPEND = | |
| 83 | TOOL_GCC3_COMPILE_AS_DEPORD = | |
| 84 | define TOOL_GCC3_COMPILE_AS_CMDS | |
| 85 | $(QUIET)$(TOOL_GCC3_AS) -c\ | |
| 86 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 87 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 88 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 89 | -o $(obj)\ | |
| 90 | $(abspath $(source)) | |
| 91 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC32.kmk | |
| 92 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC32.kmk | |
| 93 | @@ -133,7 +133,7 @@ define TOOL_GCC32_COMPILE_C_CMDS | |
| 94 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 95 | --kObjCache-cpp $(outbase).i\ | |
| 96 | $(TOOL_GCC32_CC) -E -o -\ | |
| 97 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 98 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 99 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 100 | $(abspath $(source))\ | |
| 101 | --kObjCache-cc $(obj)\ | |
| 102 | @@ -147,7 +147,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 103 | TOOL_GCC32_COMPILE_C_OUTPUT = | |
| 104 | define TOOL_GCC32_COMPILE_C_CMDS | |
| 105 | $(QUIET)$(TOOL_GCC32_CC) -c\ | |
| 106 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 107 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 108 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 109 | -o $(obj)\ | |
| 110 | $(abspath $(source)) | |
| 111 | @@ -177,7 +177,7 @@ define TOOL_GCC32_COMPILE_CXX_CMDS | |
| 112 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 113 | --kObjCache-cpp $(outbase).ii\ | |
| 114 | $(TOOL_GCC32_CXX) -E -o -\ | |
| 115 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 116 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 117 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 118 | $(abspath $(source))\ | |
| 119 | --kObjCache-cc $(obj)\ | |
| 120 | @@ -192,7 +192,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 121 | TOOL_GCC32_COMPILE_CXX_OUTPUT = | |
| 122 | define TOOL_GCC32_COMPILE_CXX_CMDS | |
| 123 | $(QUIET)$(TOOL_GCC32_CXX) -c\ | |
| 124 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 125 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 126 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 127 | -o $(obj)\ | |
| 128 | $(abspath $(source)) | |
| 129 | @@ -219,7 +219,7 @@ TOOL_GCC32_COMPILE_AS_DEPEND = | |
| 130 | TOOL_GCC32_COMPILE_AS_DEPORD = | |
| 131 | define TOOL_GCC32_COMPILE_AS_CMDS | |
| 132 | $(QUIET)$(TOOL_GCC32_AS) -c\ | |
| 133 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 134 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 135 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 136 | -o $(obj)\ | |
| 137 | $(abspath $(source)) | |
| 138 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC3OMF.kmk | |
| 139 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC3OMF.kmk | |
| 140 | @@ -116,7 +116,7 @@ define TOOL_GCC3OMF_COMPILE_C_CMDS | |
| 141 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 142 | --kObjCache-cpp $(outbase).i\ | |
| 143 | $(TOOL_GCC3OMF_CC) -E -o -\ | |
| 144 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 145 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 146 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 147 | $(abspath $(source))\ | |
| 148 | --kObjCache-cc $(obj)\ | |
| 149 | @@ -130,7 +130,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 150 | TOOL_GCC3OMF_COMPILE_C_OUTPUT = | |
| 151 | define TOOL_GCC3OMF_COMPILE_C_CMDS | |
| 152 | $(QUIET)$(TOOL_GCC3OMF_CC) -c\ | |
| 153 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 154 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 155 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \ | |
| 156 | -o $(obj)\ | |
| 157 | $(abspath $(source)) | |
| 158 | @@ -161,7 +161,7 @@ define TOOL_GCC3OMF_COMPILE_CXX_CMDS | |
| 159 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 160 | --kObjCache-cpp $(outbase).ii\ | |
| 161 | $(TOOL_GCC3OMF_CXX) -E -o -\ | |
| 162 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 163 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 164 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 165 | $(abspath $(source))\ | |
| 166 | --kObjCache-cc $(obj)\ | |
| 167 | @@ -175,7 +175,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 168 | TOOL_GCC3OMF_COMPILE_CXX_OUTPUT = | |
| 169 | define TOOL_GCC3OMF_COMPILE_CXX_CMDS | |
| 170 | $(QUIET)$(TOOL_GCC3OMF_CXX) -c\ | |
| 171 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 172 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 173 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \ | |
| 174 | -o $(obj)\ | |
| 175 | $(abspath $(source)) | |
| 176 | @@ -202,7 +202,7 @@ TOOL_GCC3OMF_COMPILE_AS_DEPEND = | |
| 177 | TOOL_GCC3OMF_COMPILE_AS_DEPORD = | |
| 178 | define TOOL_GCC3OMF_COMPILE_AS_CMDS | |
| 179 | $(QUIET)$(TOOL_GCC3OMF_AS) -c\ | |
| 180 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 181 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 182 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 183 | -o $(obj)\ | |
| 184 | $(abspath $(source)) | |
| 185 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC3PLAIN.kmk | |
| 186 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC3PLAIN.kmk | |
| 187 | @@ -118,7 +118,7 @@ define TOOL_GCC3PLAIN_COMPILE_C_CMDS | |
| 188 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 189 | --kObjCache-cpp $(outbase).i\ | |
| 190 | $(TOOL_GCC3PLAIN_CC) -E -o -\ | |
| 191 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 192 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 193 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 194 | $(abspath $(source))\ | |
| 195 | --kObjCache-cc $(obj)\ | |
| 196 | @@ -132,7 +132,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 197 | TOOL_GCC3PLAIN_COMPILE_C_OUTPUT = | |
| 198 | define TOOL_GCC3PLAIN_COMPILE_C_CMDS | |
| 199 | $(QUIET)$(TOOL_GCC3PLAIN_CC) -c\ | |
| 200 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 201 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 202 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 203 | -o $(obj)\ | |
| 204 | $(abspath $(source)) | |
| 205 | @@ -162,7 +162,7 @@ define TOOL_GCC3PLAIN_COMPILE_CXX_CMDS | |
| 206 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 207 | --kObjCache-cpp $(outbase).ii\ | |
| 208 | $(TOOL_GCC3PLAIN_CXX) -E -o -\ | |
| 209 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 210 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 211 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 212 | $(abspath $(source))\ | |
| 213 | --kObjCache-cc $(obj)\ | |
| 214 | @@ -176,7 +176,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 215 | TOOL_GCC3PLAIN_COMPILE_CXX_OUTPUT = | |
| 216 | define TOOL_GCC3PLAIN_COMPILE_CXX_CMDS | |
| 217 | $(QUIET)$(TOOL_GCC3PLAIN_CXX) -c\ | |
| 218 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 219 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 220 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 221 | -o $(obj)\ | |
| 222 | $(abspath $(source)) | |
| 223 | @@ -203,7 +203,7 @@ TOOL_GCC3PLAIN_COMPILE_AS_DEPEND = | |
| 224 | TOOL_GCC3PLAIN_COMPILE_AS_DEPORD = | |
| 225 | define TOOL_GCC3PLAIN_COMPILE_AS_CMDS | |
| 226 | $(QUIET)$(TOOL_GCC3PLAIN_AS) -c\ | |
| 227 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 228 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 229 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 230 | -o $(obj)\ | |
| 231 | $(abspath $(source)) | |
| 232 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC42MACHO.kmk | |
| 233 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC42MACHO.kmk | |
| 234 | @@ -157,7 +157,7 @@ define TOOL_GCC42MACHO_COMPILE_C_CMDS | |
| 235 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 236 | --kObjCache-cpp $(outbase).i\ | |
| 237 | $(TOOL_GCC42MACHO_CC) -E -o -\ | |
| 238 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 239 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 240 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 241 | $(abspath $(source))\ | |
| 242 | --kObjCache-cc $(obj)\ | |
| 243 | @@ -171,7 +171,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 244 | TOOL_GCC42MACHO_COMPILE_C_OUTPUT = | |
| 245 | define TOOL_GCC42MACHO_COMPILE_C_CMDS | |
| 246 | $(QUIET)$(TOOL_GCC42MACHO_CC) -c\ | |
| 247 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 248 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 249 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 250 | -o $(obj)\ | |
| 251 | $(abspath $(source)) | |
| 252 | @@ -201,7 +201,7 @@ define TOOL_GCC42MACHO_COMPILE_CXX_CMDS | |
| 253 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 254 | --kObjCache-cpp $(outbase).ii\ | |
| 255 | $(TOOL_GCC42MACHO_CXX) -E -o -\ | |
| 256 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 257 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 258 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 259 | $(abspath $(source))\ | |
| 260 | --kObjCache-cc $(obj)\ | |
| 261 | @@ -215,7 +215,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 262 | TOOL_GCC42MACHO_COMPILE_CXX_OUTPUT = | |
| 263 | define TOOL_GCC42MACHO_COMPILE_CXX_CMDS | |
| 264 | $(QUIET)$(TOOL_GCC42MACHO_CXX) -c\ | |
| 265 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 266 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 267 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 268 | -o $(obj)\ | |
| 269 | $(abspath $(source)) | |
| 270 | @@ -245,7 +245,7 @@ define TOOL_GCC42MACHO_COMPILE_OBJC_CMDS | |
| 271 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 272 | --kObjCache-cpp $(outbase).ii\ | |
| 273 | $(TOOL_GCC42MACHO_OBJC) -E -o -\ | |
| 274 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 275 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 276 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 277 | $(abspath $(source))\ | |
| 278 | --kObjCache-cc $(obj)\ | |
| 279 | @@ -259,7 +259,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 280 | TOOL_GCC42MACHO_COMPILE_OBJC_OUTPUT = | |
| 281 | define TOOL_GCC42MACHO_COMPILE_OBJC_CMDS | |
| 282 | $(QUIET)$(TOOL_GCC42MACHO_OBJC) -c\ | |
| 283 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 284 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 285 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 286 | -o $(obj)\ | |
| 287 | $(abspath $(source)) | |
| 288 | @@ -289,7 +289,7 @@ define TOOL_GCC42MACHO_COMPILE_OBJCXX_CM | |
| 289 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 290 | --kObjCache-cpp $(outbase).mii\ | |
| 291 | $(TOOL_GCC42MACHO_OBJCXX) -E -o -\ | |
| 292 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 293 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 294 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 295 | $(abspath $(source))\ | |
| 296 | --kObjCache-cc $(obj)\ | |
| 297 | @@ -303,7 +303,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 298 | TOOL_GCC42MACHO_COMPILE_OBJCXX_OUTPUT = | |
| 299 | define TOOL_GCC42MACHO_COMPILE_OBJCXX_CMDS | |
| 300 | $(QUIET)$(TOOL_GCC42MACHO_OBJCXX) -c\ | |
| 301 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 302 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 303 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 304 | -o $(obj)\ | |
| 305 | $(abspath $(source)) | |
| 306 | @@ -330,7 +330,7 @@ TOOL_GCC42MACHO_COMPILE_AS_DEPEND = | |
| 307 | TOOL_GCC42MACHO_COMPILE_AS_DEPORD = | |
| 308 | define TOOL_GCC42MACHO_COMPILE_AS_CMDS | |
| 309 | $(QUIET)$(TOOL_GCC42MACHO_AS) -c\ | |
| 310 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 311 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 312 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 313 | -o $(obj)\ | |
| 314 | $(abspath $(source)) | |
| 315 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC4MACHO.kmk | |
| 316 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC4MACHO.kmk | |
| 317 | @@ -157,7 +157,7 @@ define TOOL_GCC4MACHO_COMPILE_C_CMDS | |
| 318 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 319 | --kObjCache-cpp $(outbase).i\ | |
| 320 | $(TOOL_GCC4MACHO_CC) -E -o -\ | |
| 321 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 322 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 323 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 324 | $(abspath $(source))\ | |
| 325 | --kObjCache-cc $(obj)\ | |
| 326 | @@ -171,7 +171,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 327 | TOOL_GCC4MACHO_COMPILE_C_OUTPUT = | |
| 328 | define TOOL_GCC4MACHO_COMPILE_C_CMDS | |
| 329 | $(QUIET)$(TOOL_GCC4MACHO_CC) -c\ | |
| 330 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 331 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 332 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 333 | -o $(obj)\ | |
| 334 | $(abspath $(source)) | |
| 335 | @@ -201,7 +201,7 @@ define TOOL_GCC4MACHO_COMPILE_CXX_CMDS | |
| 336 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 337 | --kObjCache-cpp $(outbase).ii\ | |
| 338 | $(TOOL_GCC4MACHO_CXX) -E -o -\ | |
| 339 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 340 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 341 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 342 | $(abspath $(source))\ | |
| 343 | --kObjCache-cc $(obj)\ | |
| 344 | @@ -215,7 +215,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 345 | TOOL_GCC4MACHO_COMPILE_CXX_OUTPUT = | |
| 346 | define TOOL_GCC4MACHO_COMPILE_CXX_CMDS | |
| 347 | $(QUIET)$(TOOL_GCC4MACHO_CXX) -c\ | |
| 348 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 349 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 350 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 351 | -o $(obj)\ | |
| 352 | $(abspath $(source)) | |
| 353 | @@ -245,7 +245,7 @@ define TOOL_GCC4MACHO_COMPILE_OBJC_CMDS | |
| 354 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 355 | --kObjCache-cpp $(outbase).ii\ | |
| 356 | $(TOOL_GCC4MACHO_OBJC) -E -o -\ | |
| 357 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 358 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 359 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 360 | $(abspath $(source))\ | |
| 361 | --kObjCache-cc $(obj)\ | |
| 362 | @@ -259,7 +259,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 363 | TOOL_GCC4MACHO_COMPILE_OBJC_OUTPUT = | |
| 364 | define TOOL_GCC4MACHO_COMPILE_OBJC_CMDS | |
| 365 | $(QUIET)$(TOOL_GCC4MACHO_OBJC) -c\ | |
| 366 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 367 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 368 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 369 | -o $(obj)\ | |
| 370 | $(abspath $(source)) | |
| 371 | @@ -289,7 +289,7 @@ define TOOL_GCC4MACHO_COMPILE_OBJCXX_CMD | |
| 372 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 373 | --kObjCache-cpp $(outbase).mii\ | |
| 374 | $(TOOL_GCC4MACHO_OBJCXX) -E -o -\ | |
| 375 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 376 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 377 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 378 | $(abspath $(source))\ | |
| 379 | --kObjCache-cc $(obj)\ | |
| 380 | @@ -303,7 +303,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 381 | TOOL_GCC4MACHO_COMPILE_OBJCXX_OUTPUT = | |
| 382 | define TOOL_GCC4MACHO_COMPILE_OBJCXX_CMDS | |
| 383 | $(QUIET)$(TOOL_GCC4MACHO_OBJCXX) -c\ | |
| 384 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 385 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 386 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 387 | -o $(obj)\ | |
| 388 | $(abspath $(source)) | |
| 389 | @@ -330,7 +330,7 @@ TOOL_GCC4MACHO_COMPILE_AS_DEPEND = | |
| 390 | TOOL_GCC4MACHO_COMPILE_AS_DEPORD = | |
| 391 | define TOOL_GCC4MACHO_COMPILE_AS_CMDS | |
| 392 | $(QUIET)$(TOOL_GCC4MACHO_AS) -c\ | |
| 393 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 394 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 395 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 396 | -o $(obj)\ | |
| 397 | $(abspath $(source)) | |
| 398 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GCC64.kmk | |
| 399 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GCC64.kmk | |
| 400 | @@ -132,7 +132,7 @@ define TOOL_GCC64_COMPILE_C_CMDS | |
| 401 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 402 | --kObjCache-cpp $(outbase).i\ | |
| 403 | $(TOOL_GCC64_CC) -E -o -\ | |
| 404 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 405 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 406 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 407 | $(abspath $(source))\ | |
| 408 | --kObjCache-cc $(obj)\ | |
| 409 | @@ -146,7 +146,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 410 | TOOL_GCC64_COMPILE_C_OUTPUT = | |
| 411 | define TOOL_GCC64_COMPILE_C_CMDS | |
| 412 | $(QUIET)$(TOOL_GCC64_CC) -c\ | |
| 413 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 414 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 415 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 416 | -o $(obj)\ | |
| 417 | $(abspath $(source)) | |
| 418 | @@ -176,7 +176,7 @@ define TOOL_GCC64_COMPILE_CXX_CMDS | |
| 419 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 420 | --kObjCache-cpp $(outbase).ii\ | |
| 421 | $(TOOL_GCC64_CXX) -E -o -\ | |
| 422 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 423 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 424 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 425 | $(abspath $(source))\ | |
| 426 | --kObjCache-cc $(obj)\ | |
| 427 | @@ -190,7 +190,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 428 | TOOL_GCC64_COMPILE_CXX_OUTPUT = | |
| 429 | define TOOL_GCC64_COMPILE_CXX_CMDS | |
| 430 | $(QUIET)$(TOOL_GCC64_CXX) -c\ | |
| 431 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 432 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 433 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 434 | -o $(obj)\ | |
| 435 | $(abspath $(source)) | |
| 436 | @@ -217,7 +217,7 @@ TOOL_GCC64_COMPILE_AS_DEPEND = | |
| 437 | TOOL_GCC64_COMPILE_AS_DEPORD = | |
| 438 | define TOOL_GCC64_COMPILE_AS_CMDS | |
| 439 | $(QUIET)$(TOOL_GCC64_AS) -c\ | |
| 440 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 441 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 442 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 443 | -o $(obj)\ | |
| 444 | $(abspath $(source)) | |
| 445 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX.kmk | |
| 446 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX.kmk | |
| 447 | @@ -120,7 +120,7 @@ TOOL_GXX_COMPILE_C_DEPEND = | |
| 448 | TOOL_GXX_COMPILE_C_DEPORD = | |
| 449 | define TOOL_GXX_COMPILE_C_CMDS | |
| 450 | $(QUIET)$(TOOL_GXX_CC) -c\ | |
| 451 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 452 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 453 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) \ | |
| 454 | -o $(obj)\ | |
| 455 | $(abspath $(source)) | |
| 456 | @@ -146,7 +146,7 @@ TOOL_GXX_COMPILE_CXX_DEPEND = $($(target | |
| 457 | TOOL_GXX_COMPILE_CXX_DEPORD = | |
| 458 | define TOOL_GXX_COMPILE_CXX_CMDS | |
| 459 | $(QUIET)$(TOOL_GXX_CXX) -c\ | |
| 460 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 461 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 462 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 463 | -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ | |
| 464 | ,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \ | |
| 465 | @@ -172,7 +172,7 @@ TOOL_GXX_COMPILE_PCH_DEPEND = | |
| 466 | TOOL_GXX_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR) | |
| 467 | define TOOL_GXX_COMPILE_PCH_CMDS | |
| 468 | $(QUIET)$(TOOL_GXX_PCH) -c\ | |
| 469 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 470 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 471 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 472 | -o $(obj)\ | |
| 473 | $(abspath $(source)) | |
| 474 | @@ -199,7 +199,7 @@ TOOL_GXX_COMPILE_AS_DEPEND = | |
| 475 | TOOL_GXX_COMPILE_AS_DEPORD = | |
| 476 | define TOOL_GXX_COMPILE_AS_CMDS | |
| 477 | $(QUIET)$(TOOL_GXX_AS) -c\ | |
| 478 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 479 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 480 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) \ | |
| 481 | -o $(obj)\ | |
| 482 | $(abspath $(source)) | |
| 483 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX3.kmk | |
| 484 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX3.kmk | |
| 485 | @@ -142,7 +142,7 @@ if "$(use_objcache)" != "" | |
| 486 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 487 | --kObjCache-cpp $(outbase).i\ | |
| 488 | $(TOOL_GXX3_CC) -E -o -\ | |
| 489 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 490 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 491 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 492 | $(abspath $(source))\ | |
| 493 | --kObjCache-cc $(obj)\ | |
| 494 | @@ -152,7 +152,7 @@ if "$(use_objcache)" != "" | |
| 495 | - | |
| 496 | else | |
| 497 | $(QUIET)$(TOOL_GXX3_CC) -c\ | |
| 498 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 499 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 500 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 501 | -o $(obj)\ | |
| 502 | $(abspath $(source)) | |
| 503 | @@ -183,7 +183,7 @@ if "$(use_objcache)" != "" | |
| 504 | --kObjCache-cpp $(outbase).ii\ | |
| 505 | $(TOOL_GXX3_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\ | |
| 506 | ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\ | |
| 507 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 508 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 509 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 510 | $(abspath $(source))\ | |
| 511 | --kObjCache-cc $(obj)\ | |
| 512 | @@ -193,7 +193,7 @@ if "$(use_objcache)" != "" | |
| 513 | - | |
| 514 | else | |
| 515 | $(QUIET)$(TOOL_GXX3_CXX) -c\ | |
| 516 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 517 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 518 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 519 | -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ | |
| 520 | ,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \ | |
| 521 | @@ -220,7 +220,7 @@ TOOL_GXX3_COMPILE_PCH_DEPEND = | |
| 522 | TOOL_GXX3_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR) | |
| 523 | define TOOL_GXX3_COMPILE_PCH_CMDS | |
| 524 | $(QUIET)$(TOOL_GXX3_PCH) -c\ | |
| 525 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 526 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 527 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 528 | -o $(obj)\ | |
| 529 | $(abspath $(source)) | |
| 530 | @@ -247,7 +247,7 @@ TOOL_GXX3_COMPILE_AS_DEPEND = | |
| 531 | TOOL_GXX3_COMPILE_AS_DEPORD = | |
| 532 | define TOOL_GXX3_COMPILE_AS_CMDS | |
| 533 | $(QUIET)$(TOOL_GXX3_AS) -c\ | |
| 534 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 535 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 536 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 537 | -o $(obj)\ | |
| 538 | $(abspath $(source)) | |
| 539 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX32.kmk | |
| 540 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX32.kmk | |
| 541 | @@ -140,7 +140,7 @@ if "$(use_objcache)" != "" | |
| 542 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 543 | --kObjCache-cpp $(outbase).i\ | |
| 544 | $(TOOL_GXX32_CC) -E -o -\ | |
| 545 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 546 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 547 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 548 | $(abspath $(source))\ | |
| 549 | --kObjCache-cc $(obj)\ | |
| 550 | @@ -150,7 +150,7 @@ if "$(use_objcache)" != "" | |
| 551 | - | |
| 552 | else | |
| 553 | $(QUIET)$(TOOL_GXX32_CC) -c\ | |
| 554 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 555 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 556 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 557 | -o $(obj)\ | |
| 558 | $(abspath $(source)) | |
| 559 | @@ -181,7 +181,7 @@ if "$(use_objcache)" != "" | |
| 560 | --kObjCache-cpp $(outbase).ii\ | |
| 561 | $(TOOL_GXX32_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\ | |
| 562 | ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\ | |
| 563 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 564 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 565 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 566 | $(abspath $(source))\ | |
| 567 | --kObjCache-cc $(obj)\ | |
| 568 | @@ -191,7 +191,7 @@ if "$(use_objcache)" != "" | |
| 569 | - | |
| 570 | else | |
| 571 | $(QUIET)$(TOOL_GXX32_CXX) -c\ | |
| 572 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 573 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 574 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 575 | -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ | |
| 576 | ,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \ | |
| 577 | @@ -218,7 +218,7 @@ TOOL_GXX32_COMPILE_PCH_DEPEND = | |
| 578 | TOOL_GXX32_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR) | |
| 579 | define TOOL_GXX32_COMPILE_PCH_CMDS | |
| 580 | $(QUIET)$(TOOL_GXX32_PCH) -c\ | |
| 581 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 582 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 583 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 584 | -o $(obj)\ | |
| 585 | $(abspath $(source)) | |
| 586 | @@ -245,7 +245,7 @@ TOOL_GXX32_COMPILE_AS_DEPEND = | |
| 587 | TOOL_GXX32_COMPILE_AS_DEPORD = | |
| 588 | define TOOL_GXX32_COMPILE_AS_CMDS | |
| 589 | $(QUIET)$(TOOL_GXX32_AS) -c\ | |
| 590 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 591 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 592 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 593 | -o $(obj)\ | |
| 594 | $(abspath $(source)) | |
| 595 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX3OMF.kmk | |
| 596 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX3OMF.kmk | |
| 597 | @@ -128,7 +128,7 @@ if "$(use_objcache)" != "" | |
| 598 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 599 | --kObjCache-cpp $(outbase).i\ | |
| 600 | $(TOOL_GXX3OMF_CC) -E -o -\ | |
| 601 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 602 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 603 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 604 | $(abspath $(source))\ | |
| 605 | --kObjCache-cc $(obj)\ | |
| 606 | @@ -138,7 +138,7 @@ if "$(use_objcache)" != "" | |
| 607 | - | |
| 608 | else | |
| 609 | $(QUIET)$(TOOL_GXX3OMF_CC) -c\ | |
| 610 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 611 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 612 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 613 | -o $(obj)\ | |
| 614 | $(abspath $(source)) | |
| 615 | @@ -169,7 +169,7 @@ if "$(use_objcache)" != "" | |
| 616 | --kObjCache-cpp $(outbase).ii\ | |
| 617 | $(TOOL_GXX3OMF_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\ | |
| 618 | ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\ | |
| 619 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 620 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 621 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 622 | $(abspath $(source))\ | |
| 623 | --kObjCache-cc $(obj)\ | |
| 624 | @@ -179,7 +179,7 @@ if "$(use_objcache)" != "" | |
| 625 | - | |
| 626 | else | |
| 627 | $(QUIET)$(TOOL_GXX3OMF_CXX) -c\ | |
| 628 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 629 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 630 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 631 | -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ | |
| 632 | ,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \ | |
| 633 | @@ -206,7 +206,7 @@ TOOL_GXX3OMF_COMPILE_PCH_DEPEND = | |
| 634 | TOOL_GXX3OMF_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR) | |
| 635 | define TOOL_GXX3OMF_COMPILE_PCH_CMDS | |
| 636 | $(QUIET)$(TOOL_GXX3OMF_PCH) -c\ | |
| 637 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 638 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 639 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 640 | -o $(obj)\ | |
| 641 | $(abspath $(source)) | |
| 642 | @@ -233,7 +233,7 @@ TOOL_GXX3OMF_COMPILE_AS_DEPEND = | |
| 643 | TOOL_GXX3OMF_COMPILE_AS_DEPORD = | |
| 644 | define TOOL_GXX3OMF_COMPILE_AS_CMDS | |
| 645 | $(QUIET)$(TOOL_GXX3OMF_AS) -c\ | |
| 646 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 647 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 648 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 649 | -o $(obj)\ | |
| 650 | $(abspath $(source)) | |
| 651 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX3PLAIN.kmk | |
| 652 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX3PLAIN.kmk | |
| 653 | @@ -126,7 +126,7 @@ if "$(use_objcache)" != "" | |
| 654 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 655 | --kObjCache-cpp $(outbase).i\ | |
| 656 | $(TOOL_GXX3PLAIN_CC) -E -o -\ | |
| 657 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 658 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 659 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 660 | $(abspath $(source))\ | |
| 661 | --kObjCache-cc $(obj)\ | |
| 662 | @@ -136,7 +136,7 @@ if "$(use_objcache)" != "" | |
| 663 | - | |
| 664 | else | |
| 665 | $(QUIET)$(TOOL_GXX3PLAIN_CC) -c\ | |
| 666 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 667 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 668 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 669 | -o $(obj)\ | |
| 670 | $(abspath $(source)) | |
| 671 | @@ -167,7 +167,7 @@ if "$(use_objcache)" != "" | |
| 672 | --kObjCache-cpp $(outbase).ii\ | |
| 673 | $(TOOL_GXX3PLAIN_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\ | |
| 674 | ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\ | |
| 675 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 676 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 677 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 678 | $(abspath $(source))\ | |
| 679 | --kObjCache-cc $(obj)\ | |
| 680 | @@ -177,7 +177,7 @@ if "$(use_objcache)" != "" | |
| 681 | - | |
| 682 | else | |
| 683 | $(QUIET)$(TOOL_GXX3PLAIN_CXX) -c\ | |
| 684 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 685 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 686 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 687 | -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ | |
| 688 | ,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \ | |
| 689 | @@ -204,7 +204,7 @@ TOOL_GXX3PLAIN_COMPILE_PCH_DEPEND = | |
| 690 | TOOL_GXX3PLAIN_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR) | |
| 691 | define TOOL_GXX3PLAIN_COMPILE_PCH_CMDS | |
| 692 | $(QUIET)$(TOOL_GXX3PLAIN_PCH) -c\ | |
| 693 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 694 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 695 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 696 | -o $(obj)\ | |
| 697 | $(abspath $(source)) | |
| 698 | @@ -231,7 +231,7 @@ TOOL_GXX3PLAIN_COMPILE_AS_DEPEND = | |
| 699 | TOOL_GXX3PLAIN_COMPILE_AS_DEPORD = | |
| 700 | define TOOL_GXX3PLAIN_COMPILE_AS_CMDS | |
| 701 | $(QUIET)$(TOOL_GXX3PLAIN_AS) -c\ | |
| 702 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 703 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 704 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 705 | -o $(obj)\ | |
| 706 | $(abspath $(source)) | |
| 707 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX42MACHO.kmk | |
| 708 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX42MACHO.kmk | |
| 709 | @@ -166,7 +166,7 @@ if "$(use_objcache)" != "" | |
| 710 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 711 | --kObjCache-cpp $(outbase).i\ | |
| 712 | $(TOOL_GXX42MACHO_CC) -E -o -\ | |
| 713 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 714 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 715 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 716 | $(abspath $(source))\ | |
| 717 | --kObjCache-cc $(obj)\ | |
| 718 | @@ -176,7 +176,7 @@ if "$(use_objcache)" != "" | |
| 719 | - | |
| 720 | else | |
| 721 | $(QUIET)$(TOOL_GXX42MACHO_CC) -c\ | |
| 722 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 723 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 724 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 725 | -o $(obj)\ | |
| 726 | $(abspath $(source)) | |
| 727 | @@ -207,7 +207,7 @@ if "$(use_objcache)" != "" | |
| 728 | --kObjCache-cpp $(outbase).ii\ | |
| 729 | $(TOOL_GXX42MACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\ | |
| 730 | ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\ | |
| 731 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 732 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 733 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 734 | $(abspath $(source))\ | |
| 735 | --kObjCache-cc $(obj)\ | |
| 736 | @@ -217,7 +217,7 @@ if "$(use_objcache)" != "" | |
| 737 | - | |
| 738 | else | |
| 739 | $(QUIET)$(TOOL_GXX42MACHO_CXX) -c\ | |
| 740 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 741 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 742 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 743 | -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ | |
| 744 | ,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \ | |
| 745 | @@ -244,7 +244,7 @@ TOOL_GXX42MACHO_COMPILE_PCH_DEPEND = | |
| 746 | TOOL_GXX42MACHO_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR) | |
| 747 | define TOOL_GXX42MACHO_COMPILE_PCH_CMDS | |
| 748 | $(QUIET)$(TOOL_GXX42MACHO_PCH) -c\ | |
| 749 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 750 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 751 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 752 | -o $(obj)\ | |
| 753 | $(abspath $(source)) | |
| 754 | @@ -274,7 +274,7 @@ define TOOL_GXX42MACHO_COMPILE_OBJC_CMDS | |
| 755 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 756 | --kObjCache-cpp $(outbase).ii\ | |
| 757 | $(TOOL_GXX42MACHO_OBJC) -E -o -\ | |
| 758 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 759 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 760 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 761 | $(abspath $(source))\ | |
| 762 | --kObjCache-cc $(obj)\ | |
| 763 | @@ -288,7 +288,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 764 | TOOL_GXX42MACHO_COMPILE_OBJC_OUTPUT = | |
| 765 | define TOOL_GXX42MACHO_COMPILE_OBJC_CMDS | |
| 766 | $(QUIET)$(TOOL_GXX42MACHO_OBJC) -c\ | |
| 767 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 768 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 769 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 770 | -o $(obj)\ | |
| 771 | $(abspath $(source)) | |
| 772 | @@ -318,7 +318,7 @@ define TOOL_GXX42MACHO_COMPILE_OBJCXX_CM | |
| 773 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 774 | --kObjCache-cpp $(outbase).mii\ | |
| 775 | $(TOOL_GXX42MACHO_OBJCXX) -E -o -\ | |
| 776 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 777 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 778 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 779 | $(abspath $(source))\ | |
| 780 | --kObjCache-cc $(obj)\ | |
| 781 | @@ -332,7 +332,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 782 | TOOL_GXX42MACHO_COMPILE_OBJCXX_OUTPUT = | |
| 783 | define TOOL_GXX42MACHO_COMPILE_OBJCXX_CMDS | |
| 784 | $(QUIET)$(TOOL_GXX42MACHO_OBJCXX) -c\ | |
| 785 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 786 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 787 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 788 | -o $(obj)\ | |
| 789 | $(abspath $(source)) | |
| 790 | @@ -359,7 +359,7 @@ TOOL_GXX42MACHO_COMPILE_AS_DEPEND = | |
| 791 | TOOL_GXX42MACHO_COMPILE_AS_DEPORD = | |
| 792 | define TOOL_GXX42MACHO_COMPILE_AS_CMDS | |
| 793 | $(QUIET)$(TOOL_GXX42MACHO_AS) -c\ | |
| 794 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 795 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 796 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 797 | -o $(obj)\ | |
| 798 | $(abspath $(source)) | |
| 799 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX4MACHO.kmk | |
| 800 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX4MACHO.kmk | |
| 801 | @@ -166,7 +166,7 @@ if "$(use_objcache)" != "" | |
| 802 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 803 | --kObjCache-cpp $(outbase).i\ | |
| 804 | $(TOOL_GXX4MACHO_CC) -E -o -\ | |
| 805 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 806 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 807 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 808 | $(abspath $(source))\ | |
| 809 | --kObjCache-cc $(obj)\ | |
| 810 | @@ -176,7 +176,7 @@ if "$(use_objcache)" != "" | |
| 811 | - | |
| 812 | else | |
| 813 | $(QUIET)$(TOOL_GXX4MACHO_CC) -c\ | |
| 814 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 815 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 816 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 817 | -o $(obj)\ | |
| 818 | $(abspath $(source)) | |
| 819 | @@ -207,7 +207,7 @@ if "$(use_objcache)" != "" | |
| 820 | --kObjCache-cpp $(outbase).ii\ | |
| 821 | $(TOOL_GXX4MACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\ | |
| 822 | ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\ | |
| 823 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 824 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 825 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 826 | $(abspath $(source))\ | |
| 827 | --kObjCache-cc $(obj)\ | |
| 828 | @@ -217,7 +217,7 @@ if "$(use_objcache)" != "" | |
| 829 | - | |
| 830 | else | |
| 831 | $(QUIET)$(TOOL_GXX4MACHO_CXX) -c\ | |
| 832 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 833 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 834 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 835 | -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ | |
| 836 | ,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \ | |
| 837 | @@ -244,7 +244,7 @@ TOOL_GXX4MACHO_COMPILE_PCH_DEPEND = | |
| 838 | TOOL_GXX4MACHO_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR) | |
| 839 | define TOOL_GXX4MACHO_COMPILE_PCH_CMDS | |
| 840 | $(QUIET)$(TOOL_GXX4MACHO_PCH) -c\ | |
| 841 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 842 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 843 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 844 | -o $(obj)\ | |
| 845 | $(abspath $(source)) | |
| 846 | @@ -274,7 +274,7 @@ define TOOL_GXX4MACHO_COMPILE_OBJCXX_CMD | |
| 847 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 848 | --kObjCache-cpp $(outbase).mii\ | |
| 849 | $(TOOL_GXX4MACHO_OBJCXX) -E -o -\ | |
| 850 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 851 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 852 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 853 | $(abspath $(source))\ | |
| 854 | --kObjCache-cc $(obj)\ | |
| 855 | @@ -288,7 +288,7 @@ else # !KBUILD_USE_KOBJCACHE | |
| 856 | TOOL_GXX4MACHO_COMPILE_OBJCXX_OUTPUT = | |
| 857 | define TOOL_GXX4MACHO_COMPILE_OBJCXX_CMDS | |
| 858 | $(QUIET)$(TOOL_GXX4MACHO_OBJCXX) -c\ | |
| 859 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 860 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 861 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 862 | -o $(obj)\ | |
| 863 | $(abspath $(source)) | |
| 864 | @@ -315,7 +315,7 @@ TOOL_GXX4MACHO_COMPILE_AS_DEPEND = | |
| 865 | TOOL_GXX4MACHO_COMPILE_AS_DEPORD = | |
| 866 | define TOOL_GXX4MACHO_COMPILE_AS_CMDS | |
| 867 | $(QUIET)$(TOOL_GXX4MACHO_AS) -c\ | |
| 868 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 869 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 870 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 871 | -o $(obj)\ | |
| 872 | $(abspath $(source)) | |
| 873 | --- kbuild-0.1.9998svn3571+dfsg.orig/kBuild/tools/GXX64.kmk | |
| 874 | +++ kbuild-0.1.9998svn3571+dfsg/kBuild/tools/GXX64.kmk | |
| 875 | @@ -140,7 +140,7 @@ if "$(use_objcache)" != "" | |
| 876 | $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\ | |
| 877 | --kObjCache-cpp $(outbase).i\ | |
| 878 | $(TOOL_GXX64_CC) -E -o -\ | |
| 879 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 880 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 881 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 882 | $(abspath $(source))\ | |
| 883 | --kObjCache-cc $(obj)\ | |
| 884 | @@ -150,7 +150,7 @@ if "$(use_objcache)" != "" | |
| 885 | - | |
| 886 | else | |
| 887 | $(QUIET)$(TOOL_GXX64_CC) -c\ | |
| 888 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 889 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 890 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 891 | -o $(obj)\ | |
| 892 | $(abspath $(source)) | |
| 893 | @@ -181,7 +181,7 @@ if "$(use_objcache)" != "" | |
| 894 | --kObjCache-cpp $(outbase).ii\ | |
| 895 | $(TOOL_GXX64_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\ | |
| 896 | ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\ | |
| 897 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 898 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 899 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 900 | $(abspath $(source))\ | |
| 901 | --kObjCache-cc $(obj)\ | |
| 902 | @@ -191,7 +191,7 @@ if "$(use_objcache)" != "" | |
| 903 | - | |
| 904 | else | |
| 905 | $(QUIET)$(TOOL_GXX64_CXX) -c\ | |
| 906 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 907 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 908 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 909 | -o $(obj) $(if-expr defined($(target)_PCH_HDR) \ | |
| 910 | ,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \ | |
| 911 | @@ -218,7 +218,7 @@ TOOL_GXX64_COMPILE_PCH_DEPEND = | |
| 912 | TOOL_GXX64_COMPILE_PCH_DEPORD = $($(target)_1_GCC_PCH_DIR) | |
| 913 | define TOOL_GXX64_COMPILE_PCH_CMDS | |
| 914 | $(QUIET)$(TOOL_GXX64_PCH) -c\ | |
| 915 | - $(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 916 | + $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\ | |
| 917 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 918 | -o $(obj)\ | |
| 919 | $(abspath $(source)) | |
| 920 | @@ -245,7 +245,7 @@ TOOL_GXX64_COMPILE_AS_DEPEND = | |
| 921 | TOOL_GXX64_COMPILE_AS_DEPORD = | |
| 922 | define TOOL_GXX64_COMPILE_AS_CMDS | |
| 923 | $(QUIET)$(TOOL_GXX64_AS) -c\ | |
| 924 | - $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\ | |
| 925 | + $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\ | |
| 926 | -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\ | |
| 927 | -o $(obj)\ | |
| 928 | $(abspath $(source)) |