From abc0b4170e42e2a7d835e4490ecbae49e6f3d137 Mon Sep 17 00:00:00 2001 From: Sertonix Date: Wed, 4 Sep 2024 21:48:56 +0200 Subject: [PATCH] main/jemalloc: fix pkgconf version We don't specify nrev so the version was "5.3.0_". Remove the "_" to have an apk3 compatible version. Also "5.3.0_" and "5.3.0" are considered the same version by pkgconf so there should be no new issue. --- main/jemalloc/APKBUILD | 7 +++++-- main/jemalloc/pkgconf.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 main/jemalloc/pkgconf.patch diff --git a/main/jemalloc/APKBUILD b/main/jemalloc/APKBUILD index 3b53f6671d2..168035837fb 100644 --- a/main/jemalloc/APKBUILD +++ b/main/jemalloc/APKBUILD @@ -4,7 +4,7 @@ # Contributor: doitwithnotepad pkgname=jemalloc pkgver=5.3.0 -pkgrel=5 +pkgrel=6 pkgdesc="general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support" url="http://jemalloc.net" arch="all" @@ -12,7 +12,9 @@ license="BSD-2-Clause" makedepends="autoconf" subpackages="$pkgname-static $pkgname-dev $pkgname-doc" source="https://github.com/jemalloc/jemalloc/releases/download/$pkgver/jemalloc-$pkgver.tar.bz2 - musl-exception-specification-errors.patch" + musl-exception-specification-errors.patch + pkgconf.patch + " build() { local _pgs @@ -44,4 +46,5 @@ package() { sha512sums=" 22907bb052096e2caffb6e4e23548aecc5cc9283dce476896a2b1127eee64170e3562fa2e7db9571298814a7a2c7df6e8d1fbe152bd3f3b0c1abec22a2de34b1 jemalloc-5.3.0.tar.bz2 7f52287019a02eef434ecd9f07b4f9bdb5349eced1c09f57db0c6c394d173e8deee20b646431264494a0b985eec3208889547cdd48cd7de6844f2b64c441e34b musl-exception-specification-errors.patch +04688e1afb8380a61d55292527550b6f26706bed7ec7aeafa3958d52a4d407584aca215bc209e0dd353850756207a0c6bb906643499571be2b34586640314e1f pkgconf.patch " diff --git a/main/jemalloc/pkgconf.patch b/main/jemalloc/pkgconf.patch new file mode 100644 index 00000000000..de2fa064fad --- /dev/null +++ b/main/jemalloc/pkgconf.patch @@ -0,0 +1,12 @@ +Fix format since we don't include a revision number + +--- a/jemalloc.pc.in ++++ b/jemalloc.pc.in +@@ -7,6 +7,6 @@ install_suffix=@install_suffix@ + Name: jemalloc + Description: A general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support. + URL: http://jemalloc.net/ +-Version: @jemalloc_version_major@.@jemalloc_version_minor@.@jemalloc_version_bugfix@_@jemalloc_version_nrev@ ++Version: @jemalloc_version_major@.@jemalloc_version_minor@.@jemalloc_version_bugfix@ + Cflags: -I${includedir} + Libs: -L${libdir} -ljemalloc${install_suffix}