diff options
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | use-c++17-absl.patch | 21 |
3 files changed, 32 insertions, 7 deletions
@@ -1,11 +1,10 @@ pkgbase = perl-re-engine-re2 pkgdesc = Replaces perl's regex engine in a given lexical scope with RE2 pkgver = 0.18 - pkgrel = 1 + pkgrel = 2 url = https://github.com/dgl/re-engine-RE2 arch = x86_64 - license = GPL - license = PerlArtistic + license = GPL-1.0-or-later OR Artistic-1.0-Perl makedepends = perl-extutils-cppguess depends = perl depends = gcc-libs @@ -13,7 +12,9 @@ pkgbase = perl-re-engine-re2 depends = re2 source = https://www.cpan.org/modules/by-module/re/re-engine-RE2-0.18.tar.gz source = https://src.fedoraproject.org/rpms/perl-re-engine-RE2/raw/d82ae9a185248467deb08e391be5febcd6c8da9e/f/re-engine-RE2-0.18-Unbundle-re2.patch + source = use-c++17-absl.patch sha512sums = 3ecfd9cfc68703e23ba96dfb4b9e61afd8eb2f098c3c089b170efe30015425d891cc353362e7c56418e6e36d25e6dcaad96f52f659310458d696351bb0c77f74 sha512sums = 1e7364d45ea1ff97dfdfd1afbbc2c8a8f5b8284da6bd128d967aeb01791033c8720c68fef03a296898450d0a03a459b844217143faea341764fdcfa447efdfc6 + sha512sums = bce174f41521fa486cac42a681dd8faeab435f3c890e69c14b89d24ce42509c0e1af2de48cabc25b84833d5d4a76fe306923d668fd753251598af63823cb408f pkgname = perl-re-engine-re2 @@ -2,23 +2,26 @@ pkgname=perl-re-engine-re2 pkgver=0.18 -pkgrel=1 +pkgrel=2 pkgdesc="Replaces perl's regex engine in a given lexical scope with RE2" arch=('x86_64') url="https://github.com/dgl/re-engine-RE2" -license=('GPL' 'PerlArtistic') +license=('GPL-1.0-or-later OR Artistic-1.0-Perl') depends=('perl' 'gcc-libs' 'glibc' 're2') makedepends=('perl-extutils-cppguess') source=("https://www.cpan.org/modules/by-module/re/re-engine-RE2-${pkgver}.tar.gz" - "https://src.fedoraproject.org/rpms/perl-re-engine-RE2/raw/d82ae9a185248467deb08e391be5febcd6c8da9e/f/re-engine-RE2-0.18-Unbundle-re2.patch") + "https://src.fedoraproject.org/rpms/perl-re-engine-RE2/raw/d82ae9a185248467deb08e391be5febcd6c8da9e/f/re-engine-RE2-0.18-Unbundle-re2.patch" + "use-c++17-absl.patch") sha512sums=('3ecfd9cfc68703e23ba96dfb4b9e61afd8eb2f098c3c089b170efe30015425d891cc353362e7c56418e6e36d25e6dcaad96f52f659310458d696351bb0c77f74' - '1e7364d45ea1ff97dfdfd1afbbc2c8a8f5b8284da6bd128d967aeb01791033c8720c68fef03a296898450d0a03a459b844217143faea341764fdcfa447efdfc6') + '1e7364d45ea1ff97dfdfd1afbbc2c8a8f5b8284da6bd128d967aeb01791033c8720c68fef03a296898450d0a03a459b844217143faea341764fdcfa447efdfc6' + 'bce174f41521fa486cac42a681dd8faeab435f3c890e69c14b89d24ce42509c0e1af2de48cabc25b84833d5d4a76fe306923d668fd753251598af63823cb408f') prepare() { cd "${srcdir}/re-engine-RE2-${pkgver}" rm -rf re2 patch -Np1 < "${srcdir}/re-engine-RE2-0.18-Unbundle-re2.patch" + patch -Np1 < "${srcdir}/use-c++17-absl.patch" } build() { diff --git a/use-c++17-absl.patch b/use-c++17-absl.patch new file mode 100644 index 000000000000..7b0e9598f405 --- /dev/null +++ b/use-c++17-absl.patch @@ -0,0 +1,21 @@ +diff -aur package.pristine/Makefile.PL package.new/Makefile.PL +--- package.pristine/Makefile.PL 2023-06-19 02:57:16.000000000 +0200 ++++ package.new/Makefile.PL 2024-04-23 23:05:56.859606566 +0200 +@@ -79,7 +79,7 @@ + } + + if ($gcc_version >= 4.8) { +- $opt{DEFINE} .= " -std=c++11"; ++ $opt{DEFINE} .= " -std=c++17"; + } else { + say "Need gcc version new enough to support C++11, exiting."; + exit 1; +@@ -90,7 +90,7 @@ + say "Compiling on clang $clang_version"; + + if ($clang_version >= 3) { +- $opt{DEFINE} .= " -std=c++11"; ++ $opt{DEFINE} .= " -std=c++17"; + } else { + say "Need clang version new enough to support C++11, this will probably fail."; + } |