From 98a0dd5fd86042f9c736e26d3e3637953fe177a2 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 1 May 2013 02:02:56 +0200 Subject: [PATCH] Update ICU packages We extract both packages to the same directory now, since the icu_devel package depends on the base package and contains relative symlinks to the libraries. ATM that isn't really relevant, since we link directly against the libraries from the base package, but we might want to change that eventually. --- build/jam/OptionalBuildFeatures | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index cffb52519c..e3e6df03fb 100644 --- a/build/jam/OptionalBuildFeatures +++ b/build/jam/OptionalBuildFeatures @@ -57,11 +57,12 @@ if $(HAIKU_BUILD_FEATURE_SSL) { # ICU # Note ICU isn't actually optional, but is still an external package -HAIKU_ICU_GCC_2_PACKAGE = icu-4.8.1.1-1-x86_gcc2.hpkg ; +HAIKU_ICU_GCC_2_PACKAGE = icu-4.8.1.1-2-x86_gcc2.hpkg ; HAIKU_ICU_GCC_4_PACKAGE = icu-4.8.1-x86-gcc4-2011-11-02.zip ; # TODO: Make hpkg! HAIKU_ICU_PPC_PACKAGE = icu-4.8.1-ppc-2011-08-20.zip ; -HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1-1-any.hpkg ; +HAIKU_ICU_DEVEL_PACKAGE = icu_devel-4.8.1.1-2-x86_gcc2.hpkg ; + # TODO: The devel package is no longer architecture independent! if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 { local icu_package ; @@ -117,16 +118,18 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 { # zip file and output directory HAIKU_ICU_DEVEL_ZIP_FILE = [ DownloadFile $(HAIKU_ICU_DEVEL_PACKAGE) : $(hpkgBaseURL)/$(HAIKU_ICU_DEVEL_PACKAGE) ] ; -HAIKU_ICU_DEVEL_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR) - $(HAIKU_ICU_DEVEL_PACKAGE:B) ] ; +HAIKU_ICU_DEVEL_DIR = $(HAIKU_ICU_DIR) ; # extract headers -HAIKU_ICU_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_ICU_DEVEL_DIR) - : develop/headers/3rdparty : $(HAIKU_ICU_DEVEL_ZIP_FILE) +HAIKU_ICU_HEADERS_DEPENDENCY = [ ExtractArchive + $(HAIKU_ICU_DEVEL_DIR:G=icu_devel) + # We need a grist here, so it's a different target than the one for the + # main package, even though it's the same directory. + : develop/headers : $(HAIKU_ICU_DEVEL_ZIP_FILE) : extracted-icu-devel ] ; HAIKU_ICU_HEADERS - = [ FDirName $(HAIKU_ICU_DEVEL_DIR) develop headers 3rdparty ] ; + = [ FDirName $(HAIKU_ICU_DEVEL_DIR) develop headers ] ; # CLucene