Revert 'Add runtime linker path to pkg-config files (#740)'

This commit is contained in:
sxt1001 2021-02-05 15:11:46 +08:00
parent aee7ecebe9
commit c55a00512a
2 changed files with 54 additions and 1 deletions

View File

@ -0,0 +1,48 @@
From 09b0992b6acb7faa6fd3b23f9bc036ea117230fc Mon Sep 17 00:00:00 2001
From: Eugene Kliuchnikov <eustas.ru@gmail.com>
Date: Wed, 2 Sep 2020 11:38:26 +0200
Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)"
(#838)
This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
---
scripts/libbrotlicommon.pc.in | 2 +-
scripts/libbrotlidec.pc.in | 2 +-
scripts/libbrotlienc.pc.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
index 10ca969e..2a8cf7a3 100644
--- a/scripts/libbrotlicommon.pc.in
+++ b/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}
diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
index e7c3124f..6f8ef2e4 100644
--- a/scripts/libbrotlidec.pc.in
+++ b/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}
diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
index 4dd0811b..2098afe2 100644
--- a/scripts/libbrotlienc.pc.in
+++ b/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}

View File

@ -1,12 +1,14 @@
Name: brotli Name: brotli
Version: 1.0.9 Version: 1.0.9
Release: 1 Release: 2
Summary: Lossless compression algorithm Summary: Lossless compression algorithm
License: MIT License: MIT
URL: https://github.com/google/brotli URL: https://github.com/google/brotli
Source0: https://github.com/google/brotli/archive/v%{version}.tar.gz Source0: https://github.com/google/brotli/archive/v%{version}.tar.gz
Patch6000: backport-Revert-Add-runtime-linker-path-to-pkg-config-files.patch
BuildRequires: python3-devel gcc-c++ gcc cmake BuildRequires: python3-devel gcc-c++ gcc cmake
@ -90,6 +92,9 @@ popd
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Fri Feb 05 2021 shixuantong <shixuantong@huawei.com> - 1.0.9-2
- Revert "Add runtime linker path to pkg-config files (#740)"
* Tue Feb 2 2021 liudabo <liudabo1@huawei.com> - 1.0.9-1 * Tue Feb 2 2021 liudabo <liudabo1@huawei.com> - 1.0.9-1
- upgrade version to 1.0.9 - upgrade version to 1.0.9