aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-03-12 10:00:53 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-03-12 10:00:53 +0000
commit2835152df851d6ac730661c2ba02939cb1bcadc1 (patch)
treeb9bb7c81928655249835b7a4d8b44842f37d9c21
parentc112b16dd88d1cae29d7e173e743bf0b64ea7f3d (diff)
downloadupstream-2835152df851d6ac730661c2ba02939cb1bcadc1.tar.gz
upstream-2835152df851d6ac730661c2ba02939cb1bcadc1.tar.bz2
upstream-2835152df851d6ac730661c2ba02939cb1bcadc1.zip
openssl: Fix x86_64 build on some 64bit host systems
On some build hosts openssl fails to install since openssl installs itself into lib64 while the openwrt Makefile expects the libs to end up in lib. install -m0644 .../openwrt/build_dir/target-x86_64_uClibc-0.9.33.2/openssl-1.0.1e/ipkg-install/usr/lib/libcrypto.so.* .../openwrt/build_dir/target-x86_64_uClibc-0.9.33.2/openssl-1.0.1e/ipkg-x86_64/libopenssl/usr/lib/ install: cannot stat '.../openwrt/build_dir/target-x86_64_uClibc-0.9.33.2/openssl-1.0.1e/ipkg-install/usr/lib/libcrypto.so.*': No such file or directory make[2]: *** [/openwrt/bin/x86_64/packages/libopenssl_1.0.1e-2_x86_64.ipk] Error 1 make[2]: Leaving directory `/openwrt/package/libs/openssl' make[1]: *** [package/libs/openssl/compile] Error 2 make[1]: Leaving directory `/openwrt' Set LIBDIR accordingly to fix this. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> SVN-Revision: 39885
-rw-r--r--package/libs/openssl/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index 8a8e8520d4..39fc513495 100644
--- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile
@@ -100,6 +100,7 @@ endif
ifeq ($(CONFIG_x86_64),y)
OPENSSL_TARGET:=linux-x86_64
+ OPENSSL_MAKEFLAGS += LIBDIR=lib
else
OPENSSL_OPTIONS+=no-sse2
ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y)