aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2019-02-28 18:43:38 +0100
committerAlexander Couzens <lynxis@fe80.eu>2019-02-28 19:09:35 +0100
commitb2bf3745ff7e5e2fbf3b7b0e488cfaa5b3cca87c (patch)
tree3ed0fadae87ea44841c03401e27aa6cb4d054a56
parentba3690c90c9717871ec71b24d22d9da2f283762f (diff)
downloadupstream-b2bf3745ff7e5e2fbf3b7b0e488cfaa5b3cca87c.tar.gz
upstream-b2bf3745ff7e5e2fbf3b7b0e488cfaa5b3cca87c.tar.bz2
upstream-b2bf3745ff7e5e2fbf3b7b0e488cfaa5b3cca87c.zip
package/ncurses: change AR options to fix reproducible builds
ar has a deterministic (-D) and non-deterministic (-U) mode. OpenWrt is already using the deterministic mode by default, but ncurses' configure script force this to be non-deterministic. Since autoreconf fails to generate a new configure, the configure script is directly modified. Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
-rw-r--r--package/libs/ncurses/Makefile2
-rw-r--r--package/libs/ncurses/patches/103-ncurses-ar-determinism.patch22
2 files changed, 23 insertions, 1 deletions
diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile
index 604a02db52..8c961f30b2 100644
--- a/package/libs/ncurses/Makefile
+++ b/package/libs/ncurses/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ncurses
PKG_VERSION:=6.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch b/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch
new file mode 100644
index 0000000000..d4c8f11703
--- /dev/null
+++ b/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch
@@ -0,0 +1,22 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -451,7 +451,7 @@ AC_REQUIRE([CF_PROG_AR])
+
+ AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
+ cf_cv_ar_flags=unknown
+- for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
++ for cf_ar_flags in -curvD -curv curv -crv crv -cqv cqv -rv rv
+ do
+
+ # check if $ARFLAGS already contains this choice
+--- a/configure
++++ b/configure
+@@ -4503,7 +4503,7 @@ if test "${cf_cv_ar_flags+set}" = set; t
+ else
+
+ cf_cv_ar_flags=unknown
+- for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
++ for cf_ar_flags in -curvD -curv curv -crv crv -cqv cqv -rv rv
+ do
+
+ # check if $ARFLAGS already contains this choice