Fix building when target arch = i386

[openwrt.git] / package / openssl / Makefile

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 50e334c..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
 


@@ -62,18 +65,18 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBOPENSSL):
        install -d -m0755 $(IDIR_LIBOPENSSL)/usr/lib
 
 $(IPKG_LIBOPENSSL):
        install -d -m0755 $(IDIR_LIBOPENSSL)/usr/lib

-       cp -fp $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(IDIR_LIBOPENSSL)/usr/lib/
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(IDIR_LIBOPENSSL)/usr/lib/

        chmod 0644 $(IDIR_LIBOPENSSL)/usr/lib/*
        $(RSTRIP) $(IDIR_LIBOPENSSL)
        $(IPKG_BUILD) $(IDIR_LIBOPENSSL) $(PACKAGE_DIR)
 
 $(IPKG_OPENSSL_UTIL):
        install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl
        chmod 0644 $(IDIR_LIBOPENSSL)/usr/lib/*
        $(RSTRIP) $(IDIR_LIBOPENSSL)
        $(IPKG_BUILD) $(IDIR_LIBOPENSSL) $(PACKAGE_DIR)
 
 $(IPKG_OPENSSL_UTIL):
        install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl

-       cp -fp $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(IDIR_OPENSSL_UTIL)/etc/ssl/
+       cp -fpR $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(IDIR_OPENSSL_UTIL)/etc/ssl/

        install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl/certs
        install -d -m0700 $(IDIR_OPENSSL_UTIL)/etc/ssl/private
        install -d -m0755 $(IDIR_OPENSSL_UTIL)/usr/bin
        install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl/certs
        install -d -m0700 $(IDIR_OPENSSL_UTIL)/etc/ssl/private
        install -d -m0755 $(IDIR_OPENSSL_UTIL)/usr/bin

-       cp -fp $(PKG_INSTALL_DIR)/usr/bin/openssl $(IDIR_OPENSSL_UTIL)/usr/bin/
+       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/openssl $(IDIR_OPENSSL_UTIL)/usr/bin/

        $(RSTRIP) $(IDIR_OPENSSL_UTIL)
        $(IPKG_BUILD) $(IDIR_OPENSSL_UTIL) $(PACKAGE_DIR)
 
        $(RSTRIP) $(IDIR_OPENSSL_UTIL)
        $(IPKG_BUILD) $(IDIR_OPENSSL_UTIL) $(PACKAGE_DIR)
 


@@ -81,7 +84,7 @@ $(STAGING_DIR)/usr/lib/libssl.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/openssl $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/include
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/openssl $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib/

-       cp -fp $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/

        touch $@
        
 install-dev: $(STAGING_DIR)/usr/lib/libssl.so
        touch $@
        
 install-dev: $(STAGING_DIR)/usr/lib/libssl.so