From c2ab49274ec5a4ae6637edcca720f8330cd907e6 Mon Sep 17 00:00:00 2001
From: Ørjan Malde <red@foxi.me>
Date: Feb 26 2024 12:50:31 +0000
Subject: groups.d/251.native_packages_lib.group: libarchive: remove spurious paths


Signed-off-by: Ørjan Malde <red@foxi.me>

---

diff --git a/groups.d/251.native_packages_lib.group b/groups.d/251.native_packages_lib.group
index 59e4e17..f50eff5 100644
--- a/groups.d/251.native_packages_lib.group
+++ b/groups.d/251.native_packages_lib.group
@@ -66,7 +66,6 @@ sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf sdl2_net twolame wolfssl";
 : ${PKG_LIBARCHIVE_VERSION:=3.7.2};
 : ${PKG_LIBARCHIVE_URL:=https://www.libarchive.de/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.xz};
 : ${PKG_LIBARCHIVE_CONFIGURE_ARGS_EXTRA:="--without-zstd"};
-: ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib};
 : ${PKG_LIBARCHIVE_CONFIG_CACHE_LOCAL:="ac_cv_func_lstat_dereferences_slashed_symlink=yes"};
 : ${PKG_LIBARCHIVE_LIBTOOL:=rlibtool};
 : ${PKG_LIBASS_DEPENDS:="freetype fontconfig harfbuzz fribidi libiconv"};
diff --git a/patches/libarchive-3.7.2_pre.local.patch b/patches/libarchive-3.7.2_pre.local.patch
index 00141a2..1d2a86c 100644
--- a/patches/libarchive-3.7.2_pre.local.patch
+++ b/patches/libarchive-3.7.2_pre.local.patch
@@ -1,7 +1,7 @@
-diff -ru libarchive-3.4.2.orig/configure libarchive-3.4.2/configure
---- libarchive-3.4.2.orig/configure	2020-02-11 23:58:01.000000000 +0100
-+++ libarchive-3.4.2/configure	2020-04-11 15:58:45.493648584 +0200
-@@ -12062,6 +12062,16 @@
+diff -ru libarchive-3.7.2.orig/configure libarchive-3.7.2/configure
+--- libarchive-3.7.2.orig/configure	2023-09-12 00:05:34.000000000 +0200
++++ libarchive-3.7.2/configure	2024-02-26 13:44:22.491965148 +0100
+@@ -12906,6 +12906,16 @@
    dynamic_linker='NetBSD ld.elf_so'
    ;;
  
@@ -18,3 +18,12 @@ diff -ru libarchive-3.4.2.orig/configure libarchive-3.4.2/configure
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
+@@ -16925,7 +16935,7 @@
+   ac_status=$?
+   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LIBXML2_PC_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
++  pkg_cv_LIBXML2_PC_LIBS=`$PKG_CONFIG --libs-only-l "libxml-2.0" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes