Skip to contentSkip to conversation

layer.conf/README: update to scarthgap

PATCH New [email protected] 1 participant 11 messages Jun 10, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/11 layer.conf/README: update to scarthgap

From: Etienne Cordonnier <[email protected]>

---
 README          | 4 ++--
 conf/layer.conf | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
README +2 -2
index 77ffdcc..4cea8d6 100644
@@ -32,11 +32,11 @@ This layer depends on:
 
  URI: git://git.openembedded.org/openembedded-core
  layers: meta
- branch: kirkstone
+ branch: scarthgap
 
  URI: https://github.com/kraj/meta-clang.git
  layers: meta-clang
- branch: kirkstone
+ branch: scarthgap
 
 Layer Maintainers: Richard Purdie <[email protected]>
                    Dominik Schnitzer <[email protected]>
conf/layer.conf +1 -1
index cdac803..2f14754 100644
@@ -1,7 +1,7 @@
 # We have a conf and classes directory, add to BBPATH
 BBPATH := "${BBPATH}:${LAYERDIR}"
 
-LAYERSERIES_COMPAT_meta-darwin = "kirkstone"
+LAYERSERIES_COMPAT_meta-darwin = "scarthgap"
 
 # We have a packages directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
Signature · 1 line
2.36.1.vfs.0.0
#1 lore raw

PATCH 2/11 use classes from poky directly

From: Etienne Cordonnier <[email protected]>

The changes which were needed for Darwin support have been upstreamed to poky in version scarthgap, so there is no need for those files any more.

poky commits:
https://git.yoctoproject.org/poky/commit/?id=02dbf1c7d26b24e6a9f25171522352cb2ff66d5c
https://git.yoctoproject.org/poky/commit/?id=90ea98a24c3df4f36f51b6411ba8963af98a0e19
https://git.yoctoproject.org/poky/commit/?id=3db106c41b22f9152b7253a1310467589eacf9d3
https://git.yoctoproject.org/poky/commit/?id=5031cf42ffb221b52e527d8afc54138c1fb161a1

---
 classes/chrpath.bbclass  |  134 --
 classes/cmake.bbclass    |  219 ----
 classes/package.bbclass  | 2552 --------------------------------------
 classes/siteinfo.bbclass |  226 ----
 4 files changed, 3131 deletions(-)
 delete mode 100644 classes/chrpath.bbclass
 delete mode 100644 classes/cmake.bbclass
 delete mode 100644 classes/package.bbclass
 delete mode 100644 classes/siteinfo.bbclass
