diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-03 19:17:21 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-03 19:17:21 +0000 |
| commit | 81e4fbcb846ed1cabdad699c0029b166dd7273b7 (patch) | |
| tree | 16f1236b7a386949c02a6e3c13d0fcd8298fa133 /app-arch/brotli/files | |
| parent | a70f42c65202d88c203c40910fef8f96f333d1ee (diff) | |
gentoo resync : 03.01.2018
Diffstat (limited to 'app-arch/brotli/files')
| -rw-r--r-- | app-arch/brotli/files/brotli-0.6.0-no-rpath.patch | 32 | ||||
| -rw-r--r-- | app-arch/brotli/files/brotli-1.0.2-no-rpath.patch | 21 |
2 files changed, 21 insertions, 32 deletions
diff --git a/app-arch/brotli/files/brotli-0.6.0-no-rpath.patch b/app-arch/brotli/files/brotli-0.6.0-no-rpath.patch deleted file mode 100644 index 28e70d7acfe7..000000000000 --- a/app-arch/brotli/files/brotli-0.6.0-no-rpath.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Tomasz Buchert <tomasz@debian.org> -Date: Sat, 24 Jun 2017 14:40:16 +0200 -Subject: Do not set rpath on shared libs. - ---- - CMakeLists.txt | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ca612d1..bf70d69 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -27,19 +27,6 @@ CMAKE_DEPENDENT_OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON "NOT BROTLI - - include(GNUInstallDirs) - --# When building shared libraries it is important to set the correct rpath. --# See https://cmake.org/Wiki/CMake_RPATH_handling#Always_full_RPATH --if (BUILD_SHARED_LIBS) -- add_definitions(-DBROTLI_SHARED_COMPILATION) -- set(CMAKE_SKIP_BUILD_RPATH FALSE) -- set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -- list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_LIBDIR}" isSystemDir) -- if ("${isSystemDir}" STREQUAL "-1") -- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}") -- endif() --endif() -- - # Parse version information from common/version.h. Normally we would - # define these values here and write them out to configuration file(s) - # (i.e., config.h), but in this case we parse them from diff --git a/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch b/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch new file mode 100644 index 000000000000..779b5e66bd98 --- /dev/null +++ b/app-arch/brotli/files/brotli-1.0.2-no-rpath.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ac55f6b3..2dc7232c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,16 +24,6 @@ mark_as_advanced(BROTLI_BUNDLED_MODE) + + include(GNUInstallDirs) + +-# When building shared libraries it is important to set the correct rpath. +-# See https://cmake.org/Wiki/CMake_RPATH_handling#Always_full_RPATH +-set(CMAKE_SKIP_BUILD_RPATH FALSE) +-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) +-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_LIBDIR}" isSystemDir) +-if ("${isSystemDir}" STREQUAL "-1") +- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}") +-endif() +- + # Parse version information from common/version.h. Normally we would + # define these values here and write them out to configuration file(s) + # (i.e., config.h), but in this case we parse them from |