[tools] gmp: update to 5.0.4

[openwrt.git] / package / openssl / patches / 160-disable_doc_tests.patch

diff --git a/package/openssl/patches/160-disable_doc_tests.patch b/package/openssl/patches/160-disable_doc_tests.patch
index 8c042ef..d0bf19a 100644 (file)
--- a/package/openssl/patches/160-disable_doc_tests.patch
+++ b/package/openssl/patches/160-disable_doc_tests.patch
@@ -1,15 +1,15 @@
 --- a/Makefile
 +++ b/Makefile
 --- a/Makefile
 +++ b/Makefile

-@@ -134,7 +134,7 @@ FIPSCANLIB=
+@@ -137,7 +137,7 @@ FIPSCANLIB=

  
  BASEADDR=0xFB00000
  
 -DIRS=   crypto ssl engines apps test tools
 +DIRS=   crypto ssl engines apps tools
  
  BASEADDR=0xFB00000
  
 -DIRS=   crypto ssl engines apps test tools
 +DIRS=   crypto ssl engines apps tools

+ ENGDIRS= ccgost

  SHLIBDIRS= crypto ssl
  
  SHLIBDIRS= crypto ssl
  

- # dirs in crypto to build
-@@ -151,7 +151,7 @@ SDIRS=  \
+@@ -155,7 +155,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
  

-@@ -163,7 +163,7 @@ SHELL=/bin/sh
+@@ -169,7 +169,7 @@ SHELL=/bin/sh

  
  TOP=    .
  ONEDIRS=out tmp
  
  TOP=    .
  ONEDIRS=out tmp


@@ -27,16 +27,16 @@
  WDIRS=  windows
  LIBS=   libcrypto.a libssl.a
  SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
  WDIRS=  windows
  LIBS=   libcrypto.a libssl.a
  SHARED_CRYPTO=libcrypto$(SHLIB_EXT)

-@@ -323,7 +323,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
-       ../crypto/uid.o
+@@ -270,7 +270,7 @@ reflect:
+       @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)

  
  sub_all: build_all
 -build_all: build_libs build_apps build_tests build_tools
 +build_all: build_libs build_apps build_tools
  
  
  sub_all: build_all
 -build_all: build_libs build_apps build_tests build_tools
 +build_all: build_libs build_apps build_tools
  

- build_libs: build_crypto build_fips build_ssl build_shared build_engines
+ build_libs: build_crypto build_ssl build_engines

  
  

-@@ -617,7 +617,7 @@ dist:   
+@@ -539,7 +539,7 @@ dist:

  dist_pem_h:
        (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
  
  dist_pem_h:
        (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
  


@@ -47,7 +47,7 @@
        @$(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

-@@ -615,7 +615,7 @@ dist:   
+@@ -537,7 +537,7 @@ dist:

  dist_pem_h:
        (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
  
  dist_pem_h:
        (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)