From d895b7ccb8992f5730e9aec157c11158e404252a Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Thu, 14 Apr 2005 07:16:59 +0000 Subject: [PATCH] Change searchpath from STAGING_DIR/{include,lib} to STAGING_DIR/usr/{include,lib}, Fix static libraries building SVN-Revision: 648 --- openwrt/package/openssl/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/openwrt/package/openssl/Makefile b/openwrt/package/openssl/Makefile index afa5f304e4..c33d412441 100644 --- a/openwrt/package/openssl/Makefile +++ b/openwrt/package/openssl/Makefile @@ -34,13 +34,17 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched (cd $(PKG_BUILD_DIR); \ CFLAGS="-DOPENSSL_NO_KRB5 -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5" \ PATH=$(TARGET_PATH) ./Configure linux-$(ARCH) --prefix=/ \ - --openssldir=/usr/lib/ssl -L$(STAGING_DIR)/lib -ldl \ - -I$(STAGING_DIR)/include $(OPENSSL_NO_CIPHERS) \ + --openssldir=/usr/lib/ssl -L$(STAGING_DIR)/usr/lib -ldl \ + -I$(STAGING_DIR)/usr/include $(OPENSSL_NO_CIPHERS) \ shared no-krb5 no-ec no-engine zlib-dynamic no-hw no-threads ) touch $(PKG_BUILD_DIR)/.configured $(PKG_BUILD_DIR)/apps/openssl: $(PKG_BUILD_DIR)/.configured - $(MAKE) -j1 CC=$(TARGET_CC) -C $(PKG_BUILD_DIR) all build-shared + $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ + CC="$(TARGET_CC)" \ + AR="$(TARGET_CROSS)ar r" \ + RANLIB="$(TARGET_CROSS)ranlib" \ + all build-shared # Work around openssl build bug to link libssl.so with libcrypto.so. -rm $(PKG_BUILD_DIR)/libssl.so.*.*.* $(MAKE) -j1 CC=$(TARGET_CC) -C $(PKG_BUILD_DIR) do_linux-shared