From 747d98ea03f7ba4181f0b9185d3d73d1734bb8d1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 31 Jan 2013 14:37:35 +0100 Subject: fix build on x86_64 --- package/openssl/Makefile | 12 +++++++++--- package/openssl/patches/patch-Configure | 11 ++++++----- package/openssl/patches/patch-Makefile_org | 10 +++++----- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 411a79b15..d6dcd5ce0 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssl PKG_VERSION:= 1.0.1c -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= ae412727c8c15b67880aef7bd2999b2e PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries PKG_SECTION:= libs @@ -53,11 +53,17 @@ ifneq ($(ADK_PACKAGE_LIBOPENSSL_WITH_CRYPTODEV),) OPENSSL_OPTIONS+= -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS endif +ifeq ($(ADK_LINUX_X86_64),y) +CONFIG:= linux-embedded-x86_64 +else +CONFIG:= linux-embedded +endif + do-configure: (cd $(WRKBUILD); \ PATH=$(TARGET_PATH) \ OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \ - ./Configure linux-embedded \ + ./Configure $(CONFIG) \ --prefix=/usr \ --openssldir=/etc/ssl \ -I$(STAGING_TARGET_DIR)/usr/include \ @@ -76,7 +82,7 @@ do-build: post-install: ${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib - ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib + ${CP} ${WRKINST}/usr/lib*/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so* openssl-util-install: diff --git a/package/openssl/patches/patch-Configure b/package/openssl/patches/patch-Configure index 9275cd530..d5ec7cc28 100644 --- a/package/openssl/patches/patch-Configure +++ b/package/openssl/patches/patch-Configure @@ -1,10 +1,11 @@ ---- openssl-1.0.0.orig/Configure 2010-01-19 22:40:54.000000000 +0100 -+++ openssl-1.0.0/Configure 2010-05-29 15:58:43.561613735 +0200 -@@ -379,6 +379,7 @@ my %table=( +--- openssl-1.0.1c.orig/Configure 2012-03-14 23:20:40.000000000 +0100 ++++ openssl-1.0.1c/Configure 2013-01-31 14:32:14.000000000 +0100 +@@ -400,6 +400,8 @@ my %table=( "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", +"linux-embedded","gcc:-DTERMIO \$(OPTIMIZATION_FLAGS) -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-embedded-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", - #### *BSD [do see comment about ${BSDthreads} above!] - "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + # Android: linux-* but without -DTERMIO and pointers to headers and libs. + "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/package/openssl/patches/patch-Makefile_org b/package/openssl/patches/patch-Makefile_org index f72030d14..f19124dbe 100644 --- a/package/openssl/patches/patch-Makefile_org +++ b/package/openssl/patches/patch-Makefile_org @@ -1,8 +1,8 @@ ---- openssl-1.0.0d.orig/Makefile.org 2010-01-27 17:06:58.000000000 +0100 -+++ openssl-1.0.0d/Makefile.org 2011-10-12 06:07:40.993200000 +0200 -@@ -109,7 +109,7 @@ LIBKRB5= - ZLIB_INCLUDE= - LIBZLIB= +--- openssl-1.0.1c.orig/Makefile.org 2012-04-22 15:25:19.000000000 +0200 ++++ openssl-1.0.1c/Makefile.org 2013-01-31 14:28:34.000000000 +0100 +@@ -135,7 +135,7 @@ FIPSCANLIB= + + BASEADDR= -DIRS= crypto ssl engines apps test tools +DIRS= crypto ssl engines apps tools -- cgit v1.2.3