diff options
| author | Memphiz <memphis@machzwo.de> | 2011-06-16 20:15:48 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2011-06-16 20:42:47 +0200 |
| commit | eca9e9f00fb7ae4931c39b01dee4a186a98e460b (patch) | |
| tree | fb3ee1861f24916d9f73efe535d49f9652ead59d /tools | |
| parent | 6e2f533ef0c6cabb641b35daf73c76636e69201c (diff) | |
[osx/ios] - remove legacy from libssh - it will break dynamic linkage on runtime with atv2 (exported symbol string_free conflicts with libsmbclient)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/darwin/depends/libssh/Makefile | 1 | ||||
| -rw-r--r-- | tools/darwin/depends/libssh/removelegacy.patch | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/tools/darwin/depends/libssh/Makefile b/tools/darwin/depends/libssh/Makefile index df992b1dc0..12ae1d598c 100644 --- a/tools/darwin/depends/libssh/Makefile +++ b/tools/darwin/depends/libssh/Makefile @@ -24,6 +24,7 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) echo $(SOURCE) > .gitignore cd $(SOURCE); rm -rf build; mkdir -p build + cd $(SOURCE); patch -p0 < ../removelegacy.patch cd $(SOURCE)/build; CC=$(CC) CXX=$(CXX) cmake \ -DCMAKE_C_FLAGS:STRING="$(CPPFLAGS) $(CFLAGS)" \ -DCMAKE_CXX_FLAGS:STRING="$(CPPFLAGS) $(CXXFLAGS)" \ diff --git a/tools/darwin/depends/libssh/removelegacy.patch b/tools/darwin/depends/libssh/removelegacy.patch new file mode 100644 index 0000000000..69683cb869 --- /dev/null +++ b/tools/darwin/depends/libssh/removelegacy.patch @@ -0,0 +1,10 @@ +--- src/CMakeLists.txt 2011-06-16 19:04:44.000000000 +0200 ++++ src/CMakeLists.txt 2011-06-16 19:03:40.000000000 +0200 +@@ -94,7 +94,6 @@ + keyfiles.c + keys.c + known_hosts.c +- legacy.c + libcrypto.c + libgcrypt.c + log.c |