diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 17:13:10 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 17:13:10 +0100 |
commit | 0bff53119f08d677db6c1a991bd30741682a8a08 (patch) | |
tree | 6ec8d4c38152bb4f2bb4b93277236ebd9fbbd21d /dev-libs/libical/files/fix-libdir-location.patch | |
parent | 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec (diff) |
Revert "gentoo resync : 02.06.2018"
This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.
Diffstat (limited to 'dev-libs/libical/files/fix-libdir-location.patch')
-rw-r--r-- | dev-libs/libical/files/fix-libdir-location.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/dev-libs/libical/files/fix-libdir-location.patch b/dev-libs/libical/files/fix-libdir-location.patch new file mode 100644 index 000000000000..53eb2040bc09 --- /dev/null +++ b/dev-libs/libical/files/fix-libdir-location.patch @@ -0,0 +1,26 @@ +This is a patch for Gentoo bug 560572, provided by Georgi Georgiev. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 773cf0c..e282ce4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -336,7 +336,7 @@ endif() + set(VERSION "${PROJECT_VERSION}") + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix "\${prefix}") +-set(libdir "\${exec_prefix}/lib") ++set(libdir "${LIB_INSTALL_DIR}") + set(includedir "\${prefix}/include") + set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}") + +diff --git a/libical.pc.in b/libical.pc.in +index 7774dce..bf88476 100644 +--- a/libical.pc.in ++++ b/libical.pc.in +@@ -8,5 +8,5 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@ + Name: libical + Description: An implementation of basic iCAL protocols + Version: @VERSION@ +-Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib} ++Libs: -lical -licalss -licalvcal ${threadslib} ${iculib} + Cflags: -I${includedir} |