From 5deeb36ed71aa62270f0840e820065a3ab7a6c6b Mon Sep 17 00:00:00 2001 From: "l.feng" <43399351+msclock@users.noreply.github.com> Date: Thu, 5 Dec 2024 04:50:55 +0800 Subject: [PATCH] [pcre] fix build failure on s390x (#42460) --- ports/pcre/portfile.cmake | 2 +- ports/pcre/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pcre.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake index f7b42765fc..2e6609601b 100644 --- a/ports/pcre/portfile.cmake +++ b/ports/pcre/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_from_sourceforge( ) set(IS_PCRE_SUPPORT_JIT YES) -if(VCPKG_TARGET_ARCHITECTURE MATCHES "loongarch") +if(VCPKG_TARGET_ARCHITECTURE MATCHES "(loongarch|^s390)") set(IS_PCRE_SUPPORT_JIT NO) endif() diff --git a/ports/pcre/vcpkg.json b/ports/pcre/vcpkg.json index 364191ba77..060ae4936b 100644 --- a/ports/pcre/vcpkg.json +++ b/ports/pcre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pcre", "version": "8.45", - "port-version": 6, + "port-version": 7, "description": "Perl Compatible Regular Expressions", "homepage": "https://www.pcre.org/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 3d175ae1c3..459de6c80d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6930,7 +6930,7 @@ }, "pcre": { "baseline": "8.45", - "port-version": 6 + "port-version": 7 }, "pcre2": { "baseline": "10.43", diff --git a/versions/p-/pcre.json b/versions/p-/pcre.json index 556d401cca..22688c7716 100644 --- a/versions/p-/pcre.json +++ b/versions/p-/pcre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efb74e04576fa0da0587cdb06cbfeef72a8d9218", + "version": "8.45", + "port-version": 7 + }, { "git-tree": "50cd82cb1c716b4c31687b01c009a751f4259c8e", "version": "8.45",