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

Fix gcc2 and ICU optional packages

Browse Source 
* InstallOptionalHaikuImagePackage: In case of hpkg packages, copy them
  to the target directory, instead of extracting them.
* Correct gcc 2 package download URL.
* The ICU gcc 2 optional packages has been repackaged as hpkg. Use that.
  For gcc 4 things are broken, now.
This commit is contained in:
Ingo Weinhold
2011-07-17 16:54:19 +02:00
parent f724ec0e1e
commit fdc30d62ce
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ImageRules
+4 -1
View File
@@ -900,7 +900,10 @@ rule InstallOptionalHaikuImagePackage package : url : dirTokens : isCDPackage
# download archive file # download archive file
local archiveFile = [ DownloadFile $(package) : $(url) ] ; local archiveFile = [ DownloadFile $(package) : $(url) ] ;
if ( $(isCDPackage) = true || $(isCDPackage) = 1 ) && $(HAIKU_CD_NAME) { if $(package:S) = .hpkg {
AddFilesToHaikuImage $(dirTokens) : $(archiveFile) ;
} else if ( $(isCDPackage) = true || $(isCDPackage) = 1 )
&& $(HAIKU_CD_NAME) {
# TODO: If HAIKU_CD_NAME is set, that doesn't mean we're building a CD # TODO: If HAIKU_CD_NAME is set, that doesn't mean we're building a CD
# image! # image!
# copy onto image # copy onto image
build/jam/OptionalBuildFeatures
+14 -12
View File
@@ -56,8 +56,9 @@ if $(HAIKU_BUILD_FEATURE_SSL) {
# ICU # ICU
# Note ICU isn't actually optional, but is still an external package # Note ICU isn't actually optional, but is still an external package
HAIKU_ICU_GCC_2_PACKAGE = icu-4.4.1-r1a3-x86-gcc2-2011-05-29.zip ; HAIKU_ICU_GCC_2_PACKAGE = icu-4.4.1-r1a3-x86-gcc2-2011-05-29.hpkg ;
HAIKU_ICU_GCC_4_PACKAGE = icu-4.4.1-r1a3-x86-gcc4-2011-05-29.zip ; HAIKU_ICU_GCC_4_PACKAGE = icu-4.4.1-r1a3-x86-gcc4-2011-05-29.zip ;
# TODO: Make hpkg!
HAIKU_ICU_PPC_PACKAGE = icu-4.4.1-ppc-2010-08-17.zip ; HAIKU_ICU_PPC_PACKAGE = icu-4.4.1-ppc-2010-08-17.zip ;
HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.4.1-2010-07-26.zip ; HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.4.1-2010-07-26.zip ;
@@ -94,25 +95,25 @@ if $(TARGET_ARCH) = ppc {
icu_package = $(HAIKU_ICU_GCC_4_PACKAGE) ; icu_package = $(HAIKU_ICU_GCC_4_PACKAGE) ;
} }
local zipFile = [ DownloadFile $(icu_package) local packageFile = [ DownloadFile $(icu_package)
: $(baseURL)/$(icu_package) ] ; : $(hpkgBaseURL)/$(icu_package) ] ;
# zip file and output directory # zip file and output directory
HAIKU_ICU_ZIP_FILE = $(zipFile) ; HAIKU_ICU_PACKAGE_FILE = $(packageFile) ;
HAIKU_ICU_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR) HAIKU_ICU_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
$(icu_package:B) ] ; $(icu_package:B) ] ;
# extract libraries # extract libraries
HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR) HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR)
: :
libicudata.so.44 lib/libicudata.so.44
libicui18n.so.44 lib/libicui18n.so.44
libicuio.so.44 lib/libicuio.so.44
libicule.so.44 lib/libicule.so.44
libiculx.so.44 lib/libiculx.so.44
libicutu.so.44 lib/libicutu.so.44
libicuuc.so.44 lib/libicuuc.so.44
: $(zipFile) : $(packageFile)
: extracted-icu : extracted-icu
] ; ] ;
} }
@@ -142,6 +143,7 @@ if [ IsOptionalHaikuImagePackageAdded CLucene ] {
} }
local baseURL = http://haiku-files.org/files/optional-packages ; local baseURL = http://haiku-files.org/files/optional-packages ;
local hpkgBaseURL = http://haiku-files.org/files/hpkg ;
HAIKU_CLUCENE_PACKAGE = clucene-0.9.21-x86-gcc4-haiku-2009-08-11.zip ; HAIKU_CLUCENE_PACKAGE = clucene-0.9.21-x86-gcc4-haiku-2009-08-11.zip ;
HAIKU_CLUCENE_URL = $(baseURL)/$(HAIKU_CLUCENE_PACKAGE) ; HAIKU_CLUCENE_URL = $(baseURL)/$(HAIKU_CLUCENE_PACKAGE) ;
build/jam/OptionalPackages
+4 -3
View File
@@ -86,6 +86,7 @@
# Yasm - the assembler utility # Yasm - the assembler utility
local baseURL = http://haiku-files.org/files/optional-packages ; local baseURL = http://haiku-files.org/files/optional-packages ;
local hpkgBaseURL = http://haiku-files.org/files/hpkg ;
local baseSourceURL = http://haiku-files.org/files/sources ; local baseSourceURL = http://haiku-files.org/files/sources ;
# ABI-compliance-checker # ABI-compliance-checker
@@ -515,7 +516,7 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
# gcc and binutils # gcc and binutils
if $(HAIKU_GCC_VERSION[1]) = 2 { if $(HAIKU_GCC_VERSION[1]) = 2 {
InstallCommonPackage gcc-2.95.3_110304-1.hpkg InstallCommonPackage gcc-2.95.3_110304-1.hpkg
: $(baseURL)/gcc-2.95.3_110304.hpkg ; : $(hpkgBaseURL)/gcc-2.95.3_110304-1.hpkg ;
# TODO: remove this when we have a mechanism to switch gcc via PATH # TODO: remove this when we have a mechanism to switch gcc via PATH
AddSymlinkToHaikuImage common settings develop tools AddSymlinkToHaikuImage common settings develop tools
@@ -856,8 +857,8 @@ if [ IsOptionalHaikuImagePackageAdded ICU ] {
if $(HAIKU_GCC_VERSION[1]) = 2 { if $(HAIKU_GCC_VERSION[1]) = 2 {
# unzip gcc2 # unzip gcc2
InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_2_PACKAGE) InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_2_PACKAGE)
: $(baseURL)/$(HAIKU_ICU_GCC_2_PACKAGE) : $(hpkgBaseURL)/$(HAIKU_ICU_GCC_2_PACKAGE)
: system lib ; : system packages ;
} else { } else {
# unzip gcc4 # unzip gcc4
InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_4_PACKAGE) InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_4_PACKAGE)