Ticket #3423: SetupCrossSSLDir.patch

build/jam/MiscRules

@@ -24 +24 @@
     ;
 }
 
+rule SetupCrossSSLDir
+{
+    if [ IsOptionalBuildSoftwareAdded OpenSSL ] {
+            if $(TARGET_ARCH) != x86 {
+            Echo "No optional package OpenSSL available for $(TARGET_ARCH)" ;
+        } else {
+            local baseURL = http://haiku-files.org/files/optional-packages ;
+            InstallOptionalBuildSoftware openssl-0.9.8j-gcc2-2009-01-28
+                : $(baseURL)/openssl-0.9.8j-gcc2-2009-01-28.zip
+                : cross-ssl
+            ;
+            SSL_DIR = $(HAIKU_OUTPUT_DIR)/cross-ssl ;
+            USE_SSL = 1 ;
+        }
+    }
+}
+
 rule SubIncludeGPL
 {
     # SubInclude rule that can be used to conditionally include GPL licensed

build/jam/ImageRules

@@ -710 +710 @@
     return $(HAIKU_ADD_ALL_OPTIONAL_PACKAGES) ;
 }
 
+rule AddOptionalHaikuImagePackages packages
+{
+    HAIKU_OPTIONAL_BUILD_SOFTWARE_ADDED on $(packages) = 1 ;
+}
+
+rule IsOptionalBuildSoftwareAdded package
+{
+    if [ on $(package) return $(HAIKU_OPTIONAL_BUILD_SOFTWARE_ADDED) ] {
+        return 1 ;
+    }
+
+    return 0 ;  
+}
+
 rule OptionalPackageDependencies package : dependencies
 {
     if [ IsOptionalHaikuImagePackageAdded $(package) ] {
@@ -728 +742 @@
     UnzipArchiveToHaikuImage $(dirTokens) : $(zipFile) ;
 }
 
+rule InstallOptionalBuildSoftware package : url : dirTokens
+{
+    # download zip file
+    local zipFile = $(package:G=download).zip ;
+    MakeLocate $(zipFile) : $(HAIKU_DOWNLOAD_DIR) ;
+    DownloadFile $(zipFile) : $(url) ;
+
+    # unzip to container 
+    UnzipArchiveToContainer $(HAIKU_OUTPUT_DIR) : $(dirTokens) : $(zipFile) ;
+}
+
 rule AddEntryToHaikuImageUserGroupFile file : entry
 {
     local allEntries = [ on $(file) return $(HAIKU_IMAGE_USER_GROUP_ENTRIES) ] ;

build/jam/ReleaseBuildProfiles

@@ -9 +9 @@
         AddGroupToHaikuImage party : 101 : user sshd ;
         HAIKU_IMAGE_HOST_NAME = shredder ;
         HAIKU_IMAGE_SIZE = 400 ;
-        USE_SSL = 1 ;
+        SetupCrossSSLDir ;
 
         AddOptionalHaikuImagePackages BePDF Firefox Pe Vision VLC WonderBrush ;
         AddOptionalHaikuImagePackages CVS Development Subversion OpenSSH Yasm ;