diff options
| author | Bruno Randolf <br1@einfach.org> | 2020-11-02 15:30:19 +0000 |
|---|---|---|
| committer | Bruno Randolf <br1@einfach.org> | 2020-11-02 15:30:37 +0000 |
| commit | 66ace3b968c00b22f8cbbf5f22f97c7e2ba939a0 (patch) | |
| tree | ea1b69c3cceca3896cde915249c702347026c767 /libs/protobuf/patches | |
| parent | 2d8029ad62156033ed3eadf1d5cb445584b7de74 (diff) | |
protobuf: Update to version 3.13.0
Signed-off-by: Bruno Randolf <br1@einfach.org>
Diffstat (limited to 'libs/protobuf/patches')
| -rw-r--r-- | libs/protobuf/patches/010-rpath.patch | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libs/protobuf/patches/010-rpath.patch b/libs/protobuf/patches/010-rpath.patch index 70d27529a..c2fba6b34 100644 --- a/libs/protobuf/patches/010-rpath.patch +++ b/libs/protobuf/patches/010-rpath.patch @@ -1,12 +1,14 @@ ---- a/cmake/install.cmake -+++ b/cmake/install.cmake +Index: protobuf-3.13.0/cmake/install.cmake +=================================================================== +--- protobuf-3.13.0.orig/cmake/install.cmake ++++ protobuf-3.13.0/cmake/install.cmake @@ -16,8 +16,8 @@ foreach(_library ${_protobuf_libraries}) $<BUILD_INTERFACE:${protobuf_source_dir}/src> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) if (UNIX AND NOT APPLE) - set_property(TARGET ${_library} - PROPERTY INSTALL_RPATH "$ORIGIN") -+# set_property(TARGET ${_library} ++# set_property(TARGET ${_library} +# PROPERTY INSTALL_RPATH "$ORIGIN") elseif (APPLE) set_property(TARGET ${_library} @@ -16,9 +18,9 @@ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) if (UNIX AND NOT APPLE) - set_property(TARGET protoc -- PROPERTY INSTALL_RPATH "$ORIGIN/../lib") +- PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") +# set_property(TARGET protoc -+# PROPERTY INSTALL_RPATH "$ORIGIN/../lib") ++# PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") elseif (APPLE) set_property(TARGET protoc PROPERTY INSTALL_RPATH "@loader_path/../lib") |