diff mbox series

[meta-darwin,06/11] binutils: update to scarthgap (disable libctf)

Message ID 20240610143214.2376414-6-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>

libctf does not compile with scarthgap. Let's disable it (I don't think anybody is using it with meta-darwin).

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
---
 .../0001-OS-1142-Do-not-use-nm-B-for-Darwin-s-nm.patch | 10 +++++-----
 recipes-devtools/binutils/binutils_%.bbappend          |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/recipes-devtools/binutils/binutils/0001-OS-1142-Do-not-use-nm-B-for-Darwin-s-nm.patch b/recipes-devtools/binutils/binutils/0001-OS-1142-Do-not-use-nm-B-for-Darwin-s-nm.patch
index 6d28872..bc7336c 100644
--- a/recipes-devtools/binutils/binutils/0001-OS-1142-Do-not-use-nm-B-for-Darwin-s-nm.patch
+++ b/recipes-devtools/binutils/binutils/0001-OS-1142-Do-not-use-nm-B-for-Darwin-s-nm.patch
@@ -21,26 +21,26 @@  Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/libbacktrace/configure b/libbacktrace/configure
-index 90667680701..dec8d96771b 100755
+index 406b67b8cbc..8a51b1ee0da 100755
 --- a/libbacktrace/configure
 +++ b/libbacktrace/configure
 @@ -5846,7 +5846,7 @@ else
         # Adding the `sed 1q' prevents false positives on HP-UX, which says:
         #   nm: unknown option "B" ignored
-        case `"$tmp_nm" -B "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
+        case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
 -       *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
 +       *$tmp_nm*) lt_cv_path_NM="$tmp_nm"
  	 break
  	 ;;
         *)
 diff --git a/libctf/configure b/libctf/configure
-index 1b0ee0d32c6..f77ae01e21a 100755
+index a0e40f49a80..00fba29d253 100755
 --- a/libctf/configure
 +++ b/libctf/configure
-@@ -5982,7 +5982,7 @@ else
+@@ -5967,7 +5967,7 @@ else
         # Adding the `sed 1q' prevents false positives on HP-UX, which says:
         #   nm: unknown option "B" ignored
-        case `"$tmp_nm" -B "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
+        case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
 -       *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
 +       *$tmp_nm*) lt_cv_path_NM="$tmp_nm"
  	 break
diff --git a/recipes-devtools/binutils/binutils_%.bbappend b/recipes-devtools/binutils/binutils_%.bbappend
index d6827ab..03e4ceb 100644
--- a/recipes-devtools/binutils/binutils_%.bbappend
+++ b/recipes-devtools/binutils/binutils_%.bbappend
@@ -12,3 +12,6 @@  FILES:${PN} += " \
 # TODO: Needs to be fixed by packaging this right
 # We should filter .debug out to the dbg package
 INSANE_SKIP:nativesdk-binutils = "debug-files"
+
+# nativesdk-binutils's libctf doesn't compile. disable it
+PACKAGECONFIG[libctf] = "--enable-libctf=yes,--enable-libctf=no"