* Merged weak-symbols branch.
* Fixed trivial merge conflict in src/system/libroot/posix/locale/nl_langinfo.cpp * Fixed gcc 2 compilation of src/system/glue/init_term_dyn.c. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39571 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
@@ -11,8 +11,13 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
|
||||
HAIKU_BUILD_FEATURE_SSL = 1 ;
|
||||
}
|
||||
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
HAIKU_OPENSSL_PACKAGE = openssl-1.0.0a-x86-gcc4-2010-11-12.zip ;
|
||||
} else {
|
||||
HAIKU_OPENSSL_PACKAGE = openssl-1.0.0a-x86-gcc2-2010-08-29.zip ;
|
||||
}
|
||||
|
||||
local baseURL = http://haiku-files.org/files/optional-packages ;
|
||||
HAIKU_OPENSSL_PACKAGE = openssl-1.0.0a-x86-gcc2-2010-08-29.zip ;
|
||||
HAIKU_OPENSSL_URL = $(baseURL)/$(HAIKU_OPENSSL_PACKAGE) ;
|
||||
|
||||
if $(HAIKU_BUILD_FEATURE_SSL) {
|
||||
|
||||
+254
-159
@@ -113,12 +113,14 @@ if [ IsOptionalHaikuImagePackageAdded ABI-compliance-checker ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded APR ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package APR available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage apr-1.4.2-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/apr-1.4.2-x86-gcc4-2010-11-12.zip
|
||||
: : true ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage apr-1.4.2-x86-gcc2-2010-10-13.zip
|
||||
: $(baseURL)/apr-1.4.2-x86-gcc2-2010-10-13.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
: : true ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,13 +129,14 @@ if [ IsOptionalHaikuImagePackageAdded APR ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded APR-util ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package APR-util available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage apr-util-1.3.10-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/apr-util-1.3.10-x86-gcc4-2010-11-12.zip
|
||||
: : true ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
apr-util-1.3.10-x86-gcc2-2010-10-13.zip
|
||||
InstallOptionalHaikuImagePackage apr-util-1.3.10-x86-gcc2-2010-10-13.zip
|
||||
: $(baseURL)/apr-util-1.3.10-x86-gcc2-2010-10-13.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
: : true ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -391,12 +394,12 @@ if [ IsOptionalHaikuImagePackageAdded CCache ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded CDRecord ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package CDRecord available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage cdrtools-3.00-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/cdrtools-3.00-x86-gcc4-2010-11-12.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
cdrtools-3.00-x86-gcc2-2010-08-25-1.zip
|
||||
: $(baseURL)/cdrtools-3.00-x86-gcc2-2010-08-25-1.zip
|
||||
:
|
||||
;
|
||||
InstallOptionalHaikuImagePackage cdrtools-3.00-x86-gcc2-2010-08-25-1.zip
|
||||
: $(baseURL)/cdrtools-3.00-x86-gcc2-2010-08-25-1.zip ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -470,13 +473,14 @@ if [ IsOptionalHaikuImagePackageAdded CMake ] {
|
||||
if [ IsOptionalHaikuImagePackageAdded Curl ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package Curl available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage curl-7.21.2-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/curl-7.21.2-x86-gcc4-2010-11-12.zip
|
||||
: : true ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
curl-7.21.2-x86-gcc2-2010-10-13.zip
|
||||
InstallOptionalHaikuImagePackage curl-7.21.2-x86-gcc2-2010-10-13.zip
|
||||
: $(baseURL)/curl-7.21.2-x86-gcc2-2010-10-13.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
: : true ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -486,12 +490,18 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package CVS available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
cvs-1.12.13-r1a2-x86-gcc2-2010-04-29-a.zip
|
||||
: $(baseURL)/cvs-1.12.13-r1a2-x86-gcc2-2010-04-29-a.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
cvs-1.12.13.1-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/cvs-1.12.13.1-x86-gcc4-2010-11-12.zip
|
||||
: : true ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
cvs-1.12.13-r1a2-x86-gcc2-2010-04-29-a.zip
|
||||
: $(baseURL)/cvs-1.12.13-r1a2-x86-gcc2-2010-04-29-a.zip
|
||||
: : true ;
|
||||
}
|
||||
|
||||
InstallSourceArchive cvs-1.12.13_haiku-2010-04-29.tar.xz
|
||||
: $(baseSourceURL)/2010/cvs-1.12.13_haiku-2010-04-29.tar.xz ;
|
||||
}
|
||||
@@ -501,27 +511,39 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] {
|
||||
# Development
|
||||
if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
|
||||
# autotools
|
||||
InstallOptionalHaikuImagePackage autoconf-2.68-x86-gcc2-2010-09-23.zip
|
||||
: $(baseURL)/autoconf-2.68-x86-gcc2-2010-09-23.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
InstallOptionalHaikuImagePackage automake-1.11.1-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
: $(baseURL)/automake-1.11.1-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
:
|
||||
: true ;
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage autoconf-2.68-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/autoconf-2.68-x86-gcc4-2010-11-12.zip
|
||||
: : true ;
|
||||
InstallOptionalHaikuImagePackage automake-1.11.1-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/automake-1.11.1-x86-gcc4-2010-11-12.zip
|
||||
: : true ;
|
||||
InstallOptionalHaikuImagePackage libtool-2.4-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/libtool-2.4-x86-gcc4-2010-11-12.zip
|
||||
: : true ;
|
||||
InstallOptionalHaikuImagePackage texinfo-4.13a-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/texinfo-4.13a-x86-gcc4-2010-11-12.zip
|
||||
: : true ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage autoconf-2.68-x86-gcc2-2010-09-23.zip
|
||||
: $(baseURL)/autoconf-2.68-x86-gcc2-2010-09-23.zip
|
||||
: : true ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
automake-1.11.1-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
: $(baseURL)/automake-1.11.1-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
: : true ;
|
||||
InstallOptionalHaikuImagePackage libtool-2.4-x86-gcc2-2010-09-25.zip
|
||||
: $(baseURL)/libtool-2.4-x86-gcc2-2010-09-25.zip
|
||||
: : true ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
texinfo-4.13a-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
: $(baseURL)/texinfo-4.13a-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
: : true ;
|
||||
}
|
||||
|
||||
InstallSourceArchive automake-1.11.1_haiku-2010-04-29.tar.xz
|
||||
: $(baseSourceURL)/2010/automake-1.11.1_haiku-2010-04-29.tar.xz
|
||||
;
|
||||
InstallOptionalHaikuImagePackage libtool-2.4-x86-gcc2-2010-09-25.zip
|
||||
: $(baseURL)/libtool-2.4-x86-gcc2-2010-09-25.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
InstallOptionalHaikuImagePackage texinfo-4.13a-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
: $(baseURL)/texinfo-4.13a-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
:
|
||||
: true ;
|
||||
InstallSourceArchive texinfo-4.13a_haiku-2010-04-29.tar.xz
|
||||
: $(baseSourceURL)/2010/texinfo-4.13a_haiku-2010-04-29.tar.xz
|
||||
;
|
||||
@@ -546,8 +568,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
|
||||
}
|
||||
|
||||
if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {
|
||||
InstallOptionalHaikuImagePackage gcc-4.4.4-x86-gcc4-2010-10-09.zip
|
||||
: $(baseURL)/gcc-4.4.4-x86-gcc4-2010-10-09.zip ;
|
||||
InstallOptionalHaikuImagePackage gcc-4.4.4-x86-gcc4-2010-11-11.zip
|
||||
: $(baseURL)/gcc-4.4.4-x86-gcc4-2010-11-11.zip ;
|
||||
}
|
||||
|
||||
if $(HAIKU_GCC_VERSION[1]) = 4 {
|
||||
@@ -559,30 +581,51 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
|
||||
local libs = libstdc++.so libsupc++.so ;
|
||||
for lib in $(libs) {
|
||||
AddSymlinkToHaikuHybridImage
|
||||
develop abi x86 gcc4 tools gcc-4.4.4-haiku-100705 lib
|
||||
develop abi x86 gcc4 tools gcc-4.4.4-haiku-101111 lib
|
||||
: /system/lib $(lib) : : true ;
|
||||
}
|
||||
}
|
||||
|
||||
# other commonly used tools
|
||||
InstallOptionalHaikuImagePackage bison-2.4.1-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
: $(baseURL)/bison-2.4.1-r1a2-x86-gcc2-2010-04-21-a.zip ;
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
bison-2.4.1-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/bison-2.4.1-x86-gcc4-2010-11-12.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
m4-1.4.14-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/m4-1.4.14-x86-gcc4-2010-11-12.zip ;
|
||||
InstallOptionalHaikuImagePackage flex-2.5.35-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/flex-2.5.35-x86-gcc4-2010-11-12.zip ;
|
||||
InstallOptionalHaikuImagePackage jam-2.5-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/jam-2.5-x86-gcc4-2010-11-12.zip ;
|
||||
InstallOptionalHaikuImagePackage mkdepend-1.7-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/mkdepend-1.7-x86-gcc4-2010-11-12.zip ;
|
||||
InstallOptionalHaikuImagePackage make-3.82-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/make-3.82-x86-gcc4-2010-11-12.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
bison-2.4.1-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
: $(baseURL)/bison-2.4.1-r1a2-x86-gcc2-2010-04-21-a.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
m4-1.4.14-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
: $(baseURL)/m4-1.4.14-r1a2-x86-gcc2-2010-04-21-a.zip ;
|
||||
InstallOptionalHaikuImagePackage
|
||||
flex-2.5.35-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
: $(baseURL)/flex-2.5.35-r1a2-x86-gcc2-2010-04-21-a.zip ;
|
||||
InstallOptionalHaikuImagePackage jam-2.5-r1a2-x86-gcc2-2010-04-21.zip
|
||||
: $(baseURL)/jam-2.5-r1a2-x86-gcc2-2010-04-21.zip ;
|
||||
InstallOptionalHaikuImagePackage mkdepend-1.7-x86-gcc2-2010-09-24.zip
|
||||
: $(baseURL)/mkdepend-1.7-x86-gcc2-2010-09-24.zip ;
|
||||
InstallOptionalHaikuImagePackage make-3.82-x86-gcc2-2010-09-25.zip
|
||||
: $(baseURL)/make-3.82-x86-gcc2-2010-09-25.zip ;
|
||||
}
|
||||
|
||||
InstallSourceArchive bison-2.4.1_haiku-2010-04-29.tar.xz
|
||||
: $(baseSourceURL)/2010/bison-2.4.1_haiku-2010-04-29.tar.xz ;
|
||||
InstallOptionalHaikuImagePackage m4-1.4.14-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
: $(baseURL)/m4-1.4.14-r1a2-x86-gcc2-2010-04-21-a.zip ;
|
||||
InstallSourceArchive m4-1.4.14_haiku-2010-04-29.tar.xz
|
||||
: $(baseSourceURL)/2010/m4-1.4.14_haiku-2010-04-29.tar.xz ;
|
||||
InstallOptionalHaikuImagePackage flex-2.5.35-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
: $(baseURL)/flex-2.5.35-r1a2-x86-gcc2-2010-04-21-a.zip ;
|
||||
InstallSourceArchive flex-2.5.35_haiku-2010-04-29.tar.xz
|
||||
: $(baseSourceURL)/2010/flex-2.5.35_haiku-2010-04-29.tar.xz ;
|
||||
InstallOptionalHaikuImagePackage jam-2.5-r1a2-x86-gcc2-2010-04-21.zip
|
||||
: $(baseURL)/jam-2.5-r1a2-x86-gcc2-2010-04-21.zip ;
|
||||
InstallOptionalHaikuImagePackage mkdepend-1.7-x86-gcc2-2010-09-24.zip
|
||||
: $(baseURL)/mkdepend-1.7-x86-gcc2-2010-09-24.zip ;
|
||||
InstallOptionalHaikuImagePackage make-3.82-x86-gcc2-2010-09-25.zip
|
||||
: $(baseURL)/make-3.82-x86-gcc2-2010-09-25.zip ;
|
||||
}
|
||||
|
||||
|
||||
@@ -724,13 +767,19 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package Expat available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
expat-2.0.1-r1a2-x86-gcc2-2010-04-22-a.zip
|
||||
: $(baseURL)/expat-2.0.1-r1a2-x86-gcc2-2010-04-22-a.zip
|
||||
:
|
||||
: true
|
||||
: true
|
||||
;
|
||||
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
expat-2.0.1-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/expat-2.0.1-x86-gcc4-2010-11-12.zip
|
||||
: : true ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
expat-2.0.1-r1a2-x86-gcc2-2010-04-22-a.zip
|
||||
: $(baseURL)/expat-2.0.1-r1a2-x86-gcc2-2010-04-22-a.zip
|
||||
: : true ;
|
||||
}
|
||||
|
||||
InstallSourceArchive expat-2.0.1_haiku-2010-04-29.tar.xz
|
||||
: $(baseSourceURL)/2010/expat-2.0.1_haiku-2010-04-29.tar.xz ;
|
||||
}
|
||||
@@ -956,13 +1005,16 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package LibIconv available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libiconv-1.13.1-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
: $(baseURL)/libiconv-1.13.1-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
:
|
||||
:
|
||||
: true
|
||||
;
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libiconv-1.13.1-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/libiconv-1.13.1-x86-gcc4-2010-11-12.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libiconv-1.13.1-r1a2-x86-gcc2-2010-04-21-a.zip
|
||||
: $(baseURL)/libiconv-1.13.1-r1a2-x86-gcc2-2010-04-21-a.zip ;
|
||||
}
|
||||
|
||||
InstallSourceArchive libiconv-1.13.1_haiku-2010-04-29.tar.xz
|
||||
: $(baseSourceURL)/2010/libiconv-1.13.1_haiku-2010-04-29.tar.xz ;
|
||||
}
|
||||
@@ -1007,13 +1059,16 @@ if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package LibXML2 available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libxml2-2.7.7-r1a2-x86-gcc2-2010-04-22-a.zip
|
||||
: $(baseURL)/libxml2-2.7.7-r1a2-x86-gcc2-2010-04-22-a.zip
|
||||
:
|
||||
:
|
||||
: true
|
||||
;
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libxml2-2.7.7-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/libxml2-2.7.7-x86-gcc4-2010-11-12.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
libxml2-2.7.7-r1a2-x86-gcc2-2010-04-22-a.zip
|
||||
: $(baseURL)/libxml2-2.7.7-r1a2-x86-gcc2-2010-04-22-a.zip ;
|
||||
}
|
||||
|
||||
InstallSourceArchive libxml2-2.7.7_haiku-2010-04-29.tar.xz
|
||||
: $(baseSourceURL)/2010/libxml2-2.7.7_haiku-2010-04-29.tar.xz ;
|
||||
}
|
||||
@@ -1103,12 +1158,17 @@ if [ IsOptionalHaikuImagePackageAdded Mercurial ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package Mercurial available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
mercurial-1.6-x86-gcc2-2010-07-01.zip
|
||||
: $(baseURL)/mercurial-1.6-x86-gcc2-2010-07-01.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
mercurial-1.6-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/mercurial-1.6-x86-gcc4-2010-11-12.zip
|
||||
: : true ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
mercurial-1.6-x86-gcc2-2010-07-01.zip
|
||||
: $(baseURL)/mercurial-1.6-x86-gcc2-2010-07-01.zip
|
||||
: : true ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1118,11 +1178,15 @@ if [ IsOptionalHaikuImagePackageAdded Nano ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package Nano available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
nano-2.2.5-x86-gcc2-2010-10-16.zip
|
||||
: $(baseURL)/nano-2.2.5-x86-gcc2-2010-10-16.zip
|
||||
:
|
||||
;
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
nano-2.2.5-x86-gcc4-2010-11-13.zip
|
||||
: $(baseURL)/nano-2.2.5-x86-gcc4-2010-11-13.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
nano-2.2.5-x86-gcc2-2010-10-16.zip
|
||||
: $(baseURL)/nano-2.2.5-x86-gcc2-2010-10-16.zip ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1132,11 +1196,15 @@ if [ IsOptionalHaikuImagePackageAdded Neon ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package Neon available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
neon-0.29.5-x86-gcc2-2010-10-16.zip
|
||||
: $(baseURL)/neon-0.29.5-x86-gcc2-2010-10-16.zip
|
||||
:
|
||||
;
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
neon-0.29.5-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/neon-0.29.5-x86-gcc4-2010-11-12.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
neon-0.29.5-x86-gcc2-2010-10-16.zip
|
||||
: $(baseURL)/neon-0.29.5-x86-gcc2-2010-10-16.zip ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1232,11 +1300,16 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
|
||||
Exit "Optional package OpenSSH requires the HAIKU_IMAGE_HOST_NAME"
|
||||
"variable to be set!" ;
|
||||
}
|
||||
InstallOptionalHaikuImagePackage
|
||||
openssh-5.6p1-x86-gcc2-2010-11-03.zip
|
||||
: $(baseURL)/openssh-5.6p1-x86-gcc2-2010-11-03.zip
|
||||
:
|
||||
;
|
||||
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
openssh-5.6p1-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/openssh-5.6p1-x86-gcc4-2010-11-12.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
openssh-5.6p1-x86-gcc2-2010-11-03.zip
|
||||
: $(baseURL)/openssh-5.6p1-x86-gcc2-2010-11-03.zip ;
|
||||
}
|
||||
|
||||
AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true
|
||||
: "sshd user" ;
|
||||
@@ -1249,12 +1322,13 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package OpenSSL available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage $(HAIKU_OPENSSL_PACKAGE)
|
||||
: $(HAIKU_OPENSSL_URL)
|
||||
:
|
||||
:
|
||||
: true
|
||||
;
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage $(HAIKU_OPENSSL_PACKAGE)
|
||||
: $(HAIKU_OPENSSL_URL) ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage $(HAIKU_OPENSSL_PACKAGE)
|
||||
: $(HAIKU_OPENSSL_URL) ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1266,10 +1340,8 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] {
|
||||
} else {
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
p7zip-9.04-r1a2-x86-gcc4-2010-05-06.zip
|
||||
: $(baseURL)/p7zip-9.04-r1a2-x86-gcc4-2010-05-06.zip
|
||||
:
|
||||
;
|
||||
p7zip-9.04-x86-gcc4-2010-11-13.zip
|
||||
: $(baseURL)/p7zip-9.04-x86-gcc4-2010-11-13.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
p7zip-9.04-x86-gcc2-2010-09-01.zip
|
||||
@@ -1337,9 +1409,9 @@ if [ IsOptionalHaikuImagePackageAdded Pe ] {
|
||||
Echo "No optional package Pe available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage pe-2.4.3-600-x86-gcc4-2010-09-28.zip
|
||||
: $(baseURL)/pe-2.4.3-600-x86-gcc4-2010-09-28.zip
|
||||
;
|
||||
InstallOptionalHaikuImagePackage
|
||||
pe-2.4.3-600-x86-gcc4-2010-11-14.zip
|
||||
: $(baseURL)/pe-2.4.3-600-x86-gcc4-2010-11-14.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
pe-2.4.3-600-x86-gcc2-2010-09-28.zip
|
||||
@@ -1360,13 +1432,18 @@ if [ IsOptionalHaikuImagePackageAdded Perl ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package Perl available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
perl-5.10.1-r1a2-x86-gcc2-2010-04-25-a.zip
|
||||
: $(baseURL)/perl-5.10.1-r1a2-x86-gcc2-2010-04-25-a.zip
|
||||
:
|
||||
: true
|
||||
: true
|
||||
;
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
perl-5.10.1-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/perl-5.10.1-x86-gcc4-2010-11-12.zip
|
||||
: : true ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
perl-5.10.1-r1a2-x86-gcc2-2010-04-25-a.zip
|
||||
: $(baseURL)/perl-5.10.1-r1a2-x86-gcc2-2010-04-25-a.zip
|
||||
: : true ;
|
||||
}
|
||||
|
||||
InstallSourceArchive perl-5.10.1_haiku-2010-04-29.tar.xz
|
||||
: $(baseSourceURL)/2010/perl-5.10.1_haiku-2010-04-29.tar.xz ;
|
||||
}
|
||||
@@ -1378,13 +1455,17 @@ if [ IsOptionalHaikuImagePackageAdded Python ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package Python available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
python-2.6.6-x86-gcc2-2010-08-30.zip
|
||||
: $(baseURL)/python-2.6.6-x86-gcc2-2010-08-30.zip
|
||||
:
|
||||
: true
|
||||
: true
|
||||
;
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
python-2.6.6-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/python-2.6.6-x86-gcc4-2010-11-12.zip
|
||||
: : true ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
python-2.6.6-x86-gcc2-2010-08-30.zip
|
||||
: $(baseURL)/python-2.6.6-x86-gcc2-2010-08-30.zip
|
||||
: : true ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1441,12 +1522,17 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package SQLite available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
sqlite-3.7.3-x86-gcc2-2010-10-13.zip
|
||||
: $(baseURL)/sqlite-3.7.3-x86-gcc2-2010-10-13.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
sqlite-3.7.3-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/sqlite-3.7.3-x86-gcc4-2010-11-12.zip
|
||||
: : true ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
sqlite-3.7.3-x86-gcc2-2010-10-13.zip
|
||||
: $(baseURL)/sqlite-3.7.3-x86-gcc2-2010-10-13.zip
|
||||
: : true ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1456,12 +1542,17 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package Subversion available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
subversion-1.6.13-x86-gcc2-2010-10-13.zip
|
||||
: $(baseURL)/subversion-1.6.13-x86-gcc2-2010-10-13.zip
|
||||
:
|
||||
: true
|
||||
;
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
subversion-1.6.13-x86-gcc4-2010-11-12.zip
|
||||
: $(baseURL)/subversion-1.6.13-x86-gcc4-2010-11-12.zip
|
||||
: : true ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
subversion-1.6.13-x86-gcc2-2010-10-13.zip
|
||||
: $(baseURL)/subversion-1.6.13-x86-gcc2-2010-10-13.zip
|
||||
: : true ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1489,11 +1580,16 @@ if [ IsOptionalHaikuImagePackageAdded Tar ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package Tar available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
tar-1.22-r1a2-x86-gcc2-2010-04-22-a.zip
|
||||
: $(baseURL)/tar-1.22-r1a2-x86-gcc2-2010-04-22-a.zip
|
||||
:
|
||||
;
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
|
||||
InstallOptionalHaikuImagePackage
|
||||
tar-1.22-x86-gcc4-2010-11-13.zip
|
||||
: $(baseURL)/tar-1.22-x86-gcc4-2010-11-13.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
tar-1.22-r1a2-x86-gcc2-2010-04-22-a.zip
|
||||
: $(baseURL)/tar-1.22-r1a2-x86-gcc2-2010-04-22-a.zip ;
|
||||
}
|
||||
|
||||
InstallSourceArchive tar-1.22_haiku-2010-04-29.tar.xz
|
||||
: $(baseSourceURL)/2010/tar-1.22_haiku-2010-04-29.tar.xz ;
|
||||
}
|
||||
@@ -1621,17 +1717,13 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package Vision available for $(TARGET_ARCH)" ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage vision-908-x86-gcc2-2010-10-30.zip
|
||||
: $(baseURL)/vision-908-x86-gcc4-2010-11-04.zip
|
||||
:
|
||||
;
|
||||
InstallOptionalHaikuImagePackage vision-908-x86-gcc4-2010-11-14.zip
|
||||
: $(baseURL)/vision-908-x86-gcc4-2010-11-14.zip ;
|
||||
AddSymlinkToHaikuImage home config be Applications
|
||||
: /boot/apps/Vision/Vision ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage vision-908-x86-gcc2-2010-10-30.zip
|
||||
: $(baseURL)/vision-908-x86-gcc2-2010-10-30.zip
|
||||
:
|
||||
;
|
||||
: $(baseURL)/vision-908-x86-gcc2-2010-10-30.zip ;
|
||||
AddSymlinkToHaikuImage home config be Applications
|
||||
: /boot/apps/Vision/Vision ;
|
||||
}
|
||||
@@ -1665,8 +1757,8 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
|
||||
Echo "No optional package WebPositive available for gcc2" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
WebPositive-gcc4-x86-r545-2010-08-31.zip
|
||||
: $(baseURL)/WebPositive-gcc4-x86-r545-2010-08-31.zip
|
||||
WebPositive-gcc4-x86-r547-2010-11-16.zip
|
||||
: $(baseURL)/WebPositive-gcc4-x86-r547-2010-11-16.zip
|
||||
:
|
||||
;
|
||||
AddSymlinkToHaikuImage home config be Applications
|
||||
@@ -1759,13 +1851,16 @@ if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
Echo "No optional package XZ-Utils available for $(TARGET_ARCH)" ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip
|
||||
: $(baseURL)/xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip
|
||||
:
|
||||
:
|
||||
: true
|
||||
;
|
||||
if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
InstallOptionalHaikuImagePackage
|
||||
xz-utils-4.999.9-x86-gcc4-2010-11-13.zip
|
||||
: $(baseURL)/xz-utils-4.999.9-x86-gcc4-2010-11-13.zip ;
|
||||
} else {
|
||||
InstallOptionalHaikuImagePackage
|
||||
xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip
|
||||
: $(baseURL)/xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip ;
|
||||
}
|
||||
|
||||
InstallSourceArchive xz-utils-4.999.9_haiku-2010-04-29.tar.xz
|
||||
: $(baseSourceURL)/2010/xz-utils-4.999.9_haiku-2010-04-29.tar.xz ;
|
||||
AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz
|
||||
|
||||
Reference in New Issue
Block a user