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

Update zlib, gettext, libiconv, ncurses packages

Browse Source
This commit is contained in:
Ingo Weinhold
2013-06-13 15:13:12 +02:00
parent c625c5fd36
commit c46f5969b7
3 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+4 -6
View File
@@ -810,11 +810,10 @@ if $(TARGET_ARCH) in arm ppc x86 x86_64 {
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_ZLIB_FILE = zlib-1.2.7-x86-gcc4-2012-10-30.zip ;
} else {
HAIKU_ZLIB_FILE = zlib-1.2.8-1-x86_gcc2.hpkg ;
HAIKU_ZLIB_DEVEL_FILE = zlib_devel-1.2.8-1-x86_gcc2.hpkg ;
HAIKU_ZLIB_FILE = zlib-1.2.8-2-x86_gcc2.hpkg ;
HAIKU_ZLIB_DEVEL_FILE = zlib_devel-1.2.8-2-x86_gcc2.hpkg ;
}
HAIKU_ZLIB_SOURCE_FILE = zlib_source-1.2.8-1-x86_gcc2.hpkg ;
# TODO: Wrong architecture! Should be "any".
HAIKU_ZLIB_SOURCE_FILE = zlib_source-1.2.8-2-source.hpkg ;
ExtractBuildFeatureArchives zlib :
file: base $(zlibBaseURL)/$(HAIKU_ZLIB_FILE)
@@ -824,8 +823,7 @@ if $(TARGET_ARCH) in arm ppc x86 x86_64 {
library: develop/lib/libz.so
headers: develop/headers
file: source $(zlibBaseURL)/$(HAIKU_ZLIB_SOURCE_FILE)
sources: source/zlib-1.2.8
;
sources: develop/sources/zlib-1.2.8-2/source
EnableBuildFeatures zlib ;
} else {