David Runge pushed to branch main at Arch Linux / Packaging / Packages / pcre2


Commits:
fac05248 by David Runge at 2024-06-08T11:51:04+02:00
Move configure options to local bash array for easier handling

Signed-off-by: David Runge <dv...@archlinux.org>

- - - - -
c24a5c5d by David Runge at 2024-06-09T09:30:05+02:00
upgpkg: 10.44-1

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = pcre2
        pkgdesc = A library that implements Perl 5-style regular expressions. 
2nd version
-       pkgver = 10.43
-       pkgrel = 4
+       pkgver = 10.44
+       pkgrel = 1
        url = https://github.com/PCRE2Project/pcre2
        arch = x86_64
        license = BSD-3-Clause
@@ -15,18 +15,12 @@ pkgbase = pcre2
        provides = libpcre2-32.so
        provides = libpcre2-posix.so
        options = staticlibs
-       source = 
https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.43/pcre2-10.43.tar.bz2
-       source = 
https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.43/pcre2-10.43.tar.bz2.sig
-       source = 
https://github.com/zherczeg/sljit/commit/56dbde07b05252f0b304b04040a86cfb9f109ae9.patch
-       source = 
https://github.com/zherczeg/sljit/commit/ad89dd8ecd25589d236bd20b36f2abf69f938fd1.patch
+       source = 
https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.44/pcre2-10.44.tar.bz2
+       source = 
https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.44/pcre2-10.44.tar.bz2.sig
        validpgpkeys = 45F68D54BBE23FB3039B46E59766E084FB0F43D8
-       sha512sums = 
8ac1520c32e9e5672404aaf6104e23c9ee5c3c28ad28ff101435599d813cbb20e0491a3fd34e012b4411b3e0366a4c6dfa3f02d093acaa6ff0ab25478bb7ade9
+       sha512sums = 
ee91cc10a2962bc7818b03d368df3dd31f42ea9a7260ae51483ea8cd331b7431e36e63256b0adc213cc6d6741e7c90414fd420622308c0ae3fcb5dd878591be2
        sha512sums = SKIP
-       sha512sums = 
4379a06a142a9c9dc61298e86c722f1f2b6d83493acda8e472c866093b3e2192d315998c5a87dfd231739394d5c809c05415126084b18f80a002ee8861c0ed4f
-       sha512sums = 
9548da45cb030f53b634a9ba340687d04bd6c5b88ffd78932f231a4092e5cc99b0698941fbd4f88d9a905bed0d0a85c5da697da9a531c4c4efc8f7578d0ffefe
-       b2sums = 
f87f9f36dd6a806cdba1f077f51b53da2583f1898f83e41d594622b28ac8efbc1b2d122b752a9d6cd461fe0e3c7c85ee93358443df518a336da4ee9d72cca808
+       b2sums = 
fb06228f8bdc5906ef4f19d7d677f1009070855149d9ad3f807cfcd164f5cb6165f96e074fedc3942226d4b29edf4b29fab6cde2f2ba58bf6da282730941412b
        b2sums = SKIP
-       b2sums = 
736aa7eaa2ed571117f545ae78151fda6a5ef5935bf70f132b1d20d0ff6e46543194f409a02eac727a8209fb0d25e6870705e8a95b3feb07e799d288fd852822
-       b2sums = 
9ad1b0dca06cf3620158458e26c2007fb46990bdf178a75a621be5c665e8726990789510827829e9c480cbebee0b3b5da27f9857e3b19019307e4959671dfbac
 
 pkgname = pcre2


=====================================
PKGBUILD
=====================================
@@ -6,8 +6,8 @@
 # Contributor: John Proctor <jproc...@prium.net>
 
 pkgname=pcre2
-pkgver=10.43
-pkgrel=4
+pkgver=10.44
+pkgrel=1
 pkgdesc='A library that implements Perl 5-style regular expressions. 2nd 
version'
 arch=('x86_64')
 url='https://github.com/PCRE2Project/pcre2'
@@ -16,41 +16,31 @@ depends=('bzip2' 'glibc' 'readline' 'zlib')
 optdepends=('sh: for pcre2-config')
 provides=(libpcre2-{8,16,32,posix}.so)
 options=(staticlibs)
