From 03afb3f0efeeece8eb3767c24ab821f352790841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 28 Aug 2018 15:15:59 +0200 Subject: [PATCH] libasr: fix build (automake version check) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- .../libasr/patches/bootstrap-automake.patch | 11 +++++++++ .../patches/musl-inline-res_randomid.patch | 24 ------------------- 2 files changed, 11 insertions(+), 24 deletions(-) create mode 100644 srcpkgs/libasr/patches/bootstrap-automake.patch delete mode 100644 srcpkgs/libasr/patches/musl-inline-res_randomid.patch diff --git a/srcpkgs/libasr/patches/bootstrap-automake.patch b/srcpkgs/libasr/patches/bootstrap-automake.patch new file mode 100644 index 00000000000..e5036cae0cf --- /dev/null +++ b/srcpkgs/libasr/patches/bootstrap-automake.patch @@ -0,0 +1,11 @@ +--- bootstrap 2018-08-28 15:14:58.777885703 +0200 ++++ bootstrap 2018-08-28 15:14:50.697886185 +0200 +@@ -36,7 +36,7 @@ + + # Check for automake + amvers="no" +-for v in 15 14 13 12 11 10 9 8 7 6 5; do ++for v in 16 15 14 13 12 11 10 9 8 7 6 5; do + if automake-1.${v} --version >/dev/null 2>&1; then + amvers="-1.${v}" + break diff --git a/srcpkgs/libasr/patches/musl-inline-res_randomid.patch b/srcpkgs/libasr/patches/musl-inline-res_randomid.patch deleted file mode 100644 index 1fe96baade4..00000000000 --- a/srcpkgs/libasr/patches/musl-inline-res_randomid.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git configure.ac configure.ac -index 10aff04..07e149f 100644 ---- configure.ac -+++ configure.ac -@@ -456,6 +456,7 @@ AC_CHECK_FUNCS([ \ - issetugid \ - memmove \ - reallocarray \ -+ res_randomid \ - snprintf \ - strdup \ - strerror \ -diff --git src/asr_private.h src/asr_private.h -index 0960e37..158e7ff 100644 ---- src/asr_private.h -+++ src/asr_private.h -@@ -365,3 +365,7 @@ extern FILE * asr_debug; - asr_statestr((a)->as_state), \ - asr_statestr((s))); \ - (a)->as_state = (s); } while (0) -+ -+#ifndef HAVE_RES_RANDOMID -+#define res_randomid(x) (0xffff & getpid()) -+#endif