From cf7b3a1a36c7f60cc32117f4521c6571f68416a3 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Tue, 21 Feb 2023 11:21:59 -0600 Subject: [PATCH] package/libuio: migrate to new autopoint flag Drop patch that is no longer necessary after moving to new package flag. Add patch to fix builds due to missing required files. Signed-off-by: Vincent Fazio Signed-off-by: Arnout Vandecappelle --- ...0001-configure-remove-po-Makefile.in.patch | 26 ---------------- ...c-set-automake-strictness-to-foreign.patch | 31 +++++++++++++++++++ package/libuio/libuio.mk | 2 +- 3 files changed, 32 insertions(+), 27 deletions(-) delete mode 100644 package/libuio/0001-configure-remove-po-Makefile.in.patch create mode 100644 package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch diff --git a/package/libuio/0001-configure-remove-po-Makefile.in.patch b/package/libuio/0001-configure-remove-po-Makefile.in.patch deleted file mode 100644 index 067465cc31..0000000000 --- a/package/libuio/0001-configure-remove-po-Makefile.in.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c5fa0b778e1c2a7d03ff6e661bdfa2faef878f68 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 1 Jul 2016 17:56:30 +0200 -Subject: [PATCH] configure: remove po/Makefile.in - -The file po/Makefile.in is automatically added to AC_OUTPUT while using gettexize - -Signed-off-by: Romain Naour ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f7fb40f..a25e463 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,5 +55,4 @@ dnl last but not least - AC_OUTPUT([Makefile - libuio.dox - libuio-uninstalled.pc -- libuio.pc -- po/Makefile.in]) -+ libuio.pc]) --- -2.5.5 - diff --git a/package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch b/package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch new file mode 100644 index 0000000000..1ce91f01f3 --- /dev/null +++ b/package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch @@ -0,0 +1,31 @@ +From 546e07b2405455c03b7eb0d392c331e189913bc4 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 31 Jan 2023 19:06:29 -0600 +Subject: [PATCH] configure.ac: set automake strictness to foreign + +libuio does not conform to the GNU's strict layout requirements. [1] + +Set the strictness to foreign to account for this. + +[1] https://www.gnu.org/software/automake/manual/html_node/Strictness.html + +Signed-off-by: Vincent Fazio +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 101abd3..ef46171 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,6 +1,6 @@ + dnl Every other copy of the package version number gets its value from here + AC_INIT(libuio, 0.2.8, https://github.com/linutronix/libuio/issues) +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + + AM_CONFIG_HEADER(config.h) + +-- +2.25.1 + diff --git a/package/libuio/libuio.mk b/package/libuio/libuio.mk index a0285277ab..d5019af594 100644 --- a/package/libuio/libuio.mk +++ b/package/libuio/libuio.mk @@ -14,7 +14,7 @@ LIBUIO_LIBS = $(TARGET_NLS_LIBS) LIBUIO_INSTALL_STAGING = YES # Fetched from github, no pre-generated configure script provided -LIBUIO_GETTEXTIZE = YES +LIBUIO_AUTOPOINT = YES LIBUIO_AUTORECONF = YES # Avoid build issue when makeinfo is missing