add oleg's jffs2root fix

[openwrt.git] / package / openssl / Makefile

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index cced77d..7541b41 100644 (file)
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -1,8 +1,11 @@
+# $Id$
+

 include $(TOPDIR)/rules.mk
 
 PKG_NAME := openssl
 include $(TOPDIR)/rules.mk
 
 PKG_NAME := openssl

-PKG_VERSION := 0.9.7e
+PKG_VERSION := 0.9.7g

 PKG_RELEASE := 1
 PKG_RELEASE := 1

+PKG_MD5SUM := 991615f73338a571b6a1be7d74906934

 
 PKG_SOURCE_SITE := http://www.openssl.org/source
 PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SOURCE_SITE := http://www.openssl.org/source
 PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz


@@ -13,9 +16,11 @@ PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 
 OPENSSL_NO_CIPHERS:=no-idea no-mdc2 no-rc5 no-rc2 no-md2 no-md4
 
 
 OPENSSL_NO_CIPHERS:=no-idea no-mdc2 no-rc5 no-rc2 no-md2 no-md4
 

+.NOTPARALLEL:
+

 $(DL_DIR)/$(PKG_SOURCE_FILE):
        mkdir -p $(DL_DIR)
 $(DL_DIR)/$(PKG_SOURCE_FILE):
        mkdir -p $(DL_DIR)

-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE)
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)

 
 $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
        mkdir -p $(TOOL_BUILD_DIR)
 
 $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
        mkdir -p $(TOOL_BUILD_DIR)


@@ -29,19 +34,23 @@ $(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=/ \
        (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
                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) 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.*.*.*
        # Work around openssl build bug to link libssl.so with libcrypto.so.
        -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*

-       $(MAKE) CC=$(TARGET_CC) -C $(PKG_BUILD_DIR) do_linux-shared
+       $(MAKE) -j1 CC=$(TARGET_CC) -C $(PKG_BUILD_DIR) do_linux-shared

 
 $(STAGING_DIR)/lib/libssl.so: $(PKG_BUILD_DIR)/apps/openssl
 
 $(STAGING_DIR)/lib/libssl.so: $(PKG_BUILD_DIR)/apps/openssl

-       $(MAKE) CC=$(TARGET_CC) INSTALL_PREFIX=$(STAGING_DIR) -C $(PKG_BUILD_DIR) install_sw
+       $(MAKE) -j1 CC=$(TARGET_CC) INSTALL_PREFIX=$(STAGING_DIR) -C $(PKG_BUILD_DIR) install_sw

        cp -fa $(PKG_BUILD_DIR)/libcrypto.so* $(STAGING_DIR)/lib/
        chmod a-x $(STAGING_DIR)/lib/libcrypto.so.0.9.7
        (cd $(STAGING_DIR)/lib; ln -fs libcrypto.so.0.9.7 libcrypto.so)
        cp -fa $(PKG_BUILD_DIR)/libcrypto.so* $(STAGING_DIR)/lib/
        chmod a-x $(STAGING_DIR)/lib/libcrypto.so.0.9.7
        (cd $(STAGING_DIR)/lib; ln -fs libcrypto.so.0.9.7 libcrypto.so)