diff options
Diffstat (limited to 'package/openssl')
| -rw-r--r-- | package/openssl/Makefile | 18 | ||||
| -rw-r--r-- | package/openssl/patches/patch-Configure | 2 |
2 files changed, 7 insertions, 13 deletions
diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 37a564256..a41525ded 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssl PKG_VERSION:= 1.0.1e -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 66bf6f10f060d561929de96f9dfe5b8c PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries PKG_SECTION:= libs @@ -13,26 +13,24 @@ PKG_DEPENDS:= zlib PKG_BUILDDEP:= zlib PKG_URL:= http://www.openssl.org/ PKG_SITES:= http://www.openssl.org/source/ +PKG_LIBNAME:= libopenssl +PKG_OPTS:= dev -PKG_SUBPKGS:= LIBOPENSSL LIBOPENSSL_DEV OPENSSL_UTIL +PKG_SUBPKGS:= LIBOPENSSL OPENSSL_UTIL PKGSD_OPENSSL_UTIL:= OpenSSL command line tool PKGSC_OPENSSL_UTIL:= crypto PKGSS_OPENSSL_UTIL:= libopenssl -PKGSD_LIBOPENSSL_DEV:= development files for openssl -PKGSC_LIBOPENSSL_DEV:= devel -PKGSS_LIBOPENSSL_DEV:= libopenssl PKG_FLAVOURS_LIBOPENSSL:= WITH_CRYPTODEV PKGFD_WITH_CRYPTODEV:= enable support for cryptodev-linux ifeq ($(ADK_STATIC),y) -PKG_OPTS:= libonly +PKG_OPTS+= libmix endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS))) -$(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBOPENSSL_DEV},${PKGSD_LIBOPENSSL_DEV},${PKGSC_LIBOPENSSL_DEV})) $(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSL_UTIL},${PKGSD_OPENSSL_UTIL},${PKGSC_OPENSSL_UTIL})) CONFIG_STYLE:= manual @@ -59,7 +57,7 @@ post-extract: do-configure: (cd $(WRKBUILD); \ - PATH=$(TARGET_PATH) \ + PATH='$(TARGET_PATH)' \ OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \ ./Configure $(CONFIG) \ --prefix=/usr \ @@ -90,8 +88,4 @@ openssl-util-install: ${CP} ${WRKSRC}/apps/openssl.cnf ${IDIR_OPENSSL_UTIL}/etc/ssl/ chmod 0700 ${IDIR_OPENSSL_UTIL}/etc/ssl/private -libopenssl-dev-install: - ${INSTALL_DIR} ${IDIR_LIBOPENSSL_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBOPENSSL_DEV}/usr/include - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openssl/patches/patch-Configure b/package/openssl/patches/patch-Configure index 2f1213e0e..5d9f9329f 100644 --- a/package/openssl/patches/patch-Configure +++ b/package/openssl/patches/patch-Configure @@ -5,7 +5,7 @@ "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:-DTERMIOS \$(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 -DTERMIOS -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", ++"linux-embedded-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIOS \$(OPTIMIZATION_FLAGS) -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", # 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)", |