68 lines
2.2 KiB
Diff
68 lines
2.2 KiB
Diff
From 0830ceffb32bdf61dab2a598b9e77f65d089074f Mon Sep 17 00:00:00 2001
|
|
From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
|
|
Date: Fri, 27 Jan 2017 16:10:14 -0600
|
|
Subject: [PATCH] Split libsolvext into it's own pkg-config file
|
|
|
|
Upstream-Status: Submitted (https://github.com/openSUSE/libsolv/pull/177)
|
|
|
|
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
|
|
---
|
|
CMakeLists.txt | 4 +++-
|
|
libsolv.pc.in | 4 ++--
|
|
libsolv.pc.in => libsolvext.pc.in | 4 ++--
|
|
3 files changed, 7 insertions(+), 5 deletions(-)
|
|
copy libsolv.pc.in => libsolvext.pc.in (62%)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 82034e0..0777ed9 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -384,9 +384,11 @@ MACRO (SPECFILE)
|
|
ENDMACRO (SPECFILE)
|
|
|
|
MACRO (PCFILE)
|
|
- MESSAGE (STATUS "Writing pkg-config file...")
|
|
+ MESSAGE (STATUS "Writing pkg-config files...")
|
|
CONFIGURE_FILE (${CMAKE_SOURCE_DIR}/libsolv.pc.in ${CMAKE_BINARY_DIR}/libsolv.pc @ONLY)
|
|
INSTALL( FILES ${CMAKE_BINARY_DIR}/libsolv.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
|
|
+ CONFIGURE_FILE (${CMAKE_SOURCE_DIR}/libsolvext.pc.in ${CMAKE_BINARY_DIR}/libsolvext.pc @ONLY)
|
|
+ INSTALL( FILES ${CMAKE_BINARY_DIR}/libsolvext.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
|
|
ENDMACRO (PCFILE)
|
|
|
|
SPECFILE ()
|
|
diff --git a/libsolv.pc.in b/libsolv.pc.in
|
|
index c82dfc4..40a8623 100644
|
|
--- a/libsolv.pc.in
|
|
+++ b/libsolv.pc.in
|
|
@@ -2,7 +2,7 @@ libdir=@LIB_INSTALL_DIR@
|
|
includedir=@INCLUDE_INSTALL_DIR@
|
|
|
|
Name: libsolv
|
|
-Description: Library for solving packages and reading repositories
|
|
+Description: Library for solving packages
|
|
Version: @VERSION@
|
|
-Libs: -L${libdir} -lsolvext -lsolv
|
|
+Libs: -L${libdir} -lsolv
|
|
Cflags: -I${includedir}
|
|
diff --git a/libsolv.pc.in b/libsolvext.pc.in
|
|
similarity index 62%
|
|
copy from libsolv.pc.in
|
|
copy to libsolvext.pc.in
|
|
index c82dfc4..6395f39 100644
|
|
--- a/libsolv.pc.in
|
|
+++ b/libsolvext.pc.in
|
|
@@ -1,8 +1,8 @@
|
|
libdir=@LIB_INSTALL_DIR@
|
|
includedir=@INCLUDE_INSTALL_DIR@
|
|
|
|
-Name: libsolv
|
|
-Description: Library for solving packages and reading repositories
|
|
+Name: libsolvext
|
|
+Description: Library for reading repositories
|
|
Version: @VERSION@
|
|
Libs: -L${libdir} -lsolvext -lsolv
|
|
Cflags: -I${includedir}
|
|
--
|
|
2.7.4
|
|
|