Merge pull request gitx#52 from gitx/ForceStaticLinkingLibraries

Force static linking libraries

Author: hannesa2

.gitignore

@@ -9,9 +9,8 @@ build-iPhoneOS/*
 objective-git.bridgesupport
 ObjectiveGitFramework/build/*
 ObjectiveGit-iOS.framework/*
-External/libssh2.a
-External/libgit2*.a
-External/libgit2-ios
+External/*.a
+External/*.dylib
 
 *.pbxuser
 *.perspective

ObjectiveGitFramework.xcodeproj/project.pbxproj

@@ -1687,16 +1687,14 @@
 				INFOPLIST_FILE = Info.plist;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"/usr/local/opt/[email protected]/lib",
-					"/opt/homebrew/Cellar/[email protected]/1.1.1m/lib",
 					"$(PROJECT_DIR)/External/build/lib",
 				);
 				MODULEMAP_FILE = ObjectiveGit.modulemap;
 				OTHER_LDFLAGS = (
 					"-force_load",
 					External/libgit2.a,
 					External/libssh2.a,
-					"-lcrypto",
+					External/libcrypto.a,
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = ObjectiveGit;
@@ -1715,16 +1713,14 @@
 				INFOPLIST_FILE = Info.plist;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"/usr/local/opt/[email protected]/lib",
-					"/opt/homebrew/Cellar/[email protected]/1.1.1m/lib",
 					"$(PROJECT_DIR)/External/build/lib",
 				);
 				MODULEMAP_FILE = ObjectiveGit.modulemap;
 				OTHER_LDFLAGS = (
 					"-force_load",
 					External/libgit2.a,
 					External/libssh2.a,
-					"-lcrypto",
+					External/libcrypto.a,
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = ObjectiveGit;
@@ -1958,16 +1954,14 @@
 				INFOPLIST_FILE = Info.plist;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"/usr/local/opt/[email protected]/lib",
-					"/opt/homebrew/Cellar/[email protected]/1.1.1m/lib",
 					"$(PROJECT_DIR)/External/build/lib",
 				);
 				MODULEMAP_FILE = ObjectiveGit.modulemap;
 				OTHER_LDFLAGS = (
 					"-force_load",
 					External/libgit2.a,
 					External/libssh2.a,
-					"-lcrypto",
+					External/libcrypto.a,
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = ObjectiveGit;
@@ -2178,16 +2172,14 @@
 				INFOPLIST_FILE = Info.plist;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"/usr/local/opt/[email protected]/lib",
-					"/opt/homebrew/Cellar/[email protected]/1.1.1m/lib",
 					"$(PROJECT_DIR)/External/build/lib",
 				);
 				MODULEMAP_FILE = ObjectiveGit.modulemap;
 				OTHER_LDFLAGS = (
 					"-force_load",
 					External/libgit2.a,
 					External/libssh2.a,
-					"-lcrypto",
+					External/libcrypto.a,
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.libgit2.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = ObjectiveGit;

script/bootstrap

@@ -67,7 +67,7 @@ check_deps ()
 
         if [ "$code" -eq "0" ]
         then
-            echo "*** $tool is available in 👍"
+            echo "*** $tool is available 👍"
             continue
         elif [ "$code" -ne "1" ]
         then
@@ -100,6 +100,11 @@ check_deps ()
             sudo ln -s "$brew_prefix/$product" "$destination"
         done
     fi
+
+    # openssl@1 is expected
+    sslSource=$(find $brew_prefix -name libcrypto.a | grep openssl | sort | head -1 | xargs dirname)
+    echo "Find libcrypto.a and take first $sslSource and copy to $install_path"
+    cp $sslSource/* $install_path 2>/dev/null | echo "Copy and ignore subdirectory. This makes build work on x86 and arm64"
 }
 
 main