diff --git a/build/jam/BeOSRules b/build/jam/BeOSRules index b12bafa6b9..93c0f7ce63 100644 --- a/build/jam/BeOSRules +++ b/build/jam/BeOSRules @@ -39,7 +39,7 @@ actions CreateAttributeMetaFile actions AddFileDataAttribute1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ $(2[1]) -f $(2[3]) `cat $(2[2])` $(1) } @@ -75,7 +75,7 @@ rule AddStringDataResource actions together AddStringDataResource1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ $(2[1]) -o "$(1)" $(RESOURCE_STRINGS) } @@ -115,7 +115,7 @@ rule AddFileDataResource actions AddFileDataResource1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ $(2[1]) -o "$(1)" -a "$(RESOURCE_ID)" "$(2[2])" ; } @@ -131,8 +131,8 @@ rule XRes actions XRes1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) - $(2[1]) -o "$(1)" "$(2[2-])" ; + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ + $(2[1]) -o "$(1)" "$(2[2-])" } rule SetVersion @@ -145,8 +145,8 @@ rule SetVersion actions SetVersion1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) - $(2[1]) "$(1)" -system $(HAIKU_BUILD_VERSION) -short "$(HAIKU_BUILD_DESCRIPTION)" ; + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ + $(2[1]) "$(1)" -system $(HAIKU_BUILD_VERSION) -short "$(HAIKU_BUILD_DESCRIPTION)" } rule SetType target : type @@ -163,8 +163,8 @@ rule SetType target : type actions SetType1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) - $(2[1]) -t $(TARGET_MIME_TYPE) "$(1)" ; + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ + $(2[1]) -t $(TARGET_MIME_TYPE) "$(1)" } rule MimeSet target @@ -178,7 +178,7 @@ rule MimeSet target actions MimeSet1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ $(2[1]) -f --mimedb "$(2[2])" "$(1)" } @@ -204,7 +204,7 @@ rule CreateAppMimeDBEntries target actions CreateAppMimeDBEntries1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) appMimeDB="$(1)" $(RM) -rf "$appMimeDB" @@ -264,7 +264,7 @@ rule ResComp # considered linker scripts, and thus we can use preprocessor features. actions ResComp1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) cat "$(2[2-])" | $(CC) $(CCFLAGS) -E $(CCDEFS) $(HDRS) - \ | egrep -v '^#' | $(2[1]) $(RCHDRS) --auto-names -o "$(1)" - } @@ -305,7 +305,7 @@ rule ResAttr attributeFile : _resourceFiles : deleteAttributeFile actions ResAttr1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) if [ \\"$(deleteAttributeFile1)\\" = "true" ]; then $(RM) $(1) fi diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 076a14879b..7073f62718 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -388,7 +388,7 @@ if $(HOST_PLATFORM_HAIKU_COMPATIBLE) { } HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR - = "export \"LIBRARY_PATH=$LIBRARY_PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)\"" ; + = "LIBRARY_PATH=\"$LIBRARY_PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)\"" ; HOST_PTHREAD_LINKFLAGS = ; HOST_LIBRARY_NAME_MAP_input_server = /system/servers/input_server ; HOST_DEFINES += __STDC_FORMAT_MACROS __STDC_LIMIT_MACROS ; @@ -402,13 +402,13 @@ if $(HOST_PLATFORM_HAIKU_COMPATIBLE) { HOST_LIBSTDC++ = stdc++ ; if $(HOST_PLATFORM) = mingw { HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR - = "export PATH=$PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)" ; + = "PATH=$PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)" ; } else if $(HOST_PLATFORM) = darwin { HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR - = "export \"DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)\"" ; + = "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)\"" ; } else { HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR - = "export \"LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)\"" ; + = "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH:$(HOST_BUILD_COMPATIBILITY_LIB_DIR)\"" ; } HOST_PTHREAD_LINKFLAGS = -pthread ; @@ -450,7 +450,7 @@ if $(HAIKU_HOST_USE_XATTR) = 1 { # which invokes a build tool. If the build tool hasn't been built yet, # the normal "rm" is used and the attributes are leaked (likely there # aren't any yet). - RM = $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ";" + RM = $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) [ FDirName $(HAIKU_TOP) build scripts rm_attrs ] [ FDirName $(HAIKU_OBJECT_DIR) $(HOST_PLATFORM) $(HOST_ARCH) release tools rm_attrs ] -f ; diff --git a/build/jam/FileRules b/build/jam/FileRules index df17855767..68313e6da5 100644 --- a/build/jam/FileRules +++ b/build/jam/FileRules @@ -10,7 +10,7 @@ rule Copy actions Copy1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ "$(2[1])" -d "$(2[2-])" "$(1)" } @@ -295,7 +295,7 @@ actions ExtractTarArchive1 actions ExtractHPKGArchive1 { mkdir -p "$(1)" - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ $(2[1]) extract -C "$(1)" "$(2[2])" } @@ -355,7 +355,7 @@ rule CopySetHaikuRevision target : source actions CopySetHaikuRevision1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(2[1]) --data $(2[3]) $(1) || exit 1 @@ -422,7 +422,7 @@ rule DataFileToSourceFile sourceFile : dataFile : dataVariable : sizeVariable actions DataFileToSourceFile1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ $(2[1]) $(DATA_VARIABLE) $(SIZE_VARIABLE) $(2[2]) $(1) } @@ -594,7 +594,7 @@ rule StripFile target : source actions StripFile1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) "$(STRIP)" -o "$(1)" "$(2[1])" "$(2[2])" -o "$(1)" "$(2[1])" "$(2[3])" "$(2[1])" "$(1)" diff --git a/build/jam/KernelRules b/build/jam/KernelRules index e1077c25ed..2a72c9cab4 100644 --- a/build/jam/KernelRules +++ b/build/jam/KernelRules @@ -97,7 +97,7 @@ rule KernelSo target : source actions KernelSo1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(2[1]) --data $(2[2]) $(1) && $(HAIKU_ELFEDIT_$(TARGET_PACKAGING_ARCH)) --output-type dyn $(1) diff --git a/build/jam/LocaleRules b/build/jam/LocaleRules index 8dde3bab3d..6cc36d36ce 100644 --- a/build/jam/LocaleRules +++ b/build/jam/LocaleRules @@ -77,7 +77,7 @@ rule ExtractCatalogEntries target : sources : signature : regexp actions ExtractCatalogEntries1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(CC) -E $(CCDEFS) -DB_COLLECTING_CATKEYS $(HDRS) "$(2[2-])" > "$(1)".pre $(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE) \ -w -o "$(1)" "$(1)".pre @@ -86,7 +86,7 @@ actions ExtractCatalogEntries1 actions ExtractCatalogEntries2 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(CC) -E $(CCDEFS) -DB_COLLECTING_CATKEYS $(HDRS) "$(2[2-])" > "$(1)".pre \ || true $(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE) \ @@ -113,7 +113,7 @@ rule LinkApplicationCatalog target : sources : signature : language actions LinkApplicationCatalog1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ $(2[1]) "$(2[2-])" -l $(HAIKU_CATALOG_LANGUAGE) \ -s $(HAIKU_CATALOG_SIGNATURE) -o "$(1)" } @@ -198,6 +198,6 @@ rule AddCatalogEntryAttribute target actions AddCatalogEntryAttribute1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ "$(2)" -t string "SYS:NAME" "$(CATALOG_ENTRY)" "$(1)" } diff --git a/build/jam/MiscRules b/build/jam/MiscRules index 39936bb538..9f4613f6b4 100644 --- a/build/jam/MiscRules +++ b/build/jam/MiscRules @@ -266,7 +266,7 @@ actions RunCommandLine1 { target=${target}X eval "${target}=${t}" done - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ "$(COMMAND_LINE)" } diff --git a/build/jam/PackageRules b/build/jam/PackageRules index 2e27f73360..c00112251e 100644 --- a/build/jam/PackageRules +++ b/build/jam/PackageRules @@ -75,7 +75,7 @@ rule PreprocessPackageInfo source : directory : architecture actions UpdatePackageInfoRequires { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ "$(2[1])" "$(1)" "$(2[2])" } @@ -183,7 +183,7 @@ rule BuildHaikuPackage package : packageInfo AddVariableToScript $(script) : outputDir : $(HAIKU_OUTPUT_DIR) ; AddVariableToScript $(script) : tmpDir : $(tempDir) ; AddVariableToScript $(script) : addBuildCompatibilityLibDir - : $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ; + : "export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)" ; AddVariableToScript $(script) : compressionLevel : [ on $(package) return $(HAIKU_PACKAGE_COMPRESSION_LEVEL) ] ; AddVariableToScript $(script) : updateOnly diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules index 7ed3175a7b..3faf726eaf 100644 --- a/build/jam/RepositoryRules +++ b/build/jam/RepositoryRules @@ -256,7 +256,7 @@ actions RepositoryConfig1 if [ -n "$(2[3]:E)" ]; then version=`cat "$(2[3]:E)"` fi - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ $(2[1]) $(2[2]) $(1) } @@ -272,7 +272,7 @@ rule RepositoryCache repoCache : repoInfo : packageFiles actions RepositoryCache1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ $(2[1]) create -q $(2[2-]) mv $(1:B=repo) $(1) } @@ -362,7 +362,7 @@ actions BootstrapRepositoryFetchPackage1 cd $(HAIKU_REPOSITORY_BUILD_DIRECTORY) - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) if [ -n "$secondaryCrossDevelPackages" ]; then $(HOST_HAIKU_PORTER) -j$(HAIKU_PORTER_CONCURRENT_JOBS) \ --all-dependencies $(HAIKU_PORTER_EXTRA_OPTIONS) \ @@ -665,7 +665,7 @@ actions BuildHaikuPortsSourcePackageDirectory1 cd $(HAIKU_REPOSITORY_BUILD_DIRECTORY) - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) if [ -n "$secondaryCrossDevelPackages" ]; then $(HOST_HAIKU_PORTER) --cross-devel-package "$haikuCrossDevelPackage" \ "$secondaryCrossDevelPackages" \ @@ -763,7 +763,7 @@ rule HaikuRepository repository : repoInfoTemplate : packages local script = $(initVariablesScript) ; AddVariableToScript $(script) : addBuildCompatibilityLibDir - : $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ; + : "export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)" ; AddVariableToScript $(script) : sha256 : $(HOST_SHA256) ; AddVariableToScript $(script) : sedExtendedRegex : $(HOST_EXTENDED_REGEX_SED) ; diff --git a/build/jam/images/FloppyBootImage b/build/jam/images/FloppyBootImage index eb1215587a..1ffa2ed371 100644 --- a/build/jam/images/FloppyBootImage +++ b/build/jam/images/FloppyBootImage @@ -136,7 +136,7 @@ Always $(script) ; AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ; AddVariableToScript $(script) : addBuildCompatibilityLibDir - : $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ; + : "export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)" ; AddTargetVariableToScript $(script) : copyattr ; # create the other scripts diff --git a/build/jam/images/HaikuCD b/build/jam/images/HaikuCD index f2fef507e9..3057181e99 100644 --- a/build/jam/images/HaikuCD +++ b/build/jam/images/HaikuCD @@ -20,7 +20,7 @@ AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ; AddVariableToScript $(script) : isCD : 1 ; AddVariableToScript $(script) : cdLabel : $(HAIKU_CD_LABEL) ; AddVariableToScript $(script) : addBuildCompatibilityLibDir - : $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ; + : "export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)" ; AddTargetVariableToScript $(script) : addattr ; AddTargetVariableToScript $(script) : copyattr ; AddTargetVariableToScript $(script) : rc ; diff --git a/build/jam/images/NetBootArchive b/build/jam/images/NetBootArchive index 651d33cfc7..a4852daa0f 100644 --- a/build/jam/images/NetBootArchive +++ b/build/jam/images/NetBootArchive @@ -119,7 +119,7 @@ Always $(script) ; AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ; AddVariableToScript $(script) : addBuildCompatibilityLibDir - : $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ; + : "export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)" ; AddTargetVariableToScript $(script) : copyattr ; # create the other scripts diff --git a/build/jam/images/definitions/common-tail b/build/jam/images/definitions/common-tail index e36f089c9e..37eb605ab0 100644 --- a/build/jam/images/definitions/common-tail +++ b/build/jam/images/definitions/common-tail @@ -111,7 +111,7 @@ AddVariableToScript $(script) : installDir : $(HAIKU_INSTALL_DIR) ; AddVariableToScript $(script) : imageSize : $(HAIKU_IMAGE_SIZE) ; AddVariableToScript $(script) : imageLabel : $(HAIKU_IMAGE_LABEL) ; AddVariableToScript $(script) : addBuildCompatibilityLibDir - : $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ; + : "export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)" ; AddVariableToScript $(script) : dontClearImage : $(HAIKU_DONT_CLEAR_IMAGE) ; AddVariableToScript $(script) : updateOnly : [ IsUpdateHaikuImageOnly ] ; AddTargetVariableToScript $(script) : addattr ; diff --git a/src/data/keymaps/Jamfile b/src/data/keymaps/Jamfile index 329bb105e1..8391292434 100644 --- a/src/data/keymaps/Jamfile +++ b/src/data/keymaps/Jamfile @@ -19,8 +19,8 @@ rule MkKeymapComp actions MkKeymapComp1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) - $(2[1]) -o "$(1)" -c "$(2[2-])" ; + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ + $(2[1]) -o "$(1)" -c "$(2[2-])" } diff --git a/src/data/mime_db/Jamfile b/src/data/mime_db/Jamfile index a2bbb85647..5d85c3afa4 100644 --- a/src/data/mime_db/Jamfile +++ b/src/data/mime_db/Jamfile @@ -46,7 +46,7 @@ rule BuildMimeDB superTypes actions BuildMimeDBSuperTypes { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) # remove and re-create the directory baseDirectory="$(1)" @@ -66,7 +66,7 @@ actions BuildMimeDBSuperTypes actions BuildMimeDBSubTypes { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) resattr="$(2[1])" superType=`basename "$(2[2])" .super` diff --git a/src/servers/input/Jamfile b/src/servers/input/Jamfile index bfbf29cb0d..915445c7ca 100644 --- a/src/servers/input/Jamfile +++ b/src/servers/input/Jamfile @@ -1,6 +1,7 @@ SubDir HAIKU_TOP src servers input ; -rule MkKeymapHeader { +rule MkKeymapHeader +{ local binary = $(1) ; local source = $(2) ; @@ -12,9 +13,10 @@ rule MkKeymapHeader { LocalClean clean : $(binary) ; } -actions MkKeymapHeader1 { - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) - $(2[1]) -o "$(1)" -h "$(2[2-])" ; +actions MkKeymapHeader1 +{ + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ + $(2[1]) -o "$(1)" -h "$(2[2-])" } MkKeymapHeader [ FGristFiles SystemKeymap.h ] : US-International.keymap ; diff --git a/src/system/boot/Jamfile b/src/system/boot/Jamfile index 5a25917a61..c55e2b3293 100644 --- a/src/system/boot/Jamfile +++ b/src/system/boot/Jamfile @@ -34,7 +34,7 @@ rule BuildAoutLoader { actions BuildAoutLoader bind ELF2AOUT { rm -f $(1) - $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) + $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ $(ELF2AOUT) -o $(1) $(2) }