[haiku-commits] haiku: hrev45026 - build/jam
- From: alex@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 18 Dec 2012 15:47:23 +0100 (CET)
hrev45026 adds 1 changeset to branch 'master'
old head: 596922bb7f69c3f2c267415886e90574efc53d59
new head: 6e5f42ccc9b4d6618cd946bade13dd274c79c8d0
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=6e5f42c+%5E596922b
----------------------------------------------------------------------------
6e5f42c: Added OpenSSL for x86_64.
[ Alex Smith <alex@xxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45026
Commit: 6e5f42ccc9b4d6618cd946bade13dd274c79c8d0
URL: http://cgit.haiku-os.org/haiku/commit/?id=6e5f42c
Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date: Tue Dec 18 14:47:02 2012 UTC
----------------------------------------------------------------------------
3 files changed, 19 insertions(+), 13 deletions(-)
build/jam/BuildFeatures | 12 ++++++++----
build/jam/Haiku64Image | 7 +++++++
build/jam/OptionalPackages | 13 ++++---------
----------------------------------------------------------------------------
diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 3a3873a..625998d 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -29,7 +29,11 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
}
if $(HAIKU_GCC_VERSION[1]) >= 4 {
- HAIKU_OPENSSL_PACKAGE = openssl-1.0.0j-r1a4-x86-gcc4-2012-08-29.zip ;
+ if $(TARGET_ARCH) = x86_64 {
+ HAIKU_OPENSSL_PACKAGE = openssl-1.0.0j-x86_64-2012-12-18.zip ;
+ } else {
+ HAIKU_OPENSSL_PACKAGE =
openssl-1.0.0j-r1a4-x86-gcc4-2012-08-29.zip ;
+ }
} else {
HAIKU_OPENSSL_PACKAGE = openssl-1.0.0j-r1a4-x86-gcc2-2012-08-26.zip ;
}
@@ -37,9 +41,7 @@ if $(HAIKU_GCC_VERSION[1]) >= 4 {
HAIKU_OPENSSL_URL = $(baseURL)/$(HAIKU_OPENSSL_PACKAGE) ;
if $(HAIKU_BUILD_FEATURE_SSL) {
- if $(TARGET_ARCH) != x86 {
- Echo "SSL build feature not available for $(TARGET_ARCH)" ;
- } else {
+ if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
# Download the zip archive.
local zipFile = [ DownloadFile $(HAIKU_OPENSSL_PACKAGE)
: $(HAIKU_OPENSSL_URL) ] ;
@@ -66,6 +68,8 @@ if $(HAIKU_BUILD_FEATURE_SSL) {
= [ FDirName $(HAIKU_OPENSSL_DIR) common include ] ;
EnableBuildFeatures openssl ;
+ } else {
+ Echo "SSL build feature not available for $(TARGET_ARCH)" ;
}
}
diff --git a/build/jam/Haiku64Image b/build/jam/Haiku64Image
index 70878d2..abc726e 100644
--- a/build/jam/Haiku64Image
+++ b/build/jam/Haiku64Image
@@ -119,6 +119,13 @@ AddFilesToHaikuImage system :
<revisioned>kernel_$(TARGET_ARCH) ;
AddLibrariesToHaikuHybridImage system lib
: $(SYSTEM_LIBS) $(PRIVATE_SYSTEM_LIBS) ;
+OPTIONAL_LIBS_ALIASES =
+ libfreetype.so
+ libjpeg.so
+ libpng.so
+ libz.so
+;
+
# libfreetype.so links to the current freetype lib
AddSymlinkToHaikuHybridImage system lib : $(HAIKU_FREETYPE_CURRENT_LIB:BS)
: $(HAIKU_FREETYPE_CURRENT_LINK) : : true ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 9950e58..2511aad 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -1661,16 +1661,11 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
# OpenSSL
if [ IsOptionalHaikuImagePackageAdded OpenSSL ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package OpenSSL available for $(TARGET_ARCH)"
;
+ if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
+ InstallOptionalHaikuImagePackage $(HAIKU_OPENSSL_PACKAGE)
+ : $(HAIKU_OPENSSL_URL) ;
} else {
- if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
$(HAIKU_OPENSSL_PACKAGE)
- : $(HAIKU_OPENSSL_URL) ;
- } else {
- InstallOptionalHaikuImagePackage
$(HAIKU_OPENSSL_PACKAGE)
- : $(HAIKU_OPENSSL_URL) ;
- }
+ Echo "No optional package OpenSSL available for $(TARGET_ARCH)"
;
}
}
Other related posts:
- » [haiku-commits] haiku: hrev45026 - build/jam - alex
