summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2013-10-20 19:15:14 +0200
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2013-10-20 19:15:14 +0200
commit068293a4908cafa95898b53ef97282ad8294c1cf (patch)
tree03f699673baf9a2e1df864422b3050072e2e7d0b /package
parent33dd541790614765228a71477e1f8b2b6aa21ce1 (diff)
verified ssh is working in qemu x86_64, fix build bugs
Diffstat (limited to 'package')
-rw-r--r--package/openssh/Makefile2
-rw-r--r--package/openssl/patches/patch-Configure2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index b489a8434..284036ece 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= 7b2d9dd75b5cf267ea1737ec75500316
PKG_DESCR:= OpenSSH
PKG_SECTION:= net/security
PKG_BUILDDEP:= zlib openssl
-PKG_DEPENDS:= zlib libopenssl libpthread
+PKG_DEPENDS:= zlib libopenssl libpthread libgcc
PKG_URL:= http://www.openssh.com/
PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
PKG_MULTI:= 1
diff --git a/package/openssl/patches/patch-Configure b/package/openssl/patches/patch-Configure
index 2f1213e0e..5d9f9329f 100644
--- a/package/openssl/patches/patch-Configure
+++ b/package/openssl/patches/patch-Configure
@@ -5,7 +5,7 @@
"linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
"linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
+"linux-embedded","gcc:-DTERMIOS \$(OPTIMIZATION_FLAGS) -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-embedded-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
++"linux-embedded-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIOS \$(OPTIMIZATION_FLAGS) -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
# Android: linux-* but without -DTERMIO and pointers to headers and libs.
"android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",