From 917b213d79ae646e0cc5ace3511dca69d84ddae8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 12 Aug 2014 07:28:42 +0200 Subject: refresh patch --- package/openssl/patches/patch-Makefile | 96 ++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 package/openssl/patches/patch-Makefile (limited to 'package') diff --git a/package/openssl/patches/patch-Makefile b/package/openssl/patches/patch-Makefile new file mode 100644 index 000000000..f1fc87d21 --- /dev/null +++ b/package/openssl/patches/patch-Makefile @@ -0,0 +1,96 @@ +--- openssl-1.0.1i.orig/Makefile 2014-08-06 23:18:45.000000000 +0200 ++++ openssl-1.0.1i/Makefile 2014-08-07 10:03:55.000000000 +0200 +@@ -11,11 +11,11 @@ SHLIB_VERSION_NUMBER=1.0.0 + SHLIB_VERSION_HISTORY= + SHLIB_MAJOR=1 + SHLIB_MINOR=0.0 +-SHLIB_EXT= +-PLATFORM=dist +-OPTIONS= no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-store no-unit-test no-zlib no-zlib-dynamic static-engine +-CONFIGURE_ARGS=dist +-SHLIB_TARGET= ++SHLIB_EXT=.so.$(SHLIB_MAJOR).$(SHLIB_MINOR) ++PLATFORM=linux-embedded ++OPTIONS=--prefix=/usr --openssldir=/etc/ssl -I/home/wbx/adk/target_qemu-x86_uclibc-ng_i686/usr/include -L/home/wbx/adk/target_qemu-x86_uclibc-ng_i686/usr/lib -DOPENSSL_SMALL_FOOTPRINT enable-shared enable-threads enable-zlib-dynamic no-aes192 no-camellia no-cast no-ec_nistp_64_gcc_128 no-engines no-err no-gmp no-idea no-jpake no-krb5 no-md2 no-mdc2 no-rc5 no-rfc3779 no-ripemd no-sctp no-sha0 no-smime no-store no-unit-test no-static-engine ++CONFIGURE_ARGS=linux-embedded --prefix=/usr --openssldir=/etc/ssl -I/home/wbx/adk/target_qemu-x86_uclibc-ng_i686/usr/include -L/home/wbx/adk/target_qemu-x86_uclibc-ng_i686/usr/lib -DOPENSSL_SMALL_FOOTPRINT shared threads no-err no-krb5 zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast ++SHLIB_TARGET=linux-shared + + # HERE indicates where this Makefile lives. This can be used to indicate + # where sub-Makefiles are expected to be. Currently has very limited usage, +@@ -26,10 +26,10 @@ HERE=. + # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/. + # Normally it is left empty. + INSTALL_PREFIX= +-INSTALLTOP=/usr/local/ssl ++INSTALLTOP=/usr + + # Do not edit this manually. Use Configure --openssldir=DIR do change this! +-OPENSSLDIR=/usr/local/ssl ++OPENSSLDIR=/etc/ssl + + # NO_IDEA - Define to build without the IDEA algorithm + # NO_RC4 - Define to build without the RC4 algorithm +@@ -59,16 +59,17 @@ OPENSSLDIR=/usr/local/ssl + # equal 4. + # PKCS1_CHECK - pkcs1 tests. + +-CC= cc +-CFLAG= -O +-DEPFLAG= -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST ++CROSS_COMPILE= /home/wbx/adk/toolchain_qemu-x86_uclibc-ng_i686/usr/bin/i686-openadk-linux-uclibc- ++CC= $(CROSS_COMPILE)/home/wbx/adk/toolchain_qemu-x86_uclibc-ng_i686/usr/bin/i686-openadk-linux-uclibc-gcc ++CFLAG= -fPIC -DOPENSSL_PIC -DZLIB_SHARED -DZLIB -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -I/home/wbx/adk/target_qemu-x86_uclibc-ng_i686/usr/include -DOPENSSL_SMALL_FOOTPRINT -DOPENSSL_NO_ERR -DTERMIOS $(OPTIMIZATION_FLAGS) -Wall ++DEPFLAG= -DOPENSSL_NO_AES192 -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAST -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_ENGINES -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_RIPEMD -DOPENSSL_NO_SCTP -DOPENSSL_NO_SHA0 -DOPENSSL_NO_SMIME -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST + PEX_LIBS= +-EX_LIBS= ++EX_LIBS= -L/home/wbx/adk/target_qemu-x86_uclibc-ng_i686/usr/lib -ldl + EXE_EXT= + ARFLAGS= +-AR= ar $(ARFLAGS) r +-RANLIB= /usr/bin/ranlib +-NM= nm ++AR= $(CROSS_COMPILE)ar $(ARFLAGS) r ++RANLIB= $(CROSS_COMPILE)ranlib ++NM= $(CROSS_COMPILE)nm + PERL= /usr/bin/perl + TAR= tar + TARFLAGS= --no-recursion --record-size=10240 +@@ -103,7 +104,7 @@ WP_ASM_OBJ= wp_block.o + CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o + MODES_ASM_OBJ= + ENGINES_ASM_OBJ= +-PERLASM_SCHEME= ++PERLASM_SCHEME= void + + # KRB5 stuff + KRB5_INCLUDES= +@@ -137,15 +138,15 @@ FIPSCANLIB= + + BASEADDR=0xFB00000 + +-DIRS= crypto ssl engines apps test tools ++DIRS= crypto ssl engines apps tools + ENGDIRS= ccgost + SHLIBDIRS= crypto ssl + + # dirs in crypto to build + SDIRS= \ + objects \ +- md4 md5 sha mdc2 hmac ripemd whrlpool \ +- des aes rc2 rc4 idea bf cast camellia seed modes \ ++ md4 md5 sha hmac whrlpool \ ++ des aes rc2 rc4 bf seed modes \ + bn ec rsa dsa ecdsa dh ecdh dso engine \ + buffer bio stack lhash rand err \ + evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \ +@@ -174,8 +175,8 @@ WDIRS= windows + LIBS= libcrypto.a libssl.a + SHARED_CRYPTO=libcrypto$(SHLIB_EXT) + SHARED_SSL=libssl$(SHLIB_EXT) +-SHARED_LIBS= +-SHARED_LIBS_LINK_EXTS= ++SHARED_LIBS=$(SHARED_CRYPTO) $(SHARED_SSL) ++SHARED_LIBS_LINK_EXTS=.so.$(SHLIB_MAJOR) .so + SHARED_LDFLAGS= + + GENERAL= Makefile -- cgit v1.2.3