diff mbox series

[meta-darwin,05/11] automake: disable ar 'D' option

Message ID 20240610143214.2376414-5-ecordonnier@snap.com
State New
Headers show
Series [meta-darwin,01/11] layer.conf/README: update to scarthgap | expand

Commit Message

Etienne Cordonnier June 10, 2024, 2:32 p.m. UTC 
From: Etienne Cordonnier <ecordonnier@snap.com>

This option (deterministic mode) does not exist on MacOS.

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
---
 .../automake/0001-Remove-ar-D-argument.patch  | 29 +++++++++++++++++++
 recipes-devtools/automake/automake_%.bbappend |  5 ++++
 2 files changed, 34 insertions(+)
 create mode 100644 recipes-devtools/automake/automake/0001-Remove-ar-D-argument.patch
 create mode 100644 recipes-devtools/automake/automake_%.bbappend
diff mbox series

Patch

diff --git a/recipes-devtools/automake/automake/0001-Remove-ar-D-argument.patch b/recipes-devtools/automake/automake/0001-Remove-ar-D-argument.patch
new file mode 100644
index 0000000..e66b5ad
--- /dev/null
+++ b/recipes-devtools/automake/automake/0001-Remove-ar-D-argument.patch
@@ -0,0 +1,29 @@ 
+From 862a7ca3269b54a595051454c6fbb3c45688d929 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Sat, 8 Jun 2024 22:39:08 +0200
+Subject: [PATCH] Remove ar 'D' argument
+
+Poky patch "automake/0001-Drop-ar-u-argument.patch" adds the argument 'D' (deterministic mode),
+however this option does not exist on MacOS.
+
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+ bin/automake.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/automake.in b/bin/automake.in
+index dbcf47c..0f2b84b 100644
+--- a/bin/automake.in
++++ b/bin/automake.in
+@@ -2678,7 +2678,7 @@ sub handle_libraries ()
+     }
+ 
+   define_variable ('AR', 'ar', INTERNAL);
+-  define_variable ('ARFLAGS', 'crD', INTERNAL);
++  define_variable ('ARFLAGS', 'cr', INTERNAL);
+   define_verbose_tagvar ('AR');
+ 
+   foreach my $pair (@liblist)
+-- 
+2.34.1
+
diff --git a/recipes-devtools/automake/automake_%.bbappend b/recipes-devtools/automake/automake_%.bbappend
new file mode 100644
index 0000000..4820dd9
--- /dev/null
+++ b/recipes-devtools/automake/automake_%.bbappend
@@ -0,0 +1,5 @@ 
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI:append = " \
+    file://0001-Remove-ar-D-argument.patch \
+    "