From 430fc0e90cb53830a39e2b87aa3ac871a68fcad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 5 Jan 2012 03:26:59 +0100 Subject: [PATCH] Fix build for !x86 && !ppc At least this should fix other platform builds to the point they worked before. The ICU_DEVEL zip name assign was moved inside the if block, making it empty for other archs, and ExtractArchive was of course having issues with this. So I moved the rest inside the if block as well. Should fix at least kernel builds. --- build/jam/OptionalBuildFeatures | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index 4724b0c00b..d2b50904b2 100644 --- a/build/jam/OptionalBuildFeatures +++ b/build/jam/OptionalBuildFeatures @@ -108,26 +108,25 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 { : extracted-icu ] ; } + + # zip file and output directory + HAIKU_ICU_DEVEL_ZIP_FILE = [ DownloadFile $(HAIKU_ICU_DEVEL_PACKAGE) + : $(baseURL)/$(HAIKU_ICU_DEVEL_PACKAGE) ] ; + HAIKU_ICU_DEVEL_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR) + $(HAIKU_ICU_DEVEL_PACKAGE:B) ] ; + + # extract headers + HAIKU_ICU_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_ICU_DEVEL_DIR) + : develop/headers/3rdparty : $(HAIKU_ICU_DEVEL_ZIP_FILE) + : extracted-icu-devel ] ; + + HAIKU_ICU_HEADERS + = [ FDirName $(HAIKU_ICU_DEVEL_DIR) develop headers 3rdparty ] ; } else { Echo "ICU not available for $(TARGET_ARCH)" ; } -# zip file and output directory -HAIKU_ICU_DEVEL_ZIP_FILE = [ DownloadFile $(HAIKU_ICU_DEVEL_PACKAGE) - : $(baseURL)/$(HAIKU_ICU_DEVEL_PACKAGE) ] ; -HAIKU_ICU_DEVEL_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR) - $(HAIKU_ICU_DEVEL_PACKAGE:B) ] ; - -# extract headers -HAIKU_ICU_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_ICU_DEVEL_DIR) - : develop/headers/3rdparty : $(HAIKU_ICU_DEVEL_ZIP_FILE) - : extracted-icu-devel ] ; - -HAIKU_ICU_HEADERS - = [ FDirName $(HAIKU_ICU_DEVEL_DIR) develop headers 3rdparty ] ; - - # CLucene # Automatically install the CLucene feature, when the optional CLucene optional