diff options
| author | Sylvain CECCHETTO <cecchetto.sylvain@me.com> | 2020-09-24 08:36:57 +0200 |
|---|---|---|
| committer | Sylvain CECCHETTO <cecchetto.sylvain@me.com> | 2020-09-24 08:50:50 +0200 |
| commit | d139f786905038887167711e60d79940122d0dff (patch) | |
| tree | 392f9e966285a0789ee18d5c873f29165057a9fb /tools | |
| parent | 963c6d97fdea6e6bed3e134d6af8f9e0166f11c2 (diff) | |
[depends/nettle] Patch to fix Xcode 12 builds
See https://git.lysator.liu.se/nettle/nettle/-/merge_requests/9
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/nettle/02-conftest_exit.patch | 21 | ||||
| -rw-r--r-- | tools/depends/target/nettle/Makefile | 4 |
2 files changed, 24 insertions, 1 deletions
diff --git a/tools/depends/target/nettle/02-conftest_exit.patch b/tools/depends/target/nettle/02-conftest_exit.patch new file mode 100644 index 0000000000..bdc6c0400c --- /dev/null +++ b/tools/depends/target/nettle/02-conftest_exit.patch @@ -0,0 +1,21 @@ +--- 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 f184912e42..dbc0cc65c0 100644 --- a/tools/depends/target/nettle/Makefile +++ b/tools/depends/target/nettle/Makefile @@ -1,5 +1,5 @@ include ../../Makefile.include -DEPS= ../../Makefile.include Makefile 01-disable_testsuite.patch +DEPS= ../../Makefile.include Makefile 01-disable_testsuite.patch 02-conftest_exit.patch # lib name, version LIBNAME=nettle @@ -22,6 +22,8 @@ $(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=" " $(LIBDYLIB): $(PLATFORM) |