classes/chrpath.bbclass deleted +0 -134
deleted file mode 100644
index 873a5b5..0000000
@@ -1,134 +0,0 @@
-CHRPATH_BIN ?= "chrpath"
-PREPROCESS_RELOCATE_DIRS ?= ""
-
-def process_file_linux(cmd, fpath, rootdir, baseprefix, tmpdir, d, break_hardlinks = False):
-    import subprocess, oe.qa
-
-    with oe.qa.ELFFile(fpath) as elf:
-        try:
-            elf.open()
-        except oe.qa.NotELFFileError:
-            return
-
-    try:
-        out = subprocess.check_output([cmd, "-l", fpath], universal_newlines=True)
-    except subprocess.CalledProcessError:
-        return
-
-    # Handle RUNPATH as well as RPATH
-    out = out.replace("RUNPATH=","RPATH=")
-    # Throw away everything other than the rpath list
-    curr_rpath = out.partition("RPATH=")[2]
-    #bb.note("Current rpath for %s is %s" % (fpath, curr_rpath.strip()))
-    rpaths = curr_rpath.strip().split(":")
-    new_rpaths = []
-    modified = False
-    for rpath in rpaths:
-        # If rpath is already dynamic copy it to new_rpath and continue
-        if rpath.find("$ORIGIN") != -1:
-            new_rpaths.append(rpath)
-            continue
-        rpath =  os.path.normpath(rpath)
-        if baseprefix not in rpath and tmpdir not in rpath:
-            # Skip standard search paths
-            if rpath in ['/lib', '/usr/lib', '/lib64/', '/usr/lib64']:
-                bb.warn("Skipping RPATH %s as is a standard search path for %s" % (rpath, fpath))
-                modified = True
-                continue
-            new_rpaths.append(rpath)
-            continue
-        new_rpaths.append("$ORIGIN/" + os.path.relpath(rpath, os.path.dirname(fpath.replace(rootdir, "/"))))
-        modified = True
-
-    # if we have modified some rpaths call chrpath to update the binary
-    if modified:
-        if break_hardlinks:
-            bb.utils.break_hardlinks(fpath)
-
-        args = ":".join(new_rpaths)
-        #bb.note("Setting rpath for %s to %s" %(fpath, args))
-        try:
-            subprocess.check_output([cmd, "-r", args, fpath],
-            stderr=subprocess.PIPE, universal_newlines=True)
-        except subprocess.CalledProcessError as e:
-            bb.fatal("chrpath command failed with exit code %d:\n%s\n%s" % (e.returncode, e.stdout, e.stderr))
-
-def process_file_darwin(cmd, fpath, rootdir, baseprefix, tmpdir, d, break_hardlinks = False):
-    import subprocess as sub
-
-    p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-L', fpath],stdout=sub.PIPE,stderr=sub.PIPE, universal_newlines=True)
-    out, err = p.communicate()
-    # If returned successfully, process stdout for results
-    if p.returncode != 0:
-        return
-    for l in out.split("\n"):
-        if "(compatibility" not in l:
-            continue
-        rpath = l.partition("(compatibility")[0].strip()
-        if baseprefix not in rpath:
-            continue
-
-        if break_hardlinks:
-            bb.utils.break_hardlinks(fpath)
-
-        newpath = "@loader_path/" + os.path.relpath(rpath, os.path.dirname(fpath.replace(rootdir, "/")))
-        p = sub.Popen([d.expand("${HOST_PREFIX}install_name_tool"), '-change', rpath, newpath, fpath],stdout=sub.PIPE,stderr=sub.PIPE)
-        out, err = p.communicate()
-
-def process_dir(rootdir, directory, d, break_hardlinks = False):
-    bb.debug(2, "Checking %s for binaries to process" % directory)
-    if not os.path.exists(directory):
-        return
-
-    import stat
-
-    rootdir = os.path.normpath(rootdir)
-    cmd = d.expand('${CHRPATH_BIN}')
-    tmpdir = os.path.normpath(d.getVar('TMPDIR', False))
-    baseprefix = os.path.normpath(d.expand('${base_prefix}'))
-    hostos = d.getVar("HOST_OS")
-
-    if "linux" in hostos:
-        process_file = process_file_linux
-    elif "darwin" in hostos:
-        process_file = process_file_darwin
-    else:
-        # Relocations not supported
-        return
-
-    dirs = os.listdir(directory)
-    for file in dirs:
-        fpath = directory + "/" + file
-        fpath = os.path.normpath(fpath)
-        if os.path.islink(fpath):
-            # Skip symlinks
-            continue
-
-        if os.path.isdir(fpath):
-            process_dir(rootdir, fpath, d, break_hardlinks = break_hardlinks)
-        else:
-            #bb.note("Testing %s for relocatability" % fpath)
-
-            # We need read and write permissions for chrpath, if we don't have
-            # them then set them temporarily. Take a copy of the files
-            # permissions so that we can restore them afterwards.
-            perms = os.stat(fpath)[stat.ST_MODE]
-            if os.access(fpath, os.W_OK|os.R_OK):
-                perms = None
-            else:
-                # Temporarily make the file writeable so we can chrpath it
-                os.chmod(fpath, perms|stat.S_IRWXU)
-
-            process_file(cmd, fpath, rootdir, baseprefix, tmpdir, d, break_hardlinks = break_hardlinks)
-
-            if perms:
-                os.chmod(fpath, perms)
-
-def rpath_replace (path, d):
-    bindirs = d.expand("${bindir} ${sbindir} ${base_sbindir} ${base_bindir} ${libdir} ${base_libdir} ${libexecdir} ${PREPROCESS_RELOCATE_DIRS}").split()
-
-    for bindir in bindirs:
-        #bb.note ("Processing directory " + bindir)
-        directory = path + "/" + bindir
-        process_dir (path, directory, d)
-
classes/cmake.bbclass deleted +0 -219

219 lines not on this page · raw message

classes/package.bbclass deleted +0 -2552

2,552 lines not on this page · raw message

classes/siteinfo.bbclass deleted +0 -226

95 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.36.1.vfs.0.0

Part of the diff is not shown here. View the raw message.

#2 lore raw

PATCH 3/11 gcc: update to 13.2

In reply to [email protected]

From: Etienne Cordonnier <[email protected]>

