From 6e5f42ccc9b4d6618cd946bade13dd274c79c8d0 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex@alex-smith.me.uk>
Date: Tue, 18 Dec 2012 14:47:02 +0000
Subject: [PATCH] Added OpenSSL for x86_64.

---
 build/jam/BuildFeatures    | 12 ++++++++----
 build/jam/Haiku64Image     |  7 +++++++
 build/jam/OptionalPackages | 13 ++++---------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 3a3873a1114..625998d1599 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 70878d2559b..abc726e629b 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 9950e588e29..2511aada12d 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)" ;
 	}
 }