Sun Mar 21 19:24:24 2021 UTC ()
Fix rpath arguments in brotli pkgconfig files

The pkgconfig files for brotli had a direct -R missing -Wl, this breaks
the linking step when used. Remove them and use PKGCONFIG_OVERRIDE instead.


(nros)
diff -r1.8 -r1.9 pkgsrc/archivers/brotli/Makefile
diff -r1.8 -r1.9 pkgsrc/archivers/brotli/distinfo
diff -r0 -r1.1 pkgsrc/archivers/brotli/patches/patch-scripts_libbrotlicommon.pc.in
diff -r0 -r1.1 pkgsrc/archivers/brotli/patches/patch-scripts_libbrotlidec.pc.in
diff -r0 -r1.1 pkgsrc/archivers/brotli/patches/patch-scripts_libbrotlienc.pc.in
cvs diff -r1.8 -r1.9 pkgsrc/archivers/brotli/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/brotli/Makefile 2020/08/31 08:45:44 1.8
+++ pkgsrc/archivers/brotli/Makefile 2021/03/21 19:24:24 1.9
@@ -1,16 +1,20 @@ @@ -1,16 +1,20 @@
1# $NetBSD: Makefile,v 1.8 2020/08/31 08:45:44 wiz Exp $ 1# $NetBSD: Makefile,v 1.9 2021/03/21 19:24:24 nros Exp $
2 2
3DISTNAME= brotli-1.0.9 3DISTNAME= brotli-1.0.9
4CATEGORIES= archivers 4CATEGORIES= archivers
5MASTER_SITES= ${MASTER_SITE_GITHUB:=google/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=google/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/google/brotli 9HOMEPAGE= https://github.com/google/brotli
10COMMENT= Generic-purpose lossless compression algorithm 10COMMENT= Generic-purpose lossless compression algorithm
11LICENSE= mit 11LICENSE= mit
12 12
13USE_CMAKE= yes 13USE_CMAKE= yes
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15 15
 16PKGCONFIG_OVERRIDE+= scripts/libbrotlicommon.pc.in
 17PKGCONFIG_OVERRIDE+= scripts/libbrotlidec.pc.in
 18PKGCONFIG_OVERRIDE+= scripts/libbrotlienc.pc.in
 19
16.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/archivers/brotli/distinfo (expand / switch to unified diff)

--- pkgsrc/archivers/brotli/distinfo 2020/08/31 08:45:44 1.8
+++ pkgsrc/archivers/brotli/distinfo 2021/03/21 19:24:24 1.9
@@ -1,7 +1,10 @@ @@ -1,7 +1,10 @@
1$NetBSD: distinfo,v 1.8 2020/08/31 08:45:44 wiz Exp $ 1$NetBSD: distinfo,v 1.9 2021/03/21 19:24:24 nros Exp $
2 2
3SHA1 (brotli-1.0.9.tar.gz) = ddfefdf2593b3f03eec221a7f4ceaa710e5a2e6b 3SHA1 (brotli-1.0.9.tar.gz) = ddfefdf2593b3f03eec221a7f4ceaa710e5a2e6b
4RMD160 (brotli-1.0.9.tar.gz) = aef7f7c6f4f1cea3c8dd84563598de17a6118c0e 4RMD160 (brotli-1.0.9.tar.gz) = aef7f7c6f4f1cea3c8dd84563598de17a6118c0e
5SHA512 (brotli-1.0.9.tar.gz) = b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5 5SHA512 (brotli-1.0.9.tar.gz) = b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
6Size (brotli-1.0.9.tar.gz) = 486984 bytes 6Size (brotli-1.0.9.tar.gz) = 486984 bytes
7SHA1 (patch-CMakeLists.txt) = ab1b60d2ae23e7976339c127dab7f5296c8a791b 7SHA1 (patch-CMakeLists.txt) = ab1b60d2ae23e7976339c127dab7f5296c8a791b
 8SHA1 (patch-scripts_libbrotlicommon.pc.in) = 4544629c9e6ec539dc58624991a4a916c6232aef
 9SHA1 (patch-scripts_libbrotlidec.pc.in) = 54969400b302c736c97f48add611eaa471b7dbe1
 10SHA1 (patch-scripts_libbrotlienc.pc.in) = d697b2fb3859c99f3815ff00072d3949e482522c
File Added: pkgsrc/archivers/brotli/patches/patch-scripts_libbrotlicommon.pc.in
$NetBSD: patch-scripts_libbrotlicommon.pc.in,v 1.1 2021/03/21 19:24:24 nros Exp $

Remove wrong rpath argument on Linux and use PKGCONFIG_OVERIDE instead

--- scripts/libbrotlicommon.pc.in.orig	2021-03-21 12:51:37.961672495 +0000
+++ scripts/libbrotlicommon.pc.in
@@ -7,5 +7,5 @@ Name: libbrotlicommon
 URL: https://github.com/google/brotli
 Description: Brotli common dictionary library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -R${libdir} -lbrotlicommon
+Libs: -L${libdir} -lbrotlicommon
 Cflags: -I${includedir}
File Added: pkgsrc/archivers/brotli/patches/patch-scripts_libbrotlidec.pc.in
$NetBSD: patch-scripts_libbrotlidec.pc.in,v 1.1 2021/03/21 19:24:24 nros Exp $

Remove wrong rpath argument on Linux and use PKGCONFIG_OVERIDE instead

--- scripts/libbrotlidec.pc.in.orig	2021-03-21 12:52:03.713184864 +0000
+++ scripts/libbrotlidec.pc.in
@@ -7,6 +7,6 @@ Name: libbrotlidec
 URL: https://github.com/google/brotli
 Description: Brotli decoder library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -R${libdir} -lbrotlidec
+Libs: -L${libdir} -lbrotlidec
 Requires.private: libbrotlicommon >= 1.0.2
 Cflags: -I${includedir}
File Added: pkgsrc/archivers/brotli/patches/patch-scripts_libbrotlienc.pc.in
$NetBSD: patch-scripts_libbrotlienc.pc.in,v 1.1 2021/03/21 19:24:24 nros Exp $

Remove wrong rpath argument on Linux and use PKGCONFIG_OVERIDE instead

--- scripts/libbrotlienc.pc.in.orig	2021-03-21 12:52:22.084860314 +0000
+++ scripts/libbrotlienc.pc.in
@@ -7,6 +7,6 @@ Name: libbrotlienc
 URL: https://github.com/google/brotli
 Description: Brotli encoder library
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -R${libdir} -lbrotlienc
+Libs: -L${libdir} -lbrotlienc
 Requires.private: libbrotlicommon >= 1.0.2
 Cflags: -I${includedir}