diff mbox series

[meta-darwin,11/11] zlib: update to scarthgap

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

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
---
 .../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%)
diff mbox series

Patch

diff --git a/recipes-core/zlib/files/0001-fix-wrong-libtool-path.patch b/recipes-core/zlib/files/0001-fix-wrong-libtool-path.patch
index 528b46b..32171fb 100644
--- a/recipes-core/zlib/files/0001-fix-wrong-libtool-path.patch
+++ b/recipes-core/zlib/files/0001-fix-wrong-libtool-path.patch
@@ -1,33 +1,35 @@ 
-From 3b7dfa06c12eb605ae244bbdf37a5c502f63a035 Mon Sep 17 00:00:00 2001
-From: Dominik Schnitzer <dominik@snap.com> 
-Date: Fri, 12 May 2023 10:11:56 +0000
+From 98c5fa349ca64fb6e6a4c29a32f8e3ced6fb81b5 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+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 <dominik@snap.com>
 ---
- 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
 
diff --git a/recipes-core/zlib/zlib_1.2.%.bbappend b/recipes-core/zlib/zlib_%.bbappend
similarity index 54%
rename from recipes-core/zlib/zlib_1.2.%.bbappend
rename to recipes-core/zlib/zlib_%.bbappend
index 8738b98..fd3155e 100644
--- a/recipes-core/zlib/zlib_1.2.%.bbappend
+++ b/recipes-core/zlib/zlib_%.bbappend
@@ -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
 }