apr: update to version 1.7.5. (#11419)

- Drop gcc2 versions. All on-tree package that depend on this are "!x86_gcc2" (or will be after this). - Drop older apr_util version (gcc2).
2026-03-19 01:46:00 +01:00 · 2024-12-09 06:11:16 -03:00
parent 010f539db0
commit 358cd0594a
4 changed files with 24 additions and 174 deletions
--- a/dev-libs/apr/apr-1.7.5.recipe
+++ b/dev-libs/apr/apr-1.7.5.recipe
@@ -24,15 +24,15 @@ following:
 HOMEPAGE="http://apr.apache.org/"
 COPYRIGHT="2012 The Apache Software Foundation"
 LICENSE="Apache v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="http://archive.apache.org/dist/apr/apr-$portVersion.tar.gz"
-CHECKSUM_SHA256="a4137dd82a185076fa50ba54232d920a17c6469c30b0876569e1c2a05ff311d9"
+CHECKSUM_SHA256="3375fa365d67bcf945e52b52cba07abea57ef530f40b281ffbe977a9251361db"
 PATCHES="apr-$portVersion.patchset"

-ARCHITECTURES="all"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

-libVersion="0.7.4"
+libVersion="0.7.5"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"

 PROVIDES="
@@ -74,9 +74,6 @@ BUILD()
 		--disable-static \
 		--with-installbuilddir=$prefix/data/apr CFLAGS=-D_BSD_SOURCE

-	# TODO: fix this hack (by finding out why top_builddir seems to be unset)!
-	ln -sfn $sourceDir/libtool /libtool
-
 	make $jobArgs
 }

@@ -103,6 +100,13 @@ INSTALL()
 		$developDir
 }

+# For reference:
+# Tests crash on beta5 64 bits, and "freezes" the system on 32 bits.
+# Tests are divided in four:
+#	- testlockperf - all tests OK. (takes about 30 minutes on VMware, slower on VBox)
+#	- testmutexscope - all tests OK.
+#	- testall - 2 fails (1 in testfile, 1 in testcond), then crashes (or freezes system).
+#	- sendfile - Not run as Haiku doesn't has "sendfile()".
 TEST()
 {
 	make test
--- a/dev-libs/apr/patches/apr-1.7.5.patchset
+++ b/dev-libs/apr/patches/apr-1.7.5.patchset
@@ -1,4 +1,4 @@
-From 288156a6b1e48e401d66b3f53b488cb946414cf2 Mon Sep 17 00:00:00 2001
+From df0446b83d56d131d757d385515aec231f0d1ba7 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 15 Jul 2017 13:50:02 +0200
 Subject: apply 1.5.2 patch.
@@ -33,10 +33,10 @@ index fb087a8..a599e0d 100644
 <Layout Mac OS X Server>
     prefix:        /Local/Library/WebServer
 diff --git a/configure.in b/configure.in
-index ff92e55..957dbf7 100644
+index b0457e2..d22a48f 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -880,9 +880,9 @@ case $host in
+@@ -898,9 +898,9 @@ case $host in
       ac_cv_func_CreateFileMapping=yes
       ;;
    *)
@@ -51,17 +51,17 @@ index ff92e55..957dbf7 100644
 2.45.2


-From fcb999d16ab8f9c389e73998e743817697471fd1 Mon Sep 17 00:00:00 2001
+From ba67b73a165228d4f5b5f182ba56b5042ee5ca79 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 25 Apr 2022 21:18:48 +0200
 Subject: Haiku: decide to use standard POSIX methods


 diff --git a/configure.in b/configure.in
-index 957dbf7..3adc0c2 100644
+index d22a48f..f74ecd9 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -1401,6 +1401,9 @@ case $host in
+@@ -1460,6 +1460,9 @@ case $host in
             APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_ZERO USE_SHMEM_SHMGET_ANON)
         fi
         ;;
@@ -71,7 +71,7 @@ index 957dbf7..3adc0c2 100644
     *hpux11* ) 
         APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET_ANON)
         ;;
-@@ -2548,6 +2551,11 @@ esac
+@@ -2608,6 +2611,11 @@ esac
 if test "x$apr_lock_method" != "x"; then
     APR_DECISION_FORCE($apr_lock_method)
 fi
@@ -87,17 +87,17 @@ index 957dbf7..3adc0c2 100644
 2.45.2


-From e0f60692049da2c853a66db8e63d0c950e720380 Mon Sep 17 00:00:00 2001
+From 20af3a6d0b0755cd57332290193ff8ac60080dd4 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 26 Apr 2022 14:42:58 +0200
 Subject: fix checking if fcntl returns EACCES when F_SETLK is already held


 diff --git a/configure.in b/configure.in
-index 3adc0c2..dc1f3d1 100644
+index f74ecd9..71fbea7 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -2637,11 +2637,11 @@ int main()
+@@ -2697,11 +2697,11 @@ int main(int argc, const char *argv[])
         wait(&status);
     }
     else {
@@ -115,7 +115,7 @@ index 3adc0c2..dc1f3d1 100644
 2.45.2


-From 27d0dab886d8108ccf5c36ae44bbaf42bd13dc26 Mon Sep 17 00:00:00 2001
+From 057c23002e572f951e5877a5d2cad9e32605f452 Mon Sep 17 00:00:00 2001
 From: PulkoMandy <pulkomandy@pulkomandy.tk>
 Date: Sun, 15 Sep 2024 10:46:58 +0200
 Subject: Fix named shared memory
@@ -125,10 +125,10 @@ one of the UNIX shared memory implementations, allowing only anonymous
 shared memory to be created.

 diff --git a/configure.in b/configure.in
-index dc1f3d1..9b91539 100644
+index 71fbea7..20944d6 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -1487,6 +1487,9 @@ case $host in
+@@ -1546,6 +1546,9 @@ case $host in
                                   USE_SHMEM_SHMGET)
         fi
         ;;
--- a/dev-libs/apr_util/apr_util-1.5.4.recipe
+++ b/dev-libs/apr_util/apr_util-1.5.4.recipe
@@ -1,109 +0,0 @@
-SUMMARY="Apache Portable Runtime Utility Library"
-DESCRIPTION="The mission of the Apache Portable Runtime (APR) project is to \
-create and maintain software libraries that provide a predictable and \
-consistent interface to underlying platform-specific implementations.
-The primary goal is to provide an API to which software developers may code \
-and be assured of predictable if not identical behaviour regardless of the \
-platform on which their software is built, relieving them of the need to code \
-special-case conditions to work around or take advantage of platform-specific \
-deficiencies or features."
-HOMEPAGE="http://apr.apache.org/"
-COPYRIGHT="2011 The Apache Software Foundation."
-LICENSE="Apache v2"
-REVISION="6"
-SOURCE_URI="http://archive.apache.org/dist/apr/apr-util-$portVersion.tar.gz"
-CHECKSUM_SHA256="976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"
-SOURCE_DIR="apr-util-$portVersion"
-PATCHES="apr_util-$portVersion.patch"
-
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	apr_util$secondaryArchSuffix = $portVersion compat >= 1
-	lib:libaprutil_1$secondaryArchSuffix = 0.5.4 compat >= 0
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libapr_1$secondaryArchSuffix
-	lib:libexpat$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	apr_util${secondaryArchSuffix}_devel = portVersion compat >= 1
-	cmd:apu_1_config$secondaryArchSuffix = $portVersion compat >= 1
-	devel:libaprutil_1$secondaryArchSuffix = 0.5.4 compat >= 0
-	"
-REQUIRES_devel="
-	apr_util$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libapr_1$secondaryArchSuffix >= 0.5.0
-	devel:libexpat$secondaryArchSuffix
-	devel:libiconv$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:autoheader
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	"
-
-PATCH()
-{
-	echo 'AM_INIT_AUTOMAKE' >> xml/expat/configure.in
-}
-
-BUILD()
-{
-	expatInstallDir=$portPackageLinksDir/lib~libexpat$secondaryArchSuffix
-
-	rm -rf aclocal.m4
-	mkdir -p m4
-	libtoolize -fci
-	aclocal --install -I m4
-	autoconf -f
-
-	cd xml/expat
-	mkdir -p m4
-	libtoolize -fci
-	aclocal --install -I m4
-	autoconf --force
-	autoheader
-	touch libtool.m4
-	cd ../..
-
-	runConfigure ./configure \
-		--with-apr=/$relativeBinDir \
-		--with-expat=$expatInstallDir
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	# remove libtool library file and static library
-	rm $libDir/libaprutil-1.{a,la}
-
-	# prepare develop/lib
-	prepareInstalledDevelLibs libaprutil-1
-	fixPkgconfig
-
-	# fix apu-1-config
-	fixDevelopLibDirReferences $binDir/apu-1-config
-
-	# remove superfluous .exp file
-	rm $libDir/aprutil.exp
-
-	# devel package
-	packageEntries devel \
-		$binDir \
-		$developDir
-}
--- a/dev-libs/apr_util/patches/apr_util-1.5.4.patch
+++ b/dev-libs/apr_util/patches/apr_util-1.5.4.patch
@@ -1,45 +0,0 @@
-diff -ur orig/apr-util-1.5.3/build/apu-conf.m4 apr_util-1.5.3/build/apu-conf.m4
--- orig/apr-util-1.5.3/build/apu-conf.m4	2011-08-08 11:32:27.026738688 +0200
-+++ apr_util-1.5.3/build/apu-conf.m4	2013-04-30 21:28:37.100401152 +0200
-@@ -145,10 +145,10 @@
-   else
-     # Add given path to standard search paths if appropriate:
-     if test "$withval" != "/usr"; then
-      APR_ADDTO(LDFLAGS, [-L$withval/lib])
-      APR_ADDTO(CPPFLAGS, [-I$withval/include])
-      APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
-      APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-+      APR_ADDTO(LDFLAGS, [-L$withval/develop/lib])
-+      APR_ADDTO(CPPFLAGS, [-I$withval/develop/headers])
-+      APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/develop/headers])
-+      APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/develop/lib])
-     fi
-     # ...and refuse to fall back on the builtin expat.
-     apu_try_builtin_expat=0
-diff -ur orig/apr-util-1.5.3/config.layout apr_util-1.5.3/config.layout
--- orig/apr-util-1.5.3/config.layout	2005-02-09 13:18:43.064749568 +0100
-+++ apr_util-1.5.3/config.layout	2013-04-30 21:27:27.079953920 +0200
-@@ -60,6 +60,23 @@
-     runtimedir:    ${localstatedir}/run
- </Layout>
- 
-+#	Haiku Layout making use of finddir
-+<Layout haiku>
-+    prefix:        /boot/system
-+    exec_prefix:   /boot/system
-+    bindir:        /boot/system/bin
-+    sbindir:       /boot/system/servers
-+    libdir:        /boot/system/lib
-+    libexecdir:    /boot/system/servers
-+    mandir:        /boot/system/documentation/man
-+    sysconfdir:    /boot/system/settings
-+    datadir:       /boot/system/data
-+    installbuilddir: /boot/system/develop/build
-+    includedir:    /boot/system/include
-+    localstatedir: /boot/system/var
-+    runtimedir:    ${localstatedir}/log
-+</Layout>
-+
- #   Mac OS X Server (Rhapsody)
- <Layout Mac OS X Server>
-     prefix:        /Local/Library/WebServer