!11 fix broken pkgconfig files
From: @willwolf Reviewed-by: @hanxinke Signed-off-by: @hanxinke
This commit is contained in:
commit
58102d0c4e
88
backport-re-order-pkgconfig-for-expected-dependencies.patch
Normal file
88
backport-re-order-pkgconfig-for-expected-dependencies.patch
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
From 73f7ac4d26aebfef924f3bd807f47522c2ff0ed8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Robbie Harwood <rharwood@redhat.com>
|
||||||
|
Date: Mon, 3 Jun 2019 16:04:16 -0400
|
||||||
|
Subject: [PATCH] Re-order pkgconfig for expected dependencies
|
||||||
|
|
||||||
|
Certain versions of autotools seem to generate recursive pkgconfig
|
||||||
|
files such that exec_prefix is defined in terms of prefix, and libdir
|
||||||
|
is defined in terms of exec_prefix. While all orderings are possible,
|
||||||
|
attempt to cope with this apparently common one.
|
||||||
|
|
||||||
|
Resolves: #25
|
||||||
|
Signed-off-by: hanxinke <hanxinke@huawei.com>
|
||||||
|
---
|
||||||
|
libverto-glib.pc.in | 2 +-
|
||||||
|
libverto-libev.pc.in | 2 +-
|
||||||
|
libverto-libevent.pc.in | 2 +-
|
||||||
|
libverto-tevent.pc.in | 2 +-
|
||||||
|
libverto.pc.in | 2 +-
|
||||||
|
5 files changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libverto-glib.pc.in b/libverto-glib.pc.in
|
||||||
|
index e7424e9..da25017 100644
|
||||||
|
--- a/libverto-glib.pc.in
|
||||||
|
+++ b/libverto-glib.pc.in
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
prefix=@prefix@
|
||||||
|
+exec_prefix=@exec_prefix@
|
||||||
|
libdir=@libdir@
|
||||||
|
includedir=@includedir@
|
||||||
|
-exec_prefix=@exec_prefix@
|
||||||
|
|
||||||
|
Name: libverto-glib
|
||||||
|
Description: Event loop abstraction interface (glib module)
|
||||||
|
diff --git a/libverto-libev.pc.in b/libverto-libev.pc.in
|
||||||
|
index e6eebbe..7694418 100644
|
||||||
|
--- a/libverto-libev.pc.in
|
||||||
|
+++ b/libverto-libev.pc.in
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
prefix=@prefix@
|
||||||
|
+exec_prefix=@exec_prefix@
|
||||||
|
libdir=@libdir@
|
||||||
|
includedir=@includedir@
|
||||||
|
-exec_prefix=@exec_prefix@
|
||||||
|
|
||||||
|
Name: libverto-libev
|
||||||
|
Description: Event loop abstraction interface (libev module)
|
||||||
|
diff --git a/libverto-libevent.pc.in b/libverto-libevent.pc.in
|
||||||
|
index de1c63a..7c3354c 100644
|
||||||
|
--- a/libverto-libevent.pc.in
|
||||||
|
+++ b/libverto-libevent.pc.in
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
prefix=@prefix@
|
||||||
|
+exec_prefix=@exec_prefix@
|
||||||
|
libdir=@libdir@
|
||||||
|
includedir=@includedir@
|
||||||
|
-exec_prefix=@exec_prefix@
|
||||||
|
|
||||||
|
Name: libverto-libevent
|
||||||
|
Description: Event loop abstraction interface (libevent module)
|
||||||
|
diff --git a/libverto-tevent.pc.in b/libverto-tevent.pc.in
|
||||||
|
index 95e5d8a..0568363 100644
|
||||||
|
--- a/libverto-tevent.pc.in
|
||||||
|
+++ b/libverto-tevent.pc.in
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
prefix=@prefix@
|
||||||
|
+exec_prefix=@exec_prefix@
|
||||||
|
libdir=@libdir@
|
||||||
|
includedir=@includedir@
|
||||||
|
-exec_prefix=@exec_prefix@
|
||||||
|
|
||||||
|
Name: libverto-tevent
|
||||||
|
Description: Event loop abstraction interface (tevent module)
|
||||||
|
diff --git a/libverto.pc.in b/libverto.pc.in
|
||||||
|
index 03c9599..c949397 100644
|
||||||
|
--- a/libverto.pc.in
|
||||||
|
+++ b/libverto.pc.in
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
prefix=@prefix@
|
||||||
|
+exec_prefix=@exec_prefix@
|
||||||
|
libdir=@libdir@
|
||||||
|
includedir=@includedir@
|
||||||
|
-exec_prefix=@exec_prefix@
|
||||||
|
|
||||||
|
Name: libverto
|
||||||
|
Description: Event loop abstraction interface
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
@ -1,11 +1,12 @@
|
|||||||
Name: libverto
|
Name: libverto
|
||||||
Version: 0.3.1
|
Version: 0.3.1
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: Main loop abstraction library
|
Summary: Main loop abstraction library
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://github.com/latchset/libverto
|
URL: https://github.com/latchset/libverto
|
||||||
Source0: https://github.com/latchset/libverto/releases/download/%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/latchset/libverto/releases/download/%{version}/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
|
Patch6000: backport-re-order-pkgconfig-for-expected-dependencies.patch
|
||||||
|
|
||||||
BuildRequires: autoconf automake libtool glib2-devel
|
BuildRequires: autoconf automake libtool glib2-devel
|
||||||
BuildRequires: libevent-devel libev-devel git
|
BuildRequires: libevent-devel libev-devel git
|
||||||
@ -90,6 +91,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
|||||||
%{_libdir}/pkgconfig/%{name}-libev.pc
|
%{_libdir}/pkgconfig/%{name}-libev.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 31 2022 hehuazhen <hehuazhen@huawei.com> - 0.3.1-3
|
||||||
|
- fix broken pkgconfig files
|
||||||
|
|
||||||
* Mon Oct 21 2019 shenyangyang <shenyangyang4@huawei.com> - 0.3.1-2
|
* Mon Oct 21 2019 shenyangyang <shenyangyang4@huawei.com> - 0.3.1-2
|
||||||
- Type:NA
|
- Type:NA
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user