---
 .../clang/0037-Fixes_for_Darwin_SDKs.patch    |   4 +-
 ...e-sysroot-support-for-nativesdk-gcc.patch} | 136 ++++++++++++------
 ...-to-link-commandline-for-musl-targe.patch} |   0
 .../gcc/files/0099-nativesdk-gcc-darwin.patch |   8 +-
 .../gcc/files/0101-optional-libstdc.patch     | 118 ---------------
 recipes-devtools/gcc/gcc-source_%.bbappend    |   1 -
 6 files changed, 102 insertions(+), 165 deletions(-)
 rename recipes-devtools/gcc/files/{0017-handle-sysroot-support-for-nativesdk-gcc.patch => 0016-handle-sysroot-support-for-nativesdk-gcc.patch} (75%)
 rename recipes-devtools/gcc/files/{0020-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch => 0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch} (100%)
 delete mode 100644 recipes-devtools/gcc/files/0101-optional-libstdc.patch
recipes-devtools/clang/clang/0037-Fixes_for_Darwin_SDKs.patch +2 -2
index c6db8d9..687b5aa 100644
@@ -22,13 +22,13 @@ index f7da3f187814..0656f5cbad69 100644
 -                                                "4.2.1",
 -                                                "i686-apple-darwin10",
 -                                                arch == llvm::Triple::x86_64 ? "x86_64" : "");
-+                                                "11.4.0",
++                                                "13.2.0",
 +                                                "x86_64#SDK_VENDOR#-darwin21",
 +                                                "");
        IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
 -                                                "4.0.0", "i686-apple-darwin8",
 -                                                 "");
