Skip to content

Compiling libgit2 with libssh2 for iOS #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 14, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ build-iPhoneOS/*
objective-git.bridgesupport
ObjectiveGitFramework/build/*
ObjectiveGit-iOS.framework/*
libgit2*.a
External/libgit2*.a

*.pbxuser
*.perspective
Expand All @@ -23,5 +23,7 @@ project.xcworkspace

ObjectiveGitTests/fixtures/Fixtures/*

ios-openssl/include
ios-openssl/lib
External/ios-openssl/include
External/ios-openssl/lib

External/libssh2-ios
9 changes: 6 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[submodule "libgit2"]
path = libgit2
path = External/libgit2
url = https://github.com/libgit2/libgit2.git
[submodule "ObjectiveGitTests/specta"]
path = ObjectiveGitTests/specta
Expand All @@ -8,8 +8,11 @@
path = ObjectiveGitTests/expecta
url = https://github.com/github/expecta.git
[submodule "Configuration"]
path = Configuration
path = External/Configuration
url = https://github.com/jspahrsummers/xcconfigs.git
[submodule "openssl"]
path = openssl
path = External/openssl
url = https://github.com/openssl/openssl.git
[submodule "libssh2"]
path = External/libssh2
url = git://git.libssh2.org/libssh2.git
16 changes: 8 additions & 8 deletions ios-openssl/build.sh → External/ios-openssl/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

set -x

if [ -f "ios-openssl/lib/libssl.a" ] && [ -f "ios-openssl/lib/libcrypto.a" ] && [ -d "ios-openssl/include" ]
if [ -f "External/ios-openssl/lib/libssl.a" ] && [ -f "External/ios-openssl/lib/libcrypto.a" ] && [ -d "External/ios-openssl/include" ]
then
echo "No update needed."
exit 0
Expand All @@ -27,7 +27,7 @@ IPHONESIMULATOR_GCC="${IPHONESIMULATOR_PLATFORM}/Developer/usr/bin/gcc"

# Clean up whatever was left from our previous build

rm -rf ios-openssl/include ios-openssl/lib
rm -rf External/ios-openssl/include External/ios-openssl/lib
rm -rf "/tmp/openssl"
rm -rf "/tmp/openssl-*.log"

Expand All @@ -37,7 +37,7 @@ build()
GCC=$2
SDK=$3
rm -rf "/tmp/openssl"
cp -r openssl /tmp/
cp -r External/openssl /tmp/
pushd .
cd "/tmp/openssl"
./Configure BSD-generic32 no-gost --openssldir="/tmp/openssl-${ARCH}" &> "/tmp/openssl-${ARCH}.log"
Expand All @@ -56,20 +56,20 @@ build "i386" "${IPHONESIMULATOR_GCC}" "${IPHONESIMULATOR_SDK}"

#

mkdir ios-openssl/include
cp -r /tmp/openssl-i386/include/openssl ios-openssl/include/
mkdir External/ios-openssl/include
cp -r /tmp/openssl-i386/include/openssl External/ios-openssl/include/

mkdir ios-openssl/lib
mkdir External/ios-openssl/lib
lipo \
"/tmp/openssl-armv7/lib/libcrypto.a" \
"/tmp/openssl-armv7s/lib/libcrypto.a" \
"/tmp/openssl-i386/lib/libcrypto.a" \
-create -output ios-openssl/lib/libcrypto.a
-create -output External/ios-openssl/lib/libcrypto.a
lipo \
"/tmp/openssl-armv7/lib/libssl.a" \
"/tmp/openssl-armv7s/lib/libssl.a" \
"/tmp/openssl-i386/lib/libssl.a" \
-create -output ios-openssl/lib/libssl.a
-create -output External/ios-openssl/lib/libssl.a

rm -rf "/tmp/openssl"
rm -rf "/tmp/openssl-*.log"
Expand Down
1 change: 1 addition & 0 deletions External/libssh2
Submodule libssh2 added at f1cfa5
Loading