-source=("$url/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"{,.sig}
-         
https://github.com/zherczeg/sljit/commit/56dbde07b05252f0b304b04040a86cfb9f109ae9.patch
-         
https://github.com/zherczeg/sljit/commit/ad89dd8ecd25589d236bd20b36f2abf69f938fd1.patch)
-sha512sums=('8ac1520c32e9e5672404aaf6104e23c9ee5c3c28ad28ff101435599d813cbb20e0491a3fd34e012b4411b3e0366a4c6dfa3f02d093acaa6ff0ab25478bb7ade9'
-            'SKIP'
-            
'4379a06a142a9c9dc61298e86c722f1f2b6d83493acda8e472c866093b3e2192d315998c5a87dfd231739394d5c809c05415126084b18f80a002ee8861c0ed4f'
-            
'9548da45cb030f53b634a9ba340687d04bd6c5b88ffd78932f231a4092e5cc99b0698941fbd4f88d9a905bed0d0a85c5da697da9a531c4c4efc8f7578d0ffefe')
-b2sums=('f87f9f36dd6a806cdba1f077f51b53da2583f1898f83e41d594622b28ac8efbc1b2d122b752a9d6cd461fe0e3c7c85ee93358443df518a336da4ee9d72cca808'
-        'SKIP'
-        
'736aa7eaa2ed571117f545ae78151fda6a5ef5935bf70f132b1d20d0ff6e46543194f409a02eac727a8209fb0d25e6870705e8a95b3feb07e799d288fd852822'
-        
'9ad1b0dca06cf3620158458e26c2007fb46990bdf178a75a621be5c665e8726990789510827829e9c480cbebee0b3b5da27f9857e3b19019307e4959671dfbac')
+source=("$url/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"{,.sig})
+sha512sums=('ee91cc10a2962bc7818b03d368df3dd31f42ea9a7260ae51483ea8cd331b7431e36e63256b0adc213cc6d6741e7c90414fd420622308c0ae3fcb5dd878591be2'
+            'SKIP')
+b2sums=('fb06228f8bdc5906ef4f19d7d677f1009070855149d9ad3f807cfcd164f5cb6165f96e074fedc3942226d4b29edf4b29fab6cde2f2ba58bf6da282730941412b'
+        'SKIP')
 validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8')  # Philip Hazel 
<p...@hermes.cam.ac.uk>
 
 build() {
-  cd $pkgname-$pkgver
-  # Fix AVX detection
-  # [PATCH] Add xgetbv feature detection support on x86
-  patch -Np2 -i "$srcdir"/56dbde07b05252f0b304b04040a86cfb9f109ae9.patch -d 
src/sljit
+  local configure_options=(
+    --enable-jit
+    --enable-pcre2-16
+    --enable-pcre2-32
+    --enable-pcre2grep-libbz2
+    --enable-pcre2grep-libz
+    --enable-pcre2test-libreadline
+    --prefix=/usr
+  )
 
-  # Fix thread-safety issue in sljit's allocator
-  # [PATCH] Fix locking region in sjlit_malloc_exec
-  patch -Np2 -i "$srcdir"/ad89dd8ecd25589d236bd20b36f2abf69f938fd1.patch -d 
src/sljit
+  cd $pkgname-$pkgver
 
   # use fat LTO objects for static libraries
   CFLAGS+=" -ffat-lto-objects"
   CXXFLAGS+=" -ffat-lto-objects"
 
-  ./configure \
-    --prefix=/usr \
-    --enable-pcre2-16 \
-    --enable-pcre2-32 \
-    --enable-jit \
-    --enable-pcre2grep-libz \
-    --enable-pcre2grep-libbz2 \
-    --enable-pcre2test-libreadline
+  ./configure "${configure_options[@]}"
   make
 }
 



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/pcre2/-/compare/e76d7a5e5c418a19ad10f34b3ddcb8c4e0e2781f...c24a5c5d456e872affcddf4398f9bfc21eaa0f49

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/pcre2/-/compare/e76d7a5e5c418a19ad10f34b3ddcb8c4e0e2781f...c24a5c5d456e872affcddf4398f9bfc21eaa0f49
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to