* [PR PATCH] nss: fix pkg-config and nss-config
@ 2021-07-02 17:24 sgn
2021-07-10 5:13 ` [PR PATCH] [Updated] " sgn
2021-07-10 10:50 ` [PR PATCH] [Merged]: " sgn
0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2021-07-02 17:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1595 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages nss-config-fix
https://github.com/void-linux/void-packages/pull/31749
nss: fix pkg-config and nss-config
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/31749.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nss-config-fix-31749.patch --]
[-- Type: text/x-diff, Size: 5690 bytes --]
From 2186e51ca01fff6aaa6d91a4590e452ccd3f9832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 3 Jul 2021 00:06:05 +0700
Subject: [PATCH] nss: fix pkg-config and nss-config
---
srcpkgs/nss/files/nss-config.in | 145 --------------------------------
srcpkgs/nss/files/nss.pc.in | 11 ---
srcpkgs/nss/template | 26 +++---
3 files changed, 13 insertions(+), 169 deletions(-)
delete mode 100644 srcpkgs/nss/files/nss-config.in
delete mode 100644 srcpkgs/nss/files/nss.pc.in
diff --git a/srcpkgs/nss/files/nss-config.in b/srcpkgs/nss/files/nss-config.in
deleted file mode 100644
index f8f893e71a70..000000000000
--- a/srcpkgs/nss/files/nss-config.in
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-
-major_version=@MOD_MAJOR_VERSION@
-minor_version=@MOD_MINOR_VERSION@
-patch_version=@MOD_PATCH_VERSION@
-
-usage()
-{
- cat <<EOF
-Usage: nss-config [OPTIONS] [LIBRARIES]
-Options:
- [--prefix[=DIR]]
- [--exec-prefix[=DIR]]
- [--includedir[=DIR]]
- [--libdir[=DIR]]
- [--version]
- [--libs]
- [--cflags]
-Dynamic Libraries:
- nss
- nssutil
- ssl
- smime
-EOF
- exit $1
-}
-
-if test $# -eq 0; then
- usage 1 1>&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-lib_nssutil=yes
-
-while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
-
- case $1 in
- --prefix=*)
- prefix=$optarg
- ;;
- --prefix)
- echo_prefix=yes
- ;;
- --exec-prefix=*)
- exec_prefix=$optarg
- ;;
- --exec-prefix)
- echo_exec_prefix=yes
- ;;
- --includedir=*)
- includedir=$optarg
- ;;
- --includedir)
- echo_includedir=yes
- ;;
- --libdir=*)
- libdir=$optarg
- ;;
- --libdir)
- echo_libdir=yes
- ;;
- --version)
- echo ${major_version}.${minor_version}.${patch_version}
- ;;
- --cflags)
- echo_cflags=yes
- ;;
- --libs)
- echo_libs=yes
- ;;
- ssl)
- lib_ssl=yes
- ;;
- smime)
- lib_smime=yes
- ;;
- nss)
- lib_nss=yes
- ;;
- nssutil)
- lib_nssutil=yes
- ;;
- *)
- usage 1 1>&2
- ;;
- esac
- shift
-done
-
-# Set variables that may be dependent upon other variables
-if test -z "$exec_prefix"; then
- exec_prefix=`pkg-config --variable=exec_prefix nss`
-fi
-if test -z "$includedir"; then
- includedir=`pkg-config --variable=includedir nss`
-fi
-if test -z "$libdir"; then
- libdir=`pkg-config --variable=libdir nss`
-fi
-
-if test "$echo_prefix" = "yes"; then
- echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
- echo $exec_prefix
-fi
-
-if test "$echo_includedir" = "yes"; then
- echo $includedir
-fi
-
-if test "$echo_libdir" = "yes"; then
- echo $libdir
-fi
-
-if test "$echo_cflags" = "yes"; then
- echo -I$includedir
-fi
-
-if test "$echo_libs" = "yes"; then
- libdirs="-Wl,-rpath-link,$libdir -L$libdir"
- if test -n "$lib_ssl"; then
- libdirs="$libdirs -lssl${major_version}"
- fi
- if test -n "$lib_smime"; then
- libdirs="$libdirs -lsmime${major_version}"
- fi
- if test -n "$lib_nss"; then
- libdirs="$libdirs -lnss${major_version}"
- fi
- if test -n "$lib_nssutil"; then
- libdirs="$libdirs -lnssutil${major_version}"
- fi
- echo $libdirs
-fi
-
diff --git a/srcpkgs/nss/files/nss.pc.in b/srcpkgs/nss/files/nss.pc.in
deleted file mode 100644
index 42cca9ff8e46..000000000000
--- a/srcpkgs/nss/files/nss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSS
-Description: Network Security Services
-Version: %NSS_VERSION%
-Requires: nspr >= %NSPR_VERSION%
-Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3
-Cflags: -I${includedir}
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 183762e506b9..38d6468473a0 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -4,7 +4,7 @@ _nsprver=4.30
pkgname=nss
version=3.67
-revision=1
+revision=2
hostmakedepends="perl"
makedepends="nspr-devel sqlite-devel zlib-devel"
depends="nspr>=${_nsprver}"
@@ -118,26 +118,26 @@ do_install() {
NSS_VMINOR=$(grep "#define.*NSS_VMINOR" nss/lib/nss/nss.h | awk '{print $3}')
NSS_VPATCH=$(grep "#define.*NSS_VPATCH" nss/lib/nss/nss.h | awk '{print $3}')
- sed ${FILESDIR}/nss.pc.in \
- -e "s,%libdir%,/usr/lib,g" \
- -e "s,%prefix%,/usr,g" \
- -e "s,%exec_prefix%,/usr/bin,g" \
- -e "s,%includedir%,/usr/include/nss,g" \
+ sed -e "s,%prefix%,/usr,g" \
+ -e 's,%exec_prefix%,${prefix},g' \
+ -e 's,%includedir%,${prefix}/include/nss,g' \
+ -e 's,%libdir%,${prefix}/lib,g' \
-e "s,%NSPR_VERSION%,${_nsprver},g" \
- -e "s,%NSS_VERSION%,${version},g" > \
- ${DESTDIR}/usr/lib/pkgconfig/nss.pc
+ -e "s,%NSS_VERSION%,${version},g" \
+ nss/pkg/pkg-config/nss.pc.in \
+ > ${DESTDIR}/usr/lib/pkgconfig/nss.pc
ln -sf nss.pc ${DESTDIR}/usr/lib/pkgconfig/mozilla-nss.pc
chmod 644 ${DESTDIR}/usr/lib/pkgconfig/*.pc
- sed ${FILESDIR}/nss-config.in \
- -e "s,@libdir@,/usr/lib,g" \
- -e "s,@prefix@,/usr/bin,g" \
- -e "s,@exec_prefix@,/usr/bin,g" \
- -e "s,@includedir@,/usr/include/nss,g" \
+ sed -e "s,@prefix@,/usr,g" \
+ -e 's,@exec_prefix@,${prefix},g' \
+ -e 's,@includedir@,${prefix}/include/nss,g' \
+ -e 's,@libdir@,${prefix}/lib,g' \
-e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
-e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
-e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
+ nss/pkg/pkg-config/nss-config.in \
> ${DESTDIR}/usr/bin/nss-config
chmod 755 ${DESTDIR}/usr/bin/nss-config
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] nss: fix pkg-config and nss-config
2021-07-02 17:24 [PR PATCH] nss: fix pkg-config and nss-config sgn
@ 2021-07-10 5:13 ` sgn
2021-07-10 10:50 ` [PR PATCH] [Merged]: " sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2021-07-10 5:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1600 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages nss-config-fix
https://github.com/void-linux/void-packages/pull/31749
nss: fix pkg-config and nss-config
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/31749.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nss-config-fix-31749.patch --]
[-- Type: text/x-diff, Size: 9237 bytes --]
From 7dc475346be6a73d5063f8d403f4c66ffabcaf27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 8 Jul 2021 00:39:39 +0700
Subject: [PATCH 1/3] nspr: simplify template
---
srcpkgs/nspr/template | 31 ++++++++++++-------------------
1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template
index 2873d90183a6..7a3ecbb93c57 100644
--- a/srcpkgs/nspr/template
+++ b/srcpkgs/nspr/template
@@ -4,6 +4,7 @@ version=4.31
revision=1
build_wrksrc=nspr
build_style=gnu-configure
+configure_args="--enable-optimize --enable-debug --enable-ipv6"
makedepends="zlib-devel"
short_desc="NetScape Portable Runtime"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -11,28 +12,20 @@ license="MPL-2.0"
homepage="http://www.mozilla.org/projects/nspr/"
distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.tar.gz"
checksum=5729da87d5fbf1584b72840751e0c6f329b5d541850cacd1b61652c95015abc8
+CFLAGS="-D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE"
-do_configure() {
- CFLAGS="$CFLAGS -D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE"
+if [ "$XBPS_TARGET_WORDSIZE" = 64 ]; then
+ configure_args+=" --enable-64bit"
+fi
- if [ "$CROSS_BUILD" ]; then
- _args+=" --target=$XBPS_CROSS_TRIPLET"
- fi
- case "$XBPS_TARGET_MACHINE" in
- x86_64*|ppc64*|aarch64*) _args+=" --enable-64bit";;
- esac
+if [ "$CROSS_BUILD" ]; then
+ # nspr misused host in place of build
+ configure_args+=" --host=$XBPS_TRIPLET --target=$XBPS_CROSS_TRIPLET"
+ export HOST_CC="$CC_FOR_BUILD"
+ export HOST_CFLAGS="$CFLAGS_FOR_BUILD"
+ export HOST_LDFLAGS="$LDFLAGS_FOR_BUILD"
+fi
- ./configure --build=${XBPS_TRIPLET} --prefix=/usr --libdir=/usr/lib \
- --includedir=/usr/include/nspr --enable-optimize \
- --enable-debug --enable-ipv6 ${_args}
-}
-do_build() {
- if [ "$CROSS_BUILD" ]; then
- make ${makejobs}
- else
- make CC=$CC CXX=$CXX ${makejobs}
- fi
-}
post_install() {
sed -i "s|\(-specs=.*hardened-ld\)||g" ${DESTDIR}/usr/bin/nspr-config
ln -s nspr.pc ${DESTDIR}/usr/lib/pkgconfig/mozilla-nspr.pc
From cade906587ca926354f683cb6dffe02762d7a548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 9 Jul 2021 15:10:05 +0700
Subject: [PATCH 2/3] nspr: update to 4.32.
---
srcpkgs/nspr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template
index 7a3ecbb93c57..eefc49dfc5d4 100644
--- a/srcpkgs/nspr/template
+++ b/srcpkgs/nspr/template
@@ -1,6 +1,6 @@
# Template file for 'nspr'
pkgname=nspr
-version=4.31
+version=4.32
revision=1
build_wrksrc=nspr
build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="http://www.mozilla.org/projects/nspr/"
distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.tar.gz"
-checksum=5729da87d5fbf1584b72840751e0c6f329b5d541850cacd1b61652c95015abc8
+checksum=bb6bf4f534b9559cf123dcdc6f9cd8167de950314a90a88b2a329c16836e7f6c
CFLAGS="-D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE"
if [ "$XBPS_TARGET_WORDSIZE" = 64 ]; then
From e278237918006ba0dea00e544aeaa7451b54d947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 3 Jul 2021 00:06:05 +0700
Subject: [PATCH 3/3] nss: fix pkg-config and nss-config
---
srcpkgs/nss/files/nss-config.in | 145 --------------------------------
srcpkgs/nss/files/nss.pc.in | 11 ---
srcpkgs/nss/template | 26 +++---
3 files changed, 13 insertions(+), 169 deletions(-)
delete mode 100644 srcpkgs/nss/files/nss-config.in
delete mode 100644 srcpkgs/nss/files/nss.pc.in
diff --git a/srcpkgs/nss/files/nss-config.in b/srcpkgs/nss/files/nss-config.in
deleted file mode 100644
index f8f893e71a70..000000000000
--- a/srcpkgs/nss/files/nss-config.in
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-
-major_version=@MOD_MAJOR_VERSION@
-minor_version=@MOD_MINOR_VERSION@
-patch_version=@MOD_PATCH_VERSION@
-
-usage()
-{
- cat <<EOF
-Usage: nss-config [OPTIONS] [LIBRARIES]
-Options:
- [--prefix[=DIR]]
- [--exec-prefix[=DIR]]
- [--includedir[=DIR]]
- [--libdir[=DIR]]
- [--version]
- [--libs]
- [--cflags]
-Dynamic Libraries:
- nss
- nssutil
- ssl
- smime
-EOF
- exit $1
-}
-
-if test $# -eq 0; then
- usage 1 1>&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-lib_nssutil=yes
-
-while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
-
- case $1 in
- --prefix=*)
- prefix=$optarg
- ;;
- --prefix)
- echo_prefix=yes
- ;;
- --exec-prefix=*)
- exec_prefix=$optarg
- ;;
- --exec-prefix)
- echo_exec_prefix=yes
- ;;
- --includedir=*)
- includedir=$optarg
- ;;
- --includedir)
- echo_includedir=yes
- ;;
- --libdir=*)
- libdir=$optarg
- ;;
- --libdir)
- echo_libdir=yes
- ;;
- --version)
- echo ${major_version}.${minor_version}.${patch_version}
- ;;
- --cflags)
- echo_cflags=yes
- ;;
- --libs)
- echo_libs=yes
- ;;
- ssl)
- lib_ssl=yes
- ;;
- smime)
- lib_smime=yes
- ;;
- nss)
- lib_nss=yes
- ;;
- nssutil)
- lib_nssutil=yes
- ;;
- *)
- usage 1 1>&2
- ;;
- esac
- shift
-done
-
-# Set variables that may be dependent upon other variables
-if test -z "$exec_prefix"; then
- exec_prefix=`pkg-config --variable=exec_prefix nss`
-fi
-if test -z "$includedir"; then
- includedir=`pkg-config --variable=includedir nss`
-fi
-if test -z "$libdir"; then
- libdir=`pkg-config --variable=libdir nss`
-fi
-
-if test "$echo_prefix" = "yes"; then
- echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
- echo $exec_prefix
-fi
-
-if test "$echo_includedir" = "yes"; then
- echo $includedir
-fi
-
-if test "$echo_libdir" = "yes"; then
- echo $libdir
-fi
-
-if test "$echo_cflags" = "yes"; then
- echo -I$includedir
-fi
-
-if test "$echo_libs" = "yes"; then
- libdirs="-Wl,-rpath-link,$libdir -L$libdir"
- if test -n "$lib_ssl"; then
- libdirs="$libdirs -lssl${major_version}"
- fi
- if test -n "$lib_smime"; then
- libdirs="$libdirs -lsmime${major_version}"
- fi
- if test -n "$lib_nss"; then
- libdirs="$libdirs -lnss${major_version}"
- fi
- if test -n "$lib_nssutil"; then
- libdirs="$libdirs -lnssutil${major_version}"
- fi
- echo $libdirs
-fi
-
diff --git a/srcpkgs/nss/files/nss.pc.in b/srcpkgs/nss/files/nss.pc.in
deleted file mode 100644
index 42cca9ff8e46..000000000000
--- a/srcpkgs/nss/files/nss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSS
-Description: Network Security Services
-Version: %NSS_VERSION%
-Requires: nspr >= %NSPR_VERSION%
-Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3
-Cflags: -I${includedir}
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 183762e506b9..38d6468473a0 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -4,7 +4,7 @@ _nsprver=4.30
pkgname=nss
version=3.67
-revision=1
+revision=2
hostmakedepends="perl"
makedepends="nspr-devel sqlite-devel zlib-devel"
depends="nspr>=${_nsprver}"
@@ -118,26 +118,26 @@ do_install() {
NSS_VMINOR=$(grep "#define.*NSS_VMINOR" nss/lib/nss/nss.h | awk '{print $3}')
NSS_VPATCH=$(grep "#define.*NSS_VPATCH" nss/lib/nss/nss.h | awk '{print $3}')
- sed ${FILESDIR}/nss.pc.in \
- -e "s,%libdir%,/usr/lib,g" \
- -e "s,%prefix%,/usr,g" \
- -e "s,%exec_prefix%,/usr/bin,g" \
- -e "s,%includedir%,/usr/include/nss,g" \
+ sed -e "s,%prefix%,/usr,g" \
+ -e 's,%exec_prefix%,${prefix},g' \
+ -e 's,%includedir%,${prefix}/include/nss,g' \
+ -e 's,%libdir%,${prefix}/lib,g' \
-e "s,%NSPR_VERSION%,${_nsprver},g" \
- -e "s,%NSS_VERSION%,${version},g" > \
- ${DESTDIR}/usr/lib/pkgconfig/nss.pc
+ -e "s,%NSS_VERSION%,${version},g" \
+ nss/pkg/pkg-config/nss.pc.in \
+ > ${DESTDIR}/usr/lib/pkgconfig/nss.pc
ln -sf nss.pc ${DESTDIR}/usr/lib/pkgconfig/mozilla-nss.pc
chmod 644 ${DESTDIR}/usr/lib/pkgconfig/*.pc
- sed ${FILESDIR}/nss-config.in \
- -e "s,@libdir@,/usr/lib,g" \
- -e "s,@prefix@,/usr/bin,g" \
- -e "s,@exec_prefix@,/usr/bin,g" \
- -e "s,@includedir@,/usr/include/nss,g" \
+ sed -e "s,@prefix@,/usr,g" \
+ -e 's,@exec_prefix@,${prefix},g' \
+ -e 's,@includedir@,${prefix}/include/nss,g' \
+ -e 's,@libdir@,${prefix}/lib,g' \
-e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
-e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
-e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
+ nss/pkg/pkg-config/nss-config.in \
> ${DESTDIR}/usr/bin/nss-config
chmod 755 ${DESTDIR}/usr/bin/nss-config
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: nss: fix pkg-config and nss-config
2021-07-02 17:24 [PR PATCH] nss: fix pkg-config and nss-config sgn
2021-07-10 5:13 ` [PR PATCH] [Updated] " sgn
@ 2021-07-10 10:50 ` sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2021-07-10 10:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1445 bytes --]
There's a merged pull request on the void-packages repository
nss: fix pkg-config and nss-config
https://github.com/void-linux/void-packages/pull/31749
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-10 10:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-02 17:24 [PR PATCH] nss: fix pkg-config and nss-config sgn
2021-07-10 5:13 ` [PR PATCH] [Updated] " sgn
2021-07-10 10:50 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).