i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build/jam: Inline HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR where possible.

Browse Source 
The "exec" tool can only handle one command with environs set at
the beginning of the line, so now we set the ADD_BUILD_COMPAT...
in this format. This also seems to be a general performance
improvement to builds using real shells, too.

Change-Id: If4b3117651b5475039d5e8116cd3de398582290a
This commit is contained in:
Augustin Cavalier
2019-08-30 17:11:50 -04:00
parent 12eb0e5d89
commit 128781e740
16 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BeOSRules
+13 -13
View File
@@ -39,7 +39,7 @@ actions CreateAttributeMetaFile
actions AddFileDataAttribute1 actions AddFileDataAttribute1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) -f $(2[3]) `cat $(2[2])` $(1) $(2[1]) -f $(2[3]) `cat $(2[2])` $(1)
} }
@@ -75,7 +75,7 @@ rule AddStringDataResource
actions together AddStringDataResource1 actions together AddStringDataResource1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) -o "$(1)" $(RESOURCE_STRINGS) $(2[1]) -o "$(1)" $(RESOURCE_STRINGS)
} }
@@ -115,7 +115,7 @@ rule AddFileDataResource
actions AddFileDataResource1 actions AddFileDataResource1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) -o "$(1)" -a "$(RESOURCE_ID)" "$(2[2])" ; $(2[1]) -o "$(1)" -a "$(RESOURCE_ID)" "$(2[2])" ;
} }
@@ -131,8 +131,8 @@ rule XRes
actions XRes1 actions XRes1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) -o "$(1)" "$(2[2-])" ; $(2[1]) -o "$(1)" "$(2[2-])"
} }
rule SetVersion rule SetVersion
@@ -145,8 +145,8 @@ rule SetVersion
actions SetVersion1 actions SetVersion1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) "$(1)" -system $(HAIKU_BUILD_VERSION) -short "$(HAIKU_BUILD_DESCRIPTION)" ; $(2[1]) "$(1)" -system $(HAIKU_BUILD_VERSION) -short "$(HAIKU_BUILD_DESCRIPTION)"
} }
rule SetType target : type rule SetType target : type
@@ -163,8 +163,8 @@ rule SetType target : type
actions SetType1 actions SetType1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) -t $(TARGET_MIME_TYPE) "$(1)" ; $(2[1]) -t $(TARGET_MIME_TYPE) "$(1)"
} }
rule MimeSet target rule MimeSet target
@@ -178,7 +178,7 @@ rule MimeSet target
actions MimeSet1 actions MimeSet1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) -f --mimedb "$(2[2])" "$(1)" $(2[1]) -f --mimedb "$(2[2])" "$(1)"
} }
@@ -204,7 +204,7 @@ rule CreateAppMimeDBEntries target
actions CreateAppMimeDBEntries1 actions CreateAppMimeDBEntries1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
appMimeDB="$(1)" appMimeDB="$(1)"
$(RM) -rf "$appMimeDB" $(RM) -rf "$appMimeDB"
@@ -264,7 +264,7 @@ rule ResComp
# considered linker scripts, and thus we can use preprocessor features. # considered linker scripts, and thus we can use preprocessor features.
actions ResComp1 actions ResComp1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
cat "$(2[2-])" | $(CC) $(CCFLAGS) -E $(CCDEFS) $(HDRS) - \ cat "$(2[2-])" | $(CC) $(CCFLAGS) -E $(CCDEFS) $(HDRS) - \
| egrep -v '^#' | $(2[1]) $(RCHDRS) --auto-names -o "$(1)" - | egrep -v '^#' | $(2[1]) $(RCHDRS) --auto-names -o "$(1)" -
} }
@@ -305,7 +305,7 @@ rule ResAttr attributeFile : _resourceFiles : deleteAttributeFile
actions ResAttr1 actions ResAttr1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
if [ \\"$(deleteAttributeFile1)\\" = "true" ]; then if [ \\"$(deleteAttributeFile1)\\" = "true" ]; then
$(RM) $(1) $(RM) $(1)
fi fi
build/jam/BuildSetup
+5 -5
View File
@@ -388,7 +388,7 @@ if $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
} }
HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR 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_PTHREAD_LINKFLAGS = ;
HOST_LIBRARY_NAME_MAP_input_server = /system/servers/input_server ; HOST_LIBRARY_NAME_MAP_input_server = /system/servers/input_server ;
HOST_DEFINES += __STDC_FORMAT_MACROS __STDC_LIMIT_MACROS ; HOST_DEFINES += __STDC_FORMAT_MACROS __STDC_LIMIT_MACROS ;
@@ -402,13 +402,13 @@ if $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
HOST_LIBSTDC++ = stdc++ ; HOST_LIBSTDC++ = stdc++ ;
if $(HOST_PLATFORM) = mingw { if $(HOST_PLATFORM) = mingw {
HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR 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 { } else if $(HOST_PLATFORM) = darwin {
HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR 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 { } else {
HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR 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 ; 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, # 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 # the normal "rm" is used and the attributes are leaked (likely there
# aren't any yet). # 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_TOP) build scripts rm_attrs ]
[ FDirName $(HAIKU_OBJECT_DIR) $(HOST_PLATFORM) $(HOST_ARCH) release [ FDirName $(HAIKU_OBJECT_DIR) $(HOST_PLATFORM) $(HOST_ARCH) release
tools rm_attrs ] -f ; tools rm_attrs ] -f ;
build/jam/FileRules
+5 -5
View File
@@ -10,7 +10,7 @@ rule Copy
actions Copy1 actions Copy1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
"$(2[1])" -d "$(2[2-])" "$(1)" "$(2[1])" -d "$(2[2-])" "$(1)"
} }
@@ -295,7 +295,7 @@ actions ExtractTarArchive1
actions ExtractHPKGArchive1 actions ExtractHPKGArchive1
{ {
mkdir -p "$(1)" mkdir -p "$(1)"
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) extract -C "$(1)" "$(2[2])" $(2[1]) extract -C "$(1)" "$(2[2])"
} }
@@ -355,7 +355,7 @@ rule CopySetHaikuRevision target : source
actions CopySetHaikuRevision1 actions CopySetHaikuRevision1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
$(2[1]) --data $(2[3]) $(1) || exit 1 $(2[1]) --data $(2[3]) $(1) || exit 1
@@ -422,7 +422,7 @@ rule DataFileToSourceFile sourceFile : dataFile : dataVariable : sizeVariable
actions DataFileToSourceFile1 actions DataFileToSourceFile1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) $(DATA_VARIABLE) $(SIZE_VARIABLE) $(2[2]) $(1) $(2[1]) $(DATA_VARIABLE) $(SIZE_VARIABLE) $(2[2]) $(1)
} }
@@ -594,7 +594,7 @@ rule StripFile target : source
actions StripFile1 actions StripFile1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
"$(STRIP)" -o "$(1)" "$(2[1])" "$(STRIP)" -o "$(1)" "$(2[1])"
"$(2[2])" -o "$(1)" "$(2[1])" "$(2[2])" -o "$(1)" "$(2[1])"
"$(2[3])" "$(2[1])" "$(1)" "$(2[3])" "$(2[1])" "$(1)"
build/jam/KernelRules
+1 -1
View File
@@ -97,7 +97,7 @@ rule KernelSo target : source
actions KernelSo1 actions KernelSo1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
$(2[1]) --data $(2[2]) $(1) && $(2[1]) --data $(2[2]) $(1) &&
$(HAIKU_ELFEDIT_$(TARGET_PACKAGING_ARCH)) --output-type dyn $(1) $(HAIKU_ELFEDIT_$(TARGET_PACKAGING_ARCH)) --output-type dyn $(1)
build/jam/LocaleRules
+4 -4
View File
@@ -77,7 +77,7 @@ rule ExtractCatalogEntries target : sources : signature : regexp
actions ExtractCatalogEntries1 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 $(CC) -E $(CCDEFS) -DB_COLLECTING_CATKEYS $(HDRS) "$(2[2-])" > "$(1)".pre
$(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE) \ $(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE) \
-w -o "$(1)" "$(1)".pre -w -o "$(1)" "$(1)".pre
@@ -86,7 +86,7 @@ actions ExtractCatalogEntries1
actions ExtractCatalogEntries2 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 \ $(CC) -E $(CCDEFS) -DB_COLLECTING_CATKEYS $(HDRS) "$(2[2-])" > "$(1)".pre \
|| true || true
$(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE) \ $(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE) \
@@ -113,7 +113,7 @@ rule LinkApplicationCatalog target : sources : signature : language
actions LinkApplicationCatalog1 actions LinkApplicationCatalog1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) "$(2[2-])" -l $(HAIKU_CATALOG_LANGUAGE) \ $(2[1]) "$(2[2-])" -l $(HAIKU_CATALOG_LANGUAGE) \
-s $(HAIKU_CATALOG_SIGNATURE) -o "$(1)" -s $(HAIKU_CATALOG_SIGNATURE) -o "$(1)"
} }
@@ -198,6 +198,6 @@ rule AddCatalogEntryAttribute target
actions AddCatalogEntryAttribute1 actions AddCatalogEntryAttribute1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
"$(2)" -t string "SYS:NAME" "$(CATALOG_ENTRY)" "$(1)" "$(2)" -t string "SYS:NAME" "$(CATALOG_ENTRY)" "$(1)"
} }
build/jam/MiscRules
+1 -1
View File
@@ -266,7 +266,7 @@ actions RunCommandLine1 {
target=${target}X target=${target}X
eval "${target}=${t}" eval "${target}=${t}"
done done
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
"$(COMMAND_LINE)" "$(COMMAND_LINE)"
} }
build/jam/PackageRules
+2 -2
View File
@@ -75,7 +75,7 @@ rule PreprocessPackageInfo source : directory : architecture
actions UpdatePackageInfoRequires actions UpdatePackageInfoRequires
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
"$(2[1])" "$(1)" "$(2[2])" "$(2[1])" "$(1)" "$(2[2])"
} }
@@ -183,7 +183,7 @@ rule BuildHaikuPackage package : packageInfo
AddVariableToScript $(script) : outputDir : $(HAIKU_OUTPUT_DIR) ; AddVariableToScript $(script) : outputDir : $(HAIKU_OUTPUT_DIR) ;
AddVariableToScript $(script) : tmpDir : $(tempDir) ; AddVariableToScript $(script) : tmpDir : $(tempDir) ;
AddVariableToScript $(script) : addBuildCompatibilityLibDir AddVariableToScript $(script) : addBuildCompatibilityLibDir
: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ; : "export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)" ;
AddVariableToScript $(script) : compressionLevel AddVariableToScript $(script) : compressionLevel
: [ on $(package) return $(HAIKU_PACKAGE_COMPRESSION_LEVEL) ] ; : [ on $(package) return $(HAIKU_PACKAGE_COMPRESSION_LEVEL) ] ;
AddVariableToScript $(script) : updateOnly AddVariableToScript $(script) : updateOnly
build/jam/RepositoryRules
+5 -5
View File
@@ -256,7 +256,7 @@ actions RepositoryConfig1
if [ -n "$(2[3]:E)" ]; then if [ -n "$(2[3]:E)" ]; then
version=`cat "$(2[3]:E)"` version=`cat "$(2[3]:E)"`
fi fi
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) $(2[2]) $(1) $(2[1]) $(2[2]) $(1)
} }
@@ -272,7 +272,7 @@ rule RepositoryCache repoCache : repoInfo : packageFiles
actions RepositoryCache1 actions RepositoryCache1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) create -q $(2[2-]) $(2[1]) create -q $(2[2-])
mv $(1:B=repo) $(1) mv $(1:B=repo) $(1)
} }
@@ -362,7 +362,7 @@ actions BootstrapRepositoryFetchPackage1
cd $(HAIKU_REPOSITORY_BUILD_DIRECTORY) cd $(HAIKU_REPOSITORY_BUILD_DIRECTORY)
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
if [ -n "$secondaryCrossDevelPackages" ]; then if [ -n "$secondaryCrossDevelPackages" ]; then
$(HOST_HAIKU_PORTER) -j$(HAIKU_PORTER_CONCURRENT_JOBS) \ $(HOST_HAIKU_PORTER) -j$(HAIKU_PORTER_CONCURRENT_JOBS) \
--all-dependencies $(HAIKU_PORTER_EXTRA_OPTIONS) \ --all-dependencies $(HAIKU_PORTER_EXTRA_OPTIONS) \
@@ -665,7 +665,7 @@ actions BuildHaikuPortsSourcePackageDirectory1
cd $(HAIKU_REPOSITORY_BUILD_DIRECTORY) cd $(HAIKU_REPOSITORY_BUILD_DIRECTORY)
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
if [ -n "$secondaryCrossDevelPackages" ]; then if [ -n "$secondaryCrossDevelPackages" ]; then
$(HOST_HAIKU_PORTER) --cross-devel-package "$haikuCrossDevelPackage" \ $(HOST_HAIKU_PORTER) --cross-devel-package "$haikuCrossDevelPackage" \
"$secondaryCrossDevelPackages" \ "$secondaryCrossDevelPackages" \
@@ -763,7 +763,7 @@ rule HaikuRepository repository : repoInfoTemplate : packages
local script = $(initVariablesScript) ; local script = $(initVariablesScript) ;
AddVariableToScript $(script) : addBuildCompatibilityLibDir AddVariableToScript $(script) : addBuildCompatibilityLibDir
: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ; : "export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)" ;
AddVariableToScript $(script) : sha256 : $(HOST_SHA256) ; AddVariableToScript $(script) : sha256 : $(HOST_SHA256) ;
AddVariableToScript $(script) : sedExtendedRegex AddVariableToScript $(script) : sedExtendedRegex
: $(HOST_EXTENDED_REGEX_SED) ; : $(HOST_EXTENDED_REGEX_SED) ;
build/jam/images/FloppyBootImage
+1 -1
View File
@@ -136,7 +136,7 @@ Always $(script) ;
AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ; AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
AddVariableToScript $(script) : addBuildCompatibilityLibDir AddVariableToScript $(script) : addBuildCompatibilityLibDir
: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ; : "export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)" ;
AddTargetVariableToScript $(script) : <build>copyattr ; AddTargetVariableToScript $(script) : <build>copyattr ;
# create the other scripts # create the other scripts
build/jam/images/HaikuCD
+1 -1
View File
@@ -20,7 +20,7 @@ AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
AddVariableToScript $(script) : isCD : 1 ; AddVariableToScript $(script) : isCD : 1 ;
AddVariableToScript $(script) : cdLabel : $(HAIKU_CD_LABEL) ; AddVariableToScript $(script) : cdLabel : $(HAIKU_CD_LABEL) ;
AddVariableToScript $(script) : addBuildCompatibilityLibDir AddVariableToScript $(script) : addBuildCompatibilityLibDir
: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ; : "export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)" ;
AddTargetVariableToScript $(script) : <build>addattr ; AddTargetVariableToScript $(script) : <build>addattr ;
AddTargetVariableToScript $(script) : <build>copyattr ; AddTargetVariableToScript $(script) : <build>copyattr ;
AddTargetVariableToScript $(script) : <build>rc ; AddTargetVariableToScript $(script) : <build>rc ;
build/jam/images/NetBootArchive
+1 -1
View File
@@ -119,7 +119,7 @@ Always $(script) ;
AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ; AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
AddVariableToScript $(script) : addBuildCompatibilityLibDir AddVariableToScript $(script) : addBuildCompatibilityLibDir
: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ; : "export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)" ;
AddTargetVariableToScript $(script) : <build>copyattr ; AddTargetVariableToScript $(script) : <build>copyattr ;
# create the other scripts # create the other scripts
build/jam/images/definitions/common-tail
+1 -1
View File
@@ -111,7 +111,7 @@ AddVariableToScript $(script) : installDir : $(HAIKU_INSTALL_DIR) ;
AddVariableToScript $(script) : imageSize : $(HAIKU_IMAGE_SIZE) ; AddVariableToScript $(script) : imageSize : $(HAIKU_IMAGE_SIZE) ;
AddVariableToScript $(script) : imageLabel : $(HAIKU_IMAGE_LABEL) ; AddVariableToScript $(script) : imageLabel : $(HAIKU_IMAGE_LABEL) ;
AddVariableToScript $(script) : addBuildCompatibilityLibDir 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) : dontClearImage : $(HAIKU_DONT_CLEAR_IMAGE) ;
AddVariableToScript $(script) : updateOnly : [ IsUpdateHaikuImageOnly ] ; AddVariableToScript $(script) : updateOnly : [ IsUpdateHaikuImageOnly ] ;
AddTargetVariableToScript $(script) : <build>addattr ; AddTargetVariableToScript $(script) : <build>addattr ;
src/data/keymaps/Jamfile
+2 -2
View File
@@ -19,8 +19,8 @@ rule MkKeymapComp
actions MkKeymapComp1 actions MkKeymapComp1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) -o "$(1)" -c "$(2[2-])" ; $(2[1]) -o "$(1)" -c "$(2[2-])"
} }
src/data/mime_db/Jamfile
+2 -2
View File
@@ -46,7 +46,7 @@ rule BuildMimeDB superTypes
actions BuildMimeDBSuperTypes actions BuildMimeDBSuperTypes
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
# remove and re-create the directory # remove and re-create the directory
baseDirectory="$(1)" baseDirectory="$(1)"
@@ -66,7 +66,7 @@ actions BuildMimeDBSuperTypes
actions BuildMimeDBSubTypes actions BuildMimeDBSubTypes
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
resattr="$(2[1])" resattr="$(2[1])"
superType=`basename "$(2[2])" .super` superType=`basename "$(2[2])" .super`
src/servers/input/Jamfile
+6 -4
View File
@@ -1,6 +1,7 @@
SubDir HAIKU_TOP src servers input ; SubDir HAIKU_TOP src servers input ;
rule MkKeymapHeader { rule MkKeymapHeader
{
local binary = $(1) ; local binary = $(1) ;
local source = $(2) ; local source = $(2) ;
@@ -12,9 +13,10 @@ rule MkKeymapHeader {
LocalClean clean : $(binary) ; LocalClean clean : $(binary) ;
} }
actions MkKeymapHeader1 { actions MkKeymapHeader1
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) {
$(2[1]) -o "$(1)" -h "$(2[2-])" ; $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) -o "$(1)" -h "$(2[2-])"
} }
MkKeymapHeader [ FGristFiles SystemKeymap.h ] : US-International.keymap ; MkKeymapHeader [ FGristFiles SystemKeymap.h ] : US-International.keymap ;
src/system/boot/Jamfile
+1 -1
View File
@@ -34,7 +34,7 @@ rule BuildAoutLoader {
actions BuildAoutLoader bind ELF2AOUT { actions BuildAoutLoader bind ELF2AOUT {
rm -f $(1) rm -f $(1)
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(ELF2AOUT) -o $(1) $(2) $(ELF2AOUT) -o $(1) $(2)
} }