diff options
| author | Ctibor Brančík <ctibor@brancik.cz> | 2016-11-03 23:31:12 +0100 |
|---|---|---|
| committer | Ctibor Brančík <ctibor@brancik.cz> | 2016-11-03 23:31:12 +0100 |
| commit | f0e37fe10efa5324def7fa72069ebc1ad2a5c140 (patch) | |
| tree | 616db38ff75171ef7f71aba0b7cee1282d32d64a | |
| parent | ae0b17cc7c05ecfc3ac6c53fcba7089815d5219b (diff) | |
| download | brancik-overlay-f0e37fe10efa5324def7fa72069ebc1ad2a5c140.tar.gz brancik-overlay-f0e37fe10efa5324def7fa72069ebc1ad2a5c140.tar.bz2 | |
Update patch for sci-libs/libqhy
| -rw-r--r-- | sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch b/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch index 89d8d49..9b42a2f 100644 --- a/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch +++ b/sci-libs/libqhy/files/libqhy-9999_fix_cmake_symlinks.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt 2015-11-24 19:51:44.637032421 +0100 -+++ CMakeLists.txt.new 2015-11-24 19:54:46.486779641 +0100 +--- CMakeLists.txt 2016-11-03 23:07:27.274473275 +0100 ++++ CMakeLists.txt.new 2016-11-03 23:09:45.604228575 +0100 @@ -31,12 +31,6 @@ ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l")
ENDIF(UNIX AND NOT WIN32)
@@ -10,16 +10,17 @@ -exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so)\n
-")
-
- install(FILES qhyccd.h qhyccdcamdef.h qhyccderr.h qhyccdstruct.h DESTINATION include/libqhy)
+ install(FILES qhyccd.h qhyccdcamdef.h qhyccderr.h qhyccdstruct.h log4z.h DESTINATION include/libqhy)
install(FILES ${CMAKE_BINARY_DIR}/libqhy.so.${LIBQHY_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX})
install(FILES 85-qhy.rules DESTINATION ${UDEVRULES_INSTALL_DIR})
-@@ -48,5 +42,9 @@ -
- install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake)
+@@ -46,7 +40,9 @@ + file(INSTALL DESTINATION ${FIRMWARE_INSTALL_DIR} TYPE FILE FILES \${QHY_FIRMWARE})"
+ )
+-install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake)
+# Make sure symbolic links are installed
+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libqhy.so.${LIBQHY_VERSION}\" \"libqhy.so.${LIBQHY_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libqhy.so.${LIBQHY_SOVERSION}\" \"libqhy.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" )
-+
+
ENDIF (APPLE)
|