Install a versioned library symlink (#2247508)
This commit is contained in:
parent
46596c6ffb
commit
7abcff4b4a
@ -1,22 +0,0 @@
|
|||||||
From 4aef6b5c5e0d1b5c87cbd081cf841e7211bae149 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jan-Michael Brummer <jan.brummer@tabos.org>
|
|
||||||
Date: Tue, 23 May 2023 09:17:34 +0200
|
|
||||||
Subject: [PATCH] Fix libproxy rpath
|
|
||||||
|
|
||||||
Should fix https://bugzilla.redhat.com/show_bug.cgi?id=2209173
|
|
||||||
---
|
|
||||||
src/libproxy/meson.build | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/src/libproxy/meson.build b/src/libproxy/meson.build
|
|
||||||
index 3a9aa87a..a2b9b3b6 100644
|
|
||||||
--- a/src/libproxy/meson.build
|
|
||||||
+++ b/src/libproxy/meson.build
|
|
||||||
@@ -30,6 +30,7 @@ libproxy = shared_library(
|
|
||||||
link_depends : mapfile,
|
|
||||||
soversion: '1',
|
|
||||||
install: true,
|
|
||||||
+ install_rpath: pkglibdir,
|
|
||||||
)
|
|
||||||
|
|
||||||
libproxy_dep = declare_dependency (
|
|
33
libproxy-0.5.3-library-version-symlink.patch
Normal file
33
libproxy-0.5.3-library-version-symlink.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
From a1e6c95fe6b3eaf558274f5a6234d022b7da4002 Mon Sep 17 00:00:00 2001
|
||||||
|
From: David King <amigadave@amigadave.com>
|
||||||
|
Date: Thu, 2 Nov 2023 09:10:46 +0000
|
||||||
|
Subject: [PATCH] Specify library version more completely
|
||||||
|
|
||||||
|
If the library version is not specified, meson installs the shared
|
||||||
|
object using only the soversion, and tis causes ldconfig to emit a
|
||||||
|
warning that the shared object is not a symlink. Specifying a version
|
||||||
|
that matches the project version means that version is used for the
|
||||||
|
shared object, and the soversion-named file is then a symilnk to that,
|
||||||
|
which is common across other libraries, and avoids the warning from
|
||||||
|
ldconfig.
|
||||||
|
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=2247508
|
||||||
|
---
|
||||||
|
src/libproxy/meson.build | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/src/libproxy/meson.build b/src/libproxy/meson.build
|
||||||
|
index 343b645..558719c 100644
|
||||||
|
--- a/src/libproxy/meson.build
|
||||||
|
+++ b/src/libproxy/meson.build
|
||||||
|
@@ -29,6 +29,7 @@ libproxy = shared_library(
|
||||||
|
link_args : vflag,
|
||||||
|
link_depends : mapfile,
|
||||||
|
soversion: '1',
|
||||||
|
+ version: meson.project_version(),
|
||||||
|
install: true,
|
||||||
|
install_rpath: pkglibdir,
|
||||||
|
)
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
@ -4,12 +4,15 @@
|
|||||||
|
|
||||||
Name: libproxy
|
Name: libproxy
|
||||||
Version: 0.5.3
|
Version: 0.5.3
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: A library handling all the details of proxy configuration
|
Summary: A library handling all the details of proxy configuration
|
||||||
|
|
||||||
License: LGPL-2.1-or-later
|
License: LGPL-2.1-or-later
|
||||||
URL: https://libproxy.github.io/libproxy/
|
URL: https://libproxy.github.io/libproxy/
|
||||||
Source0: https://github.com/libproxy/%{name}/archive/refs/tags/%{version}.tar.gz
|
Source0: https://github.com/libproxy/%{name}/archive/refs/tags/%{version}.tar.gz
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2247508
|
||||||
|
# https://github.com/libproxy/libproxy/pull/259
|
||||||
|
Patch0: libproxy-0.5.3-library-version-symlink.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: meson
|
BuildRequires: meson
|
||||||
@ -121,6 +124,9 @@ developing applications that use %{name}.
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Nov 02 2023 David King <amigadave@amigadave.com> - 0.5.3-3
|
||||||
|
- Install a versioned library symlink (#2247508)
|
||||||
|
|
||||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-2
|
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user