projects
/
openwrt
/
staging
/
chunkeey.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openssl: update to 1.0.2o
[openwrt/staging/chunkeey.git]
/
package
/
libs
/
openssl
/
patches
/
160-disable_doc_tests.patch
diff --git
a/package/libs/openssl/patches/160-disable_doc_tests.patch
b/package/libs/openssl/patches/160-disable_doc_tests.patch
index e31ffa5815bf36c0aff95c00e4d5933107660241..e38d44a768cb5c93eb76ddc946dd74dc8eb50f92 100644
(file)
--- a/
package/libs/openssl/patches/160-disable_doc_tests.patch
+++ b/
package/libs/openssl/patches/160-disable_doc_tests.patch
@@
-1,6
+1,6
@@
--- a/Makefile
+++ b/Makefile
--- a/Makefile
+++ b/Makefile
-@@ -13
8,7 +138
,7 @@ FIPSCANLIB=
+@@ -13
9,7 +139
,7 @@ FIPSCANLIB=
BASEADDR=0xFB00000
BASEADDR=0xFB00000
@@
-9,7
+9,7
@@
ENGDIRS= ccgost
SHLIBDIRS= crypto ssl
ENGDIRS= ccgost
SHLIBDIRS= crypto ssl
-@@ -15
6,7 +156
,7 @@ SDIRS= \
+@@ -15
7,7 +157
,7 @@ SDIRS= \
# tests to perform. "alltests" is a special word indicating that all tests
# should be performed.
# tests to perform. "alltests" is a special word indicating that all tests
# should be performed.
@@
-18,7
+18,7
@@
MAKEFILE= Makefile
MAKEFILE= Makefile
-@@ -17
0,7 +170
,7 @@ SHELL=/bin/sh
+@@ -17
1,7 +171
,7 @@ SHELL=/bin/sh
TOP= .
ONEDIRS=out tmp
TOP= .
ONEDIRS=out tmp
@@
-27,18
+27,18
@@
WDIRS= windows
LIBS= libcrypto.a libssl.a
SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
WDIRS= windows
LIBS= libcrypto.a libssl.a
SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
-@@ -271,7 +271,7 @@ reflect:
- @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
+@@ -276,7 +276,7 @@ reflect:
sub_all: build_all
sub_all: build_all
+
-build_all: build_libs build_apps build_tests build_tools
+build_all: build_libs build_apps build_tools
-build_all: build_libs build_apps build_tests build_tools
+build_all: build_libs build_apps build_tools
- build_libs: build_
crypto build_ssl build_engines
+ build_libs: build_
libcrypto build_libssl openssl.pc
-@@ -5
38,7 +538
,7 @@ dist:
- dist_pem_h:
- (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+@@ -5
42,7 +542
,7 @@ dist:
+ @$(MAKE) SDIRS='$(SDIRS)' clean
+ @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
-install: all install_docs install_sw
+install: all install_sw
-install: all install_docs install_sw
+install: all install_sw
@@
-47,9
+47,9
@@
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
--- a/Makefile.org
+++ b/Makefile.org
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
--- a/Makefile.org
+++ b/Makefile.org
-@@ -5
36,7 +536
,7 @@ dist:
- dist_pem_h:
- (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+@@ -5
40,7 +540
,7 @@ dist:
+ @$(MAKE) SDIRS='$(SDIRS)' clean
+ @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
-install: all install_docs install_sw
+install: all install_sw
-install: all install_docs install_sw
+install: all install_sw