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

Update openssl to 1.0.0a and python to 2.6.6

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38435 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Scott McCreary
2010-08-30 02:37:40 +00:00
parent df66656fec
commit 843c2663c8
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalBuildFeatures
+1 -1
View File
@@ -12,7 +12,7 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
} }
local baseURL = http://haiku-files.org/files/optional-packages ; local baseURL = http://haiku-files.org/files/optional-packages ;
HAIKU_OPENSSL_PACKAGE = openssl-1.0.0-r1a2-x86-gcc2-2010-04-22-a.zip ; HAIKU_OPENSSL_PACKAGE = openssl-1.0.0a-x86-gcc2-2010-08-29.zip ;
HAIKU_OPENSSL_URL = $(baseURL)/$(HAIKU_OPENSSL_PACKAGE) ; HAIKU_OPENSSL_URL = $(baseURL)/$(HAIKU_OPENSSL_PACKAGE) ;
if $(HAIKU_BUILD_FEATURE_SSL) { if $(HAIKU_BUILD_FEATURE_SSL) {
build/jam/OptionalPackages
+4 -9
View File
@@ -432,9 +432,6 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
: $(baseURL)/libtool-2.2.10-x86-gcc2-2010-06-10.zip : $(baseURL)/libtool-2.2.10-x86-gcc2-2010-06-10.zip
: :
: true : true
: true ;
InstallSourceArchive libtool-2.2.6b_haiku-2010-04-29.tar.xz
: $(baseSourceURL)/libtool-2.2.6b_haiku-2010-04-29.tar.xz
; ;
InstallOptionalHaikuImagePackage texinfo-4.13a-r1a2-x86-gcc2-2010-04-21-a.zip InstallOptionalHaikuImagePackage texinfo-4.13a-r1a2-x86-gcc2-2010-04-21-a.zip
: $(baseURL)/texinfo-4.13a-r1a2-x86-gcc2-2010-04-21-a.zip : $(baseURL)/texinfo-4.13a-r1a2-x86-gcc2-2010-04-21-a.zip
@@ -1059,8 +1056,8 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
"variable to be set!" ; "variable to be set!" ;
} }
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
openssh-5.5p1-x86-gcc2-2010-05-26.zip openssh-5.6p1-x86-gcc2-2010-08-23.zip
: $(baseURL)/openssh-5.5p1-x86-gcc2-2010-05-26.zip : $(baseURL)/openssh-5.6p1-x86-gcc2-2010-08-23.zip
: :
; ;
@@ -1081,8 +1078,6 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
: :
: true : true
; ;
InstallSourceArchive openssl-1.0.0_haiku-2010-04-29.tar.xz
: $(baseSourceURL)/openssl-1.0.0_haiku-2010-04-29.tar.xz ;
} }
} }
@@ -1185,8 +1180,8 @@ if [ IsOptionalHaikuImagePackageAdded Python ] {
Echo "No optional package Python available for $(TARGET_ARCH)" ; Echo "No optional package Python available for $(TARGET_ARCH)" ;
} else { } else {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
python-2.6.5-x86-gcc2-2010-05-26.zip python-2.6.6-x86-gcc2-2010-08-29.zip
: $(baseURL)/python-2.6.5-x86-gcc2-2010-05-26.zip : $(baseURL)/python-2.6.6-x86-gcc2-2010-08-29.zip
: :
: true : true
: true : true