diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2021-12-02 06:14:36 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-02 06:14:36 +1000 |
| commit | be639b99b0e1e8c8df44ab8ab38c027ce0a09adb (patch) | |
| tree | 061f2a0a5fb056de5a942c22921bd220c723a86a /tools/depends/target | |
| parent | 4cb68fe163be4e8c7d927413186f26d6fd3826bb (diff) | |
| parent | a34fb000afced27ca71c954abf55c6405dd05de6 (diff) | |
Merge pull request #20584 from fuzzard/depends_nettle
[tools/depends][target] bump nettle 3.7.3
Diffstat (limited to 'tools/depends/target')
| -rw-r--r-- | tools/depends/target/nettle/01-disable_testsuite.patch | 4 | ||||
| -rw-r--r-- | tools/depends/target/nettle/02-conftest_exit.patch | 21 | ||||
| -rw-r--r-- | tools/depends/target/nettle/Makefile | 7 |
3 files changed, 5 insertions, 27 deletions
diff --git a/tools/depends/target/nettle/01-disable_testsuite.patch b/tools/depends/target/nettle/01-disable_testsuite.patch index b734d306be..99b4b22da0 100644 --- a/tools/depends/target/nettle/01-disable_testsuite.patch +++ b/tools/depends/target/nettle/01-disable_testsuite.patch @@ -1,8 +1,8 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -17,7 +17,7 @@ +@@ -19,7 +19,7 @@ - OPT_NETTLE_SOURCES = @OPT_NETTLE_SOURCES@ + FAT_TEST_LIST = @FAT_TEST_LIST@ -SUBDIRS = tools testsuite examples +SUBDIRS = tools examples diff --git a/tools/depends/target/nettle/02-conftest_exit.patch b/tools/depends/target/nettle/02-conftest_exit.patch deleted file mode 100644 index bdc6c0400c..0000000000 --- a/tools/depends/target/nettle/02-conftest_exit.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -369,7 +369,7 @@ - int - main () - { -- exit(0); -+ return 0; - } - EOF - gmp_compile="$1 conftest.c" -@@ -410,7 +410,7 @@ - int - main () - { -- exit (0); -+ return 0; - } - EOF - for i in .exe ,ff8 ""; do - diff --git a/tools/depends/target/nettle/Makefile b/tools/depends/target/nettle/Makefile index db0b15ca48..2061470d41 100644 --- a/tools/depends/target/nettle/Makefile +++ b/tools/depends/target/nettle/Makefile @@ -1,9 +1,9 @@ include ../../Makefile.include -DEPS= ../../Makefile.include Makefile 01-disable_testsuite.patch 02-conftest_exit.patch +DEPS= ../../Makefile.include Makefile 01-disable_testsuite.patch # lib name, version LIBNAME=nettle -VERSION=3.6 +VERSION=3.7.3 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz @@ -15,7 +15,7 @@ endif # configuration settings CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ - ./configure --prefix=$(PREFIX) --disable-shared --disable-openssl $(CONFIGURE_FLAGS) + ./configure --prefix=$(PREFIX) --disable-shared --disable-fat --disable-openssl --disable-documentation $(CONFIGURE_FLAGS) LIBDYLIB=$(PLATFORM)/lib$(LIBNAME).a @@ -28,7 +28,6 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); patch -p1 -i ../01-disable_testsuite.patch - cd $(PLATFORM); patch -p1 -i ../02-conftest_exit.patch cd $(PLATFORM); $(AUTORECONF) cd $(PLATFORM); $(CONFIGURE) CCPIC=" " |