From 1dd86ab7589690389eec1b39b7b6a65a67738b05 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 9 Jul 2025 11:56:19 +0200 Subject: [PATCH] [vcpkg baseline][nspr] Unexport ldflags (#46339) --- ports/nspr/portfile.cmake | 1 + ports/nspr/unexport-ldflags.diff | 13 +++++++++++++ ports/nspr/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/n-/nspr.json | 5 +++++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ports/nspr/unexport-ldflags.diff diff --git a/ports/nspr/portfile.cmake b/ports/nspr/portfile.cmake index a16616393d..e450ba0e8a 100644 --- a/ports/nspr/portfile.cmake +++ b/ports/nspr/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_extract_source_archive( library-linkage.diff nsinstall-windows.diff parallel.diff + unexport-ldflags.diff ) set(OPTIONS "") diff --git a/ports/nspr/unexport-ldflags.diff b/ports/nspr/unexport-ldflags.diff new file mode 100644 index 0000000000..702b8755d1 --- /dev/null +++ b/ports/nspr/unexport-ldflags.diff @@ -0,0 +1,13 @@ +diff --git a/nspr/config/nspr-config.in b/nspr/config/nspr-config.in +index 2cb62a0..6db7aa3 100755 +--- a/nspr/config/nspr-config.in ++++ b/nspr/config/nspr-config.in +@@ -136,7 +136,7 @@ if test "$echo_libs" = "yes"; then + if test -n "$lib_nspr"; then + libdirs="$libdirs -lnspr${major_version}" + fi +- os_ldflags="@LDFLAGS@" ++ os_ldflags="" + for i in $os_ldflags ; do + if echo $i | grep \^-L >/dev/null; then + libdirs="$libdirs $i" diff --git a/ports/nspr/vcpkg.json b/ports/nspr/vcpkg.json index 3481efdc6b..e087f5cd61 100644 --- a/ports/nspr/vcpkg.json +++ b/ports/nspr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nspr", "version": "4.36", + "port-version": 1, "description": "Netscape portable runtime", "homepage": "https://releases.mozilla.org/pub/nspr/", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 95389689d7..7ec8e517c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6714,7 +6714,7 @@ }, "nspr": { "baseline": "4.36", - "port-version": 0 + "port-version": 1 }, "nss": { "baseline": "3.113.1", diff --git a/versions/n-/nspr.json b/versions/n-/nspr.json index dbff713965..b7bca3a49c 100644 --- a/versions/n-/nspr.json +++ b/versions/n-/nspr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "acb02a481a11d66bd0dbc03a37b6ecdbacf49087", + "version": "4.36", + "port-version": 1 + }, { "git-tree": "e8e42a8f8cc4970fecbe6d6e671031078c562c0e", "version": "4.36",