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

OptionalBuildFeatures: Specify a grist for ExtractArchive. We would otherwise

Browse Source 
get clashes between target names e.g. between the "common/include/" for OpenSSL
and the one for CLucene. Should fix #7798.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42402 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2011-07-10 15:18:52 +00:00
parent 4b48067a57
commit b5a7089a43
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalBuildFeatures
+10 -4
View File
@@ -35,7 +35,7 @@ if $(HAIKU_BUILD_FEATURE_SSL) {
# extract headers and libraries # extract headers and libraries
HAIKU_OPENSSL_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_OPENSSL_DIR) HAIKU_OPENSSL_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_OPENSSL_DIR)
: common/include/ : $(zipFile) : common/include/ : $(zipFile) : extracted-openssl
] ; ] ;
HAIKU_OPENSSL_LIBS = [ ExtractArchive $(HAIKU_OPENSSL_DIR) HAIKU_OPENSSL_LIBS = [ ExtractArchive $(HAIKU_OPENSSL_DIR)
@@ -43,6 +43,7 @@ if $(HAIKU_BUILD_FEATURE_SSL) {
common/lib/libcrypto.so common/lib/libcrypto.so
common/lib/libssl.so common/lib/libssl.so
: $(zipFile) : $(zipFile)
: extracted-openssl
] ; ] ;
HAIKU_OPENSSL_ENABLED = 1 ; HAIKU_OPENSSL_ENABLED = 1 ;
@@ -81,6 +82,7 @@ if $(TARGET_ARCH) = ppc {
libicutu.so.44.1 libicutu.so.44.1
libicuuc.so.44.1 libicuuc.so.44.1
: $(zipFile) : $(zipFile)
: extracted-icu
] ; ] ;
} else if $(TARGET_ARCH) != x86 { } else if $(TARGET_ARCH) != x86 {
Echo "ICU not available for $(TARGET_ARCH)" ; Echo "ICU not available for $(TARGET_ARCH)" ;
@@ -111,6 +113,7 @@ if $(TARGET_ARCH) = ppc {
libicutu.so.44 libicutu.so.44
libicuuc.so.44 libicuuc.so.44
: $(zipFile) : $(zipFile)
: extracted-icu
] ; ] ;
} }
@@ -123,7 +126,8 @@ HAIKU_ICU_DEVEL_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
# extract headers # extract headers
HAIKU_ICU_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_ICU_DEVEL_DIR) HAIKU_ICU_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_ICU_DEVEL_DIR)
: develop/headers/3rdparty : $(HAIKU_ICU_DEVEL_ZIP_FILE) ] ; : develop/headers/3rdparty : $(HAIKU_ICU_DEVEL_ZIP_FILE)
: extracted-icu-devel ] ;
HAIKU_ICU_HEADERS HAIKU_ICU_HEADERS
= [ FDirName $(HAIKU_ICU_DEVEL_DIR) develop headers 3rdparty ] ; = [ FDirName $(HAIKU_ICU_DEVEL_DIR) develop headers 3rdparty ] ;
@@ -156,13 +160,14 @@ if $(HAIKU_BUILD_FEATURE_CLUCENE) {
# extract headers and libraries # extract headers and libraries
HAIKU_CLUCENE_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_CLUCENE_DIR) HAIKU_CLUCENE_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_CLUCENE_DIR)
: common/include/ : $(zipFile) : common/include/ : $(zipFile) : extracted-clucene
] ; ] ;
HAIKU_CLUCENE_LIBS = [ ExtractArchive $(HAIKU_CLUCENE_DIR) HAIKU_CLUCENE_LIBS = [ ExtractArchive $(HAIKU_CLUCENE_DIR)
: :
common/lib/libclucene.a common/lib/libclucene.a
: $(zipFile) : $(zipFile)
: extracted-clucene
] ; ] ;
HAIKU_CLUCENE_HEADERS HAIKU_CLUCENE_HEADERS
@@ -198,7 +203,7 @@ if $(HAIKU_BUILD_FEATURE_TAGLIB) {
# extract headers and libraries # extract headers and libraries
HAIKU_TAGLIB_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_TAGLIB_DIR) HAIKU_TAGLIB_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_TAGLIB_DIR)
: common/include/ : $(zipFile) : common/include/ : $(zipFile) : extracted-taglib
] ; ] ;
HAIKU_TAGLIB_LIBS = [ ExtractArchive $(HAIKU_TAGLIB_DIR) HAIKU_TAGLIB_LIBS = [ ExtractArchive $(HAIKU_TAGLIB_DIR)
@@ -206,6 +211,7 @@ if $(HAIKU_BUILD_FEATURE_TAGLIB) {
common/lib/libtag.so common/lib/libtag.so
common/lib/libtag_c.so common/lib/libtag_c.so
: $(zipFile) : $(zipFile)
: extracted-taglib
] ; ] ;
HAIKU_TAGLIB_HEADERS HAIKU_TAGLIB_HEADERS