summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-05-20 11:50:56 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2015-05-22 23:43:54 (GMT)
commitb0d6c663b4fdce7bca0183e9a3616e35cab42477 (patch)
tree15bbff0ae0068c44b89aab40e4f28f5bd00bbc9f
parent0fe1e904baf8e652af7727cfb4856eeb11da7e76 (diff)
allow parallel building, do not install docs
-rw-r--r--package/openssl/Makefile3
-rw-r--r--package/openssl/patches/patch-Makefile_org11
2 files changed, 11 insertions, 3 deletions
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 3d38ec7..e2e310e 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= openssl
PKG_VERSION:= 1.0.2a
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_HASH:= 15b6393c20030aab02c8e2fe0243cb1d1d18062f6c095d67bca91871dc7f324a
PKG_DESCR:= secure socket layer libraries
PKG_SECTION:= libs/crypto
@@ -15,7 +15,6 @@ PKG_URL:= http://www.openssl.org/
PKG_SITES:= http://www.openssl.org/source/
PKG_LIBNAME:= libopenssl
PKG_OPTS:= dev
-PKG_NOPARALLEL:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/openssl/patches/patch-Makefile_org b/package/openssl/patches/patch-Makefile_org
index dca3751..aa70bcc 100644
--- a/package/openssl/patches/patch-Makefile_org
+++ b/package/openssl/patches/patch-Makefile_org
@@ -1,5 +1,5 @@
--- openssl-1.0.2a.orig/Makefile.org 2015-03-19 14:30:36.000000000 +0100
-+++ openssl-1.0.2a/Makefile.org 2015-04-06 10:52:37.192455300 +0200
++++ openssl-1.0.2a/Makefile.org 2015-05-20 08:33:17.000000000 +0200
@@ -136,7 +136,7 @@ FIPSCANLIB=
BASEADDR=
@@ -9,3 +9,12 @@
ENGDIRS= ccgost
SHLIBDIRS= crypto ssl
+@@ -536,7 +536,7 @@ dist:
+ dist_pem_h:
+ (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+
+-install: all install_docs install_sw
++install: all install_sw
+
+ install_sw:
+ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \