Change searchpath from STAGING_DIR/{include,lib} to STAGING_DIR/usr/{include,lib}, Fix static libraries building

SVN-Revision: 648
This commit is contained in:
Nicolas Thill 2005-04-14 07:16:59 +00:00
parent 2b7d8f9bf3
commit d895b7ccb8

View file

@ -34,13 +34,17 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
(cd $(PKG_BUILD_DIR); \ (cd $(PKG_BUILD_DIR); \
CFLAGS="-DOPENSSL_NO_KRB5 -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5" \ CFLAGS="-DOPENSSL_NO_KRB5 -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5" \
PATH=$(TARGET_PATH) ./Configure linux-$(ARCH) --prefix=/ \ PATH=$(TARGET_PATH) ./Configure linux-$(ARCH) --prefix=/ \
--openssldir=/usr/lib/ssl -L$(STAGING_DIR)/lib -ldl \ --openssldir=/usr/lib/ssl -L$(STAGING_DIR)/usr/lib -ldl \
-I$(STAGING_DIR)/include $(OPENSSL_NO_CIPHERS) \ -I$(STAGING_DIR)/usr/include $(OPENSSL_NO_CIPHERS) \
shared no-krb5 no-ec no-engine zlib-dynamic no-hw no-threads ) shared no-krb5 no-ec no-engine zlib-dynamic no-hw no-threads )
touch $(PKG_BUILD_DIR)/.configured touch $(PKG_BUILD_DIR)/.configured
$(PKG_BUILD_DIR)/apps/openssl: $(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. # Work around openssl build bug to link libssl.so with libcrypto.so.
-rm $(PKG_BUILD_DIR)/libssl.so.*.*.* -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
$(MAKE) -j1 CC=$(TARGET_CC) -C $(PKG_BUILD_DIR) do_linux-shared $(MAKE) -j1 CC=$(TARGET_CC) -C $(PKG_BUILD_DIR) do_linux-shared