Fix building when target arch = i386

[openwrt.git] / package / openssl / Makefile

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index fddba2f..f1e6c5e 100644 (file)
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -7,7 +7,10 @@ PKG_VERSION:=0.9.7g
 PKG_RELEASE:=1
 PKG_MD5SUM:=991615f73338a571b6a1be7d74906934
 
 PKG_RELEASE:=1
 PKG_MD5SUM:=991615f73338a571b6a1be7d74906934
 

-PKG_SOURCE_URL:=http://www.openssl.org/source/
+PKG_SOURCE_URL:=http://www.openssl.org/source/ \
+       ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \
+       ftp://ftp.webmonster.de/pub/openssl/source/ \
+       ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 


@@ -40,8 +43,12 @@ $(PKG_BUILD_DIR)/.configured:
 $(PKG_BUILD_DIR)/.built:
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
 $(PKG_BUILD_DIR)/.built:
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)

+       $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
+               MAKEDEPPROG="$(TARGET_CC)" \
+               depend

        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                CC="$(TARGET_CC)" \
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                CC="$(TARGET_CC)" \

+               CCOPTS="$(TARGET_CFLAGS) -fomit-frame-pointer" \

                AR="$(TARGET_CROSS)ar r" \
                RANLIB="$(TARGET_CROSS)ranlib" \
                all build-shared
                AR="$(TARGET_CROSS)ar r" \
                RANLIB="$(TARGET_CROSS)ranlib" \
                all build-shared


@@ -49,6 +56,7 @@ $(PKG_BUILD_DIR)/.built:
        -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                CC=$(TARGET_CC) \
        -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                CC=$(TARGET_CC) \

+               CCOPTS="$(TARGET_CFLAGS) -fomit-frame-pointer" \

                do_linux-shared
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
                do_linux-shared
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
                INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \


@@ -83,8 +91,8 @@ install-dev: $(STAGING_DIR)/usr/lib/libssl.so
 
 uninstall-dev:
        rm -rf \
 
 uninstall-dev:
        rm -rf \

-         $(STAGING_DIR)/usr/include/openssl \
-         $(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} \
+               $(STAGING_DIR)/usr/include/openssl \
+               $(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} \

 
 compile: install-dev
 clean: uninstall-dev
 
 compile: install-dev
 clean: uninstall-dev