From f18a87fa1f1ab15b9db91f91c5e9a8ca5642078a Mon Sep 17 00:00:00 2001
From: EWouters <6179932+EWouters@users.noreply.github.com>
Date: Fri, 1 Sep 2023 20:11:08 +0200
Subject: [PATCH] Ports/libarchive: Update libarchive to version 3.7.1

The sysroot is now configured for libarchive and pcre, to allow
libarchive to find libpcre when building with Clang.
---
 Ports/AvailablePorts.md     | 2 +-
 Ports/libarchive/package.sh | 5 +++--
 Ports/pcre/package.sh       | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index 276df377e7e..f1c87c3340d 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -137,7 +137,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
 | [`lame`](lame/)                                     | LAME Ain't an MP3 Encoder                                       | 3.100                     | https://lame.sourceforge.io/                                                   |
 | [`lcms2`](lcms2/)                                   | Small-footprint color management engine                         | 2.15                      | https://github.com/mm2/Little-CMS                                              |
 | [`less`](less/)                                     | less                                                            | 643                       | https://www.greenwoodsoftware.com/less/                                        |
-| [`libarchive`](libarchive/)                         | libarchive                                                      | 3.6.1                     | https://libarchive.org/                                                        |
+| [`libarchive`](libarchive/)                         | libarchive                                                      | 3.7.1                     | https://libarchive.org/                                                        |
 | [`libassuan`](libassuan/)                           | libassuan                                                       | 2.5.5                     | https://gnupg.org/software/libassuan/index.html                                |
 | [`libatomic_ops`](libatomic_ops/)                   | libatomic\_ops                                                  | 7.6.12                    | https://www.hboehm.info/gc/                                                    |
 | [`libenet`](libenet/)                               | libenet                                                         | 1.3.17                    | http://sauerbraten.org/enet/                                                   |
diff --git a/Ports/libarchive/package.sh b/Ports/libarchive/package.sh
index 7f098833b59..7be842c0f5a 100755
--- a/Ports/libarchive/package.sh
+++ b/Ports/libarchive/package.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port='libarchive'
-version='3.6.1'
+version='3.7.1'
 useconfigure='true'
 use_fresh_config_sub='true'
 config_sub_paths=(
@@ -8,9 +8,10 @@ config_sub_paths=(
 )
 configopts=(
     '--without-xml2'
+    "--with-sysroot=${SERENITY_INSTALL_ROOT}"
 )
 files=(
-    "https://libarchive.org/downloads/libarchive-${version}.tar.gz#c676146577d989189940f1959d9e3980d28513d74eedfbc6b7f15ea45fe54ee2"
+    "https://libarchive.org/downloads/libarchive-${version}.tar.gz#5d24e40819768f74daf846b99837fc53a3a9dcdf3ce1c2003fe0596db850f0f0"
 )
 depends=(
     'pcre'
diff --git a/Ports/pcre/package.sh b/Ports/pcre/package.sh
index 78f51d5a339..e57fb20faa1 100755
--- a/Ports/pcre/package.sh
+++ b/Ports/pcre/package.sh
@@ -6,3 +6,6 @@ use_fresh_config_sub='true'
 files=(
     "https://downloads.sourceforge.net/project/pcre/pcre/${version}/pcre-${version}.tar.gz#4e6ce03e0336e8b4a3d6c2b70b1c5e18590a5673a98186da90d4f33c23defc09"
 )
+configopts=(
+    "--with-sysroot=${SERENITY_INSTALL_ROOT}"
+)