Ticket #3743: cross-build-tools-yasm.diff
| File cross-build-tools-yasm.diff, 4.7 KB (added by , 15 years ago) |
|---|
-
build/jam/OptionalPackageDependencies
2 2 3 3 OptionalPackageDependencies APR-util : APR ; 4 4 OptionalPackageDependencies BeHappy : BeBook NetSurf ; 5 OptionalPackageDependencies Development : Perl ;5 OptionalPackageDependencies Development : Perl Yasm ; 6 6 OptionalPackageDependencies LibLayout : Development ; 7 7 OptionalPackageDependencies NetSurf : OpenSSL ; 8 8 OptionalPackageDependencies OpenSSH : OpenSSL ; -
build/jam/MainBuildRules
175 175 actions AssembleNasm 176 176 { 177 177 if test $(ASFLAGS) ; then 178 yasm-d $(ASFLAGS) -f elf32 -o $(1) $(2);178 $(HAIKU_YASM) -d $(ASFLAGS) -f elf32 -o $(1) $(2); 179 179 else 180 yasm-f elf32 -o $(1) $(2);180 $(HAIKU_YASM) -f elf32 -o $(1) $(2); 181 181 fi 182 182 } 183 183 -
build/scripts/build_cross_tools
50 50 # create the object and installation directories for the cross compilation tools 51 51 installDir=$haikuOutputDir/cross-tools 52 52 objDir=$haikuOutputDir/cross-tools-build 53 yasmObjDir=$objDir/yasm 53 54 binutilsObjDir=$objDir/binutils 54 55 gccObjDir=$objDir/gcc 55 56 tmpIncludeDir=$objDir/sysincludes … … 57 58 58 59 rm -rf $installDir $objDir 59 60 60 mkdir -p $installDir $objDir $ binutilsObjDir $gccObjDir $tmpIncludeDir \61 $tmp LibDir || exit 161 mkdir -p $installDir $objDir $yasmObjDir $binutilsObjDir $gccObjDir \ 62 $tmpIncludeDir $tmpLibDir || exit 1 62 63 mkdir -p $installDir/lib/gcc-lib/i586-pc-haiku/$haikuRequiredLegacyGCCVersion 63 64 65 # build yasm 66 cd $yasmObjDir 67 $buildToolsDir/../yasm/configure --prefix=$installDir \ 68 --program-prefix=i586-pc-haiku- || exit 1 69 make || exit 1 70 make install || exit 1 71 64 72 # build binutils 65 73 cd $binutilsObjDir 66 74 CFLAGS="-O2" CXXFLAGS="-O2" $buildToolsDir/binutils/configure \ -
build/scripts/build_cross_tools_gcc4
57 57 cd $haikuOutputDir 58 58 haikuOutputDir=$(pwd) 59 59 60 yasmSourceDir=$buildToolsDir/yasm 61 60 62 binutilsSourceDir=$buildToolsDir/binutils 61 63 gccSourceDir=$buildToolsDir/gcc 62 64 … … 73 75 # create the object and installation directories for the cross compilation tools 74 76 installDir=$haikuOutputDir/cross-tools 75 77 objDir=$haikuOutputDir/cross-tools-build 78 yasmObjDir=$objDir/yasm 76 79 binutilsObjDir=$objDir/binutils 77 80 gccObjDir=$objDir/gcc 78 81 tmpIncludeDir=$objDir/sysincludes … … 80 83 81 84 rm -rf $installDir $objDir 82 85 83 mkdir -p $installDir $objDir $ binutilsObjDir $gccObjDir $tmpIncludeDir \84 $tmp LibDir || exit 186 mkdir -p $installDir $objDir $yasmObjDir $binutilsObjDir $gccObjDir \ 87 $tmpIncludeDir $tmpLibDir || exit 1 85 88 mkdir -p $installDir/lib/gcc/$haikuMachine/$gccVersion 86 89 90 # build yasm 91 cd $yasmObjDir 92 $yasmSourceDir/configure --prefix=$installDir \ 93 --program-prefix=$haikuMachine- 94 $MAKE || exit 1 95 $MAKE install || exit 1 87 96 88 97 # build binutils 89 98 cd $binutilsObjDir -
configure
75 75 HAIKU_LD The linker. Defaults to "ld". 76 76 HAIKU_OBJCOPY The objcopy to be used. Defaults to "objcopy". 77 77 HAIKU_RANLIB The static library indexer. Defaults to "ranlib". 78 HAIKU_YASM The yasm assembler. Defaults to "yasm". 78 79 HAIKU_CPPFLAGS The preprocessor flags. Defaults to "". 79 80 HAIKU_CCFLAGS The C flags. Defaults to "". 80 81 HAIKU_CXXFLAGS The C++ flags. Defaults to "". … … 279 280 set_default_value HAIKU_LD ld 280 281 set_default_value HAIKU_OBJCOPY objcopy 281 282 set_default_value HAIKU_RANLIB ranlib 283 set_default_value HAIKU_YASM yasm 282 284 set_default_value HAIKU_CPPFLAGS "" 283 285 set_default_value HAIKU_CCFLAGS "" 284 286 set_default_value HAIKU_CXXFLAGS "" … … 403 405 get_build_tool_path LD ld 404 406 get_build_tool_path OBJCOPY objcopy 405 407 get_build_tool_path RANLIB ranlib 408 get_build_tool_path YASM yasm 406 409 fi 407 410 408 411 # prepare gcc settings … … 457 460 HAIKU_LD ?= ${HAIKU_LD} ; 458 461 HAIKU_OBJCOPY ?= ${HAIKU_OBJCOPY} ; 459 462 HAIKU_RANLIB ?= ${HAIKU_RANLIB} ; 463 HAIKU_YASM ?= ${HAIKU_YASM} ; 460 464 HAIKU_CPPFLAGS ?= ${HAIKU_CPPFLAGS} ; 461 465 HAIKU_CCFLAGS ?= ${HAIKU_CCFLAGS} ; 462 466 HAIKU_CXXFLAGS ?= ${HAIKU_CXXFLAGS} ;
