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

Added missing libbsd.so and a bunch of optional packages for x86_64 from scottmc.

Browse Source
This commit is contained in:
Alex Smith
2012-12-08 12:49:15 +00:00
parent 6993d26c7a
commit abe053eb03
2 changed files with 56 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/Haiku64Image
+2 -2
View File
@@ -47,8 +47,8 @@ SYSTEM_PREFERENCES = Appearance Backgrounds <preference>Deskbar FileTypes
SYSTEM_DEMOS = Sudoku ; SYSTEM_DEMOS = Sudoku ;
SYSTEM_LIBS = libbe.so libbnetapi.so libdebug.so libmedia.so libnetwork.so SYSTEM_LIBS = libbe.so libbsd.so libbnetapi.so libdebug.so libmedia.so
<revisioned>libroot.so libroot-addon-icu.so libnetwork.so <revisioned>libroot.so libroot-addon-icu.so
libtextencoding.so libtiff.so libtracker.so libtranslation.so libtextencoding.so libtiff.so libtracker.so libtranslation.so
$(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++) $(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
; ;
build/jam/OptionalPackages
+42 -16
View File
@@ -531,9 +531,7 @@ if [ IsOptionalHaikuImagePackageAdded Colors! ] {
# Ctags # Ctags
if [ IsOptionalHaikuImagePackageAdded Ctags ] { if [ IsOptionalHaikuImagePackageAdded Ctags ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) = x86 {
Echo "No optional package Ctags available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
ctags-5.8-r1a4-x86-gcc4-2012-08-30.zip ctags-5.8-r1a4-x86-gcc4-2012-08-30.zip
@@ -545,6 +543,13 @@ if [ IsOptionalHaikuImagePackageAdded Ctags ] {
: $(baseURL)/ctags-5.8-r1a4-x86-gcc2-2012-09-03.zip : $(baseURL)/ctags-5.8-r1a4-x86-gcc2-2012-09-03.zip
: : true ; : : true ;
} }
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
ctags-5.8-x86_64-2012-12-08.zip
: $(baseURL)/ctags-5.8-x86_64-2012-12-08.zip
: : true ;
} else {
Echo "No optional package Ctags available for $(TARGET_ARCH)" ;
} }
} }
@@ -996,9 +1001,7 @@ if [ IsOptionalHaikuImagePackageAdded Droid ] {
# Expat # Expat
if [ IsOptionalHaikuImagePackageAdded Expat ] { if [ IsOptionalHaikuImagePackageAdded Expat ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) = x86 {
Echo "No optional package Expat available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
expat-2.0.1-r1a4-x86-gcc4-2012-08-30.zip expat-2.0.1-r1a4-x86-gcc4-2012-08-30.zip
@@ -1010,6 +1013,13 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] {
: $(baseURL)/expat-2.0.1-r1a4-x86-gcc2-2012-08-28.zip : $(baseURL)/expat-2.0.1-r1a4-x86-gcc2-2012-08-28.zip
: : true ; : : true ;
} }
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
expat-2.0.1-x86_64-2012-12-08.zip
: $(baseURL)/expat-2.0.1-x86_64-2012-12-08.zip
: : true ;
} else {
Echo "No optional package Expat available for $(TARGET_ARCH)" ;
} }
} }
@@ -1334,9 +1344,7 @@ if [ IsOptionalHaikuImagePackageAdded Libmng ] {
# LibXML2 # LibXML2
if [ IsOptionalHaikuImagePackageAdded LibXML2 ] { if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) = x86 {
Echo "No optional package LibXML2 available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
libxml2-2.8.0-r1a4-x86-gcc4-2012-08-28.zip libxml2-2.8.0-r1a4-x86-gcc4-2012-08-28.zip
@@ -1346,6 +1354,12 @@ if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
libxml2-2.8.0-r1a4-x86-gcc2-2012-08-30.zip libxml2-2.8.0-r1a4-x86-gcc2-2012-08-30.zip
: $(baseURL)/libxml2-2.8.0-r1a4-x86-gcc2-2012-08-30.zip ; : $(baseURL)/libxml2-2.8.0-r1a4-x86-gcc2-2012-08-30.zip ;
} }
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
libxml2-2.8.0-x86_64-2012-12-08.zip
: $(baseURL)/libxml2-2.8.0-x86_64-2012-12-08.zip ;
} else {
Echo "No optional package LibXML2 available for $(TARGET_ARCH)" ;
} }
} }
@@ -1622,9 +1636,8 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
# P7zip # P7zip
if [ IsOptionalHaikuImagePackageAdded P7zip ] { if [ IsOptionalHaikuImagePackageAdded P7zip ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
Echo "No optional package P7zip available for $(TARGET_ARCH)" ; if $(TARGET_ARCH) = x86 {
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
p7zip-9.20.1-r1a4-x86-gcc4-2012-08-30.zip p7zip-9.20.1-r1a4-x86-gcc4-2012-08-30.zip
@@ -1634,11 +1647,18 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] {
p7zip-9.20.1-r1a4-x86-gcc2-2012-08-29.zip p7zip-9.20.1-r1a4-x86-gcc2-2012-08-29.zip
: $(baseURL)/p7zip-9.20.1-r1a4-x86-gcc2-2012-08-29.zip ; : $(baseURL)/p7zip-9.20.1-r1a4-x86-gcc2-2012-08-29.zip ;
} }
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
p7zip-9.20.1-x86_64-2012-12-08.zip
: $(baseURL)/p7zip-9.20.1-x86_64-2012-12-08.zip ;
}
AddExpanderRuleToHaikuImage "application/x-7z-compressed" : .7z AddExpanderRuleToHaikuImage "application/x-7z-compressed" : .7z
: "7za l \\0045s" : "7za l \\0045s"
: "7za x -y \\0045s" : "7za x -y \\0045s"
; ;
} else {
Echo "No optional package P7zip available for $(TARGET_ARCH)" ;
} }
} }
@@ -2205,9 +2225,8 @@ if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] {
# Yasm # Yasm
if [ IsOptionalHaikuImagePackageAdded Yasm ] { if [ IsOptionalHaikuImagePackageAdded Yasm ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) = x86 {
Echo "No optional package Yasm available for $(TARGET_ARCH)" ; if $(HAIKU_GCC_VERSION[1]) >= 4 {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
yasm-1.2.0-r1a4-x86-gcc4-2012-08-29.zip yasm-1.2.0-r1a4-x86-gcc4-2012-08-29.zip
: $(baseURL)/yasm-1.2.0-r1a4-x86-gcc4-2012-08-29.zip ; : $(baseURL)/yasm-1.2.0-r1a4-x86-gcc4-2012-08-29.zip ;
@@ -2216,4 +2235,11 @@ if [ IsOptionalHaikuImagePackageAdded Yasm ] {
yasm-1.2.0-r1a4-x86-gcc2-2012-08-27.zip yasm-1.2.0-r1a4-x86-gcc2-2012-08-27.zip
: $(baseURL)/yasm-1.2.0-r1a4-x86-gcc2-2012-08-27.zip ; : $(baseURL)/yasm-1.2.0-r1a4-x86-gcc2-2012-08-27.zip ;
} }
} else if $(TARGET_ARCH) = x86_64 {
InstallOptionalHaikuImagePackage
yasm-1.2.0-x86_64-2012-12-08.zip
: $(baseURL)/yasm-1.2.0-x86_64-2012-12-08.zip ;
} else {
Echo "No optional package Yasm available for $(TARGET_ARCH)" ;
}
} }