-+                                                "11.4.0", "", "");
++                                                "13.2.0", "", "");
 +      {
 +          const char *S = ::getenv("YOCTO_SDKPATH");
 +          if (S && (S[0] != '\0')) {
recipes-devtools/gcc/files/0016-handle-sysroot-support-for-nativesdk-gcc.patch renamed from recipes-devtools/gcc/files/0017-handle-sysroot-support-for-nativesdk-gcc.patch +96 -40

245 lines not on this page · raw message

recipes-devtools/gcc/files/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch renamed from recipes-devtools/gcc/files/0020-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch +0 -0
similarity index 100%
rename from recipes-devtools/gcc/files/0020-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
rename to recipes-devtools/gcc/files/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
recipes-devtools/gcc/files/0099-nativesdk-gcc-darwin.patch +4 -4
index 77419c0..a0a24cc 100644
@@ -7,14 +7,14 @@ Subject: [PATCH] rebase patch "0099-nativesdk-gcc-darwin.patch" from
 Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Etienne Cordonnier <[email protected]>
 ---
- gcc/config/darwin-c.c | 4 ++--
+ gcc/config/darwin-c.cc | 4 ++--
  gcc/config/darwin.h   | 5 +----
  2 files changed, 3 insertions(+), 6 deletions(-)
 
-diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
+diff --git a/gcc/config/darwin-c.cc b/gcc/config/darwin-c.cc
 index 8b3dec25476..a3c71f109a8 100644
---- a/gcc/config/darwin-c.c
-+++ b/gcc/config/darwin-c.c
+--- a/gcc/config/darwin-c.cc
++++ b/gcc/config/darwin-c.cc
 @@ -479,8 +479,8 @@ darwin_register_objc_includes (const char *sysroot ATTRIBUTE_UNUSED,
       /* See if our directory starts with the standard prefix.
  	 "Translate" them, i.e. replace /usr/local/lib/gcc... with
recipes-devtools/gcc/files/0101-optional-libstdc.patch deleted +0 -118

118 lines not on this page · raw message

recipes-devtools/gcc/gcc-source_%.bbappend +0 -1
index 110462d..296a688 100644
@@ -3,5 +3,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI:append = "\
     file://0099-nativesdk-gcc-darwin.patch \
     file://0100-change-macosx-version-min-to-12.3.patch \
-    file://0101-optional-libstdc.patch \
 "
Signature · 1 line
2.36.1.vfs.0.0
#3 lore raw

PATCH 4/11 cctools: fix APSL2 license

In reply to [email protected]

From: Etienne Cordonnier <[email protected]>

The license-file in poky is named APSL2, hence this name must be used.

---
 recipes-devtools/cctools-port/cctools-port-crosssdk_973.0.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-devtools/cctools-port/cctools-port-crosssdk_973.0.1.bb +1 -1
index 4082150..93062b1 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "Linux port of Apple CCTools"
 SECTION = "devel"
-LICENSE = "ApplePSLicense-2.0"
+LICENSE = "APSL-2.0"
 LIC_FILES_CHKSUM = "file://cctools/APPLE_LICENSE;md5=dacaafbaf91483700da837d31213a1e8"
 
 SRCREV = "f28fb5e9c31efd3d0552afcce2d2c03cae25c1ca"
Signature · 1 line
2.36.1.vfs.0.0
#4 lore raw

PATCH 5/11 automake: disable ar 'D' option

In reply to [email protected]

From: Etienne Cordonnier <[email protected]>

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

---
 .../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
recipes-devtools/automake/automake/0001-Remove-ar-D-argument.patch new file +29 -0
new file mode 100644
index 0000000..e66b5ad
@@ -0,0 +1,29 @@
+From 862a7ca3269b54a595051454c6fbb3c45688d929 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <[email protected]>
+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 <[email protected]>
+---
+ 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
+
recipes-devtools/automake/automake_%.bbappend new file +5 -0
new file mode 100644
index 0000000..4820dd9
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI:append = " \
+    file://0001-Remove-ar-D-argument.patch \
+    "
Signature · 1 line
2.36.1.vfs.0.0
#5 lore raw

PATCH 6/11 binutils: update to scarthgap (disable libctf)

In reply to [email protected]

From: Etienne Cordonnier <[email protected]>

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

---
 .../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(-)
recipes-devtools/binutils/binutils/0001-OS-1142-Do-not-use-nm-B-for-Darwin-s-nm.patch +5 -5
index 6d28872..bc7336c 100644
@@ -21,26 +21,26 @@ Signed-off-by: Etienne Cordonnier <[email protected]>
  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
recipes-devtools/binutils/binutils_%.bbappend +3 -0
index d6827ab..03e4ceb 100644
@@ -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"
Signature · 1 line
2.36.1.vfs.0.0
#6 lore raw

PATCH 7/11 clang: fix nativesdk-perl dependency which was re-added

In reply to [email protected]

From: Etienne Cordonnier <[email protected]>

For some reason this fix regressed in scarthgap.

---
 recipes-devtools/clang/clang_%.bbappend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-devtools/clang/clang_%.bbappend +1 -1
index ce2a3b3..e55dff6 100644
@@ -10,7 +10,7 @@ DEPENDS:append:class-nativesdk = " clang-crosssdk-${SDK_SYS}"
 
 # perl tries to call readelf, which does not exist on darwin (it would need
 # to call objdump instead but the detection logic does not work for some reason)
-RDEPENDS:${PN}:remove:class-nativesdk:darwin21 = " \
+RDEPENDS:${PN}-tools:remove:class-nativesdk:darwin21 = " \
     perl-module-digest-md5 \
     perl-module-file-basename \
     perl-module-file-copy \
Signature · 1 line
2.36.1.vfs.0.0
#7 lore raw

PATCH 8/11 binutils-cross-canadian: disable gold linker

In reply to [email protected]

From: Etienne Cordonnier <[email protected]>

The gold linker doesn't compile for MacOS, however we're not using it so let's just disable it.

---
 recipes-devtools/binutils/binutils-cross-canadian_2.%.bbappend | 3 +++
 1 file changed, 3 insertions(+)
recipes-devtools/binutils/binutils-cross-canadian_2.%.bbappend +3 -0
index d3cf881..d47237c 100644
@@ -1,2 +1,5 @@
 # Remove -rpath-link and -rpath
 LDFLAGS:darwinsdk = "${BUILDSDK_LDFLAGS}"
+
+# gold uses uchar.h which doesn't exist on MacOS
+LDGOLD = "--enable-gold=no"
Signature · 1 line
2.36.1.vfs.0.0
#8 lore raw

PATCH 9/11 gettext: fix scarthgap build error

In reply to [email protected]

From: Etienne Cordonnier <[email protected]>

---
 recipes-core/gettext/gettext_%.bbappend | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 recipes-core/gettext/gettext_%.bbappend
recipes-core/gettext/gettext_%.bbappend new file +5 -0
new file mode 100644
index 0000000..d3314d0
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+PACKAGES += "gettext-alias"
+# For some unknown reason this file isn't packaged while building nativesdk-gettext
+FILES:gettext-alias = "${datadir}/locale/locale.alias"
Signature · 1 line
2.36.1.vfs.0.0
#9 lore raw

PATCH 10/11 binutils-crosssdk -> binutils

In reply to [email protected]

From: Etienne Cordonnier <[email protected]>

This was renamed in poky.

---
 conf/machine-sdk/x86_64-darwin.conf                            | 2 +-
 recipes-devtools/cctools-port/cctools-port-crosssdk_973.0.1.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
conf/machine-sdk/x86_64-darwin.conf +1 -1
index c4a111d..89f3e0a 100644
@@ -6,7 +6,7 @@ SOLIBSDEV:darwin21 = ".dylibbroken"
 
 PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc = "nativesdk-osx-runtime"
 PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial = "nativesdk-osx-runtime"
-PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils-crosssdk = "cctools-port-crosssdk"
+PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils = "cctools-port-crosssdk"
 PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-osx-runtime"
 PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-osx-runtime"
 PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-osx-runtime"
recipes-devtools/cctools-port/cctools-port-crosssdk_973.0.1.bb +1 -1
index 93062b1..1246d88 100644
@@ -11,7 +11,7 @@ PR = "r2"
 inherit autotools crosssdk
 
 DEPENDS += "util-linux-native openssl-native xar-native libtapi-native"
-PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
+PROVIDES = "virtual/${TARGET_PREFIX}binutils"
 
 DEPENDS += "clang-native libcxx-native"
 
Signature · 1 line
2.36.1.vfs.0.0
#10 lore raw

PATCH 11/11 zlib: update to scarthgap

In reply to [email protected]

From: Etienne Cordonnier <[email protected]>

---
 .../files/0001-fix-wrong-libtool-path.patch   | 42 ++++++++++---------
 .../{zlib_1.2.%.bbappend => zlib_%.bbappend}  |  4 +-
 2 files changed, 25 insertions(+), 21 deletions(-)
 rename recipes-core/zlib/{zlib_1.2.%.bbappend => zlib_%.bbappend} (54%)
recipes-core/zlib/files/0001-fix-wrong-libtool-path.patch +22 -20
index 528b46b..32171fb 100644
@@ -1,33 +1,35 @@
-From 3b7dfa06c12eb605ae244bbdf37a5c502f63a035 Mon Sep 17 00:00:00 2001
-From: Dominik Schnitzer <[email protected]> 
-Date: Fri, 12 May 2023 10:11:56 +0000
+From 98c5fa349ca64fb6e6a4c29a32f8e3ced6fb81b5 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <[email protected]>
+Date: Fri, 7 Jun 2024 00:06:42 +0200
 Subject: [PATCH] fix wrong libtool path
 
 Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Dominik Schnitzer <[email protected]>
 ---
- configure | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
+ configure | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
 
 diff --git a/configure b/configure
-index 69dfa3f..dcd0e75 100755
+index a7c6d72..c2c1d6a 100755
 --- a/configure
 +++ b/configure
-@@ -240,13 +240,7 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
-              SHAREDLIB=libz$shared_ext
-              SHAREDLIBV=libz.$VER$shared_ext
-              SHAREDLIBM=libz.$VER1$shared_ext
--             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
--             if libtool -V 2>&1 | grep Apple > /dev/null; then
--                 AR="libtool"
--             else
--                 AR="/usr/bin/libtool"
--             fi
--             ARFLAGS="-o" ;;
-+             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"} ;;
-   *)             LDSHARED=${LDSHARED-"$cc -shared"} ;;
+@@ -264,15 +264,7 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
+         SHAREDLIB=libz$shared_ext
+         SHAREDLIBV=libz.$VER$shared_ext
+         SHAREDLIBM=libz.$VER1$shared_ext
+-        LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
+-        if "${CROSS_PREFIX}libtool" -V 2>&1 | grep Apple > /dev/null; then
+-            AR="${CROSS_PREFIX}libtool"
+-        elif libtool -V 2>&1 | grep Apple > /dev/null; then
+-            AR="libtool"
+-        else
+-            AR="/usr/bin/libtool"
+-        fi
+-        ARFLAGS="-o" ;;
++        LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"} ;;
+   *)
+         LDSHARED=${LDSHARED-"$cc -shared"} ;;
    esac
- else
 -- 
 2.36.1.vfs.0.0
 
recipes-core/zlib/zlib_%.bbappend renamed from recipes-core/zlib/zlib_1.2.%.bbappend +3 -1
similarity index 54%
rename from recipes-core/zlib/zlib_1.2.%.bbappend
rename to recipes-core/zlib/zlib_%.bbappend
index 8738b98..fd3155e 100644
@@ -1,8 +1,10 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
+DEPENDS += "libtool"
+
 SRC_URI += "\
     file://0001-fix-wrong-libtool-path.patch \
 "
 do_configure:darwin21 () {
-    uname=darwin ./configure --prefix=${prefix} --shared --libdir=${libdir}
+    LDCONFIG=true ${S}/configure --prefix=${prefix} --shared --libdir=${libdir} --uname=darwin
 }
Signature · 1 line
2.36.1.vfs.0.0