diff options
Diffstat (limited to 'sci-libs/libqhy/files/libqhy-1.5.0_fix_cmake_symlinks.patch')
| -rw-r--r-- | sci-libs/libqhy/files/libqhy-1.5.0_fix_cmake_symlinks.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/sci-libs/libqhy/files/libqhy-1.5.0_fix_cmake_symlinks.patch b/sci-libs/libqhy/files/libqhy-1.5.0_fix_cmake_symlinks.patch new file mode 100644 index 0000000..9073b87 --- /dev/null +++ b/sci-libs/libqhy/files/libqhy-1.5.0_fix_cmake_symlinks.patch @@ -0,0 +1,36 @@ +diff -urN indi-1.5.0/3rdparty/libqhy/CMakeLists.txt indi-1.5.0.new/3rdparty/libqhy/CMakeLists.txt +--- indi-1.5.0/3rdparty/libqhy/CMakeLists.txt 2017-08-20 11:44:27.000000000 +0200 ++++ indi-1.5.0.new/3rdparty/libqhy/CMakeLists.txt 2018-01-27 14:12:12.872891242 +0100 +@@ -29,7 +29,7 @@ + + set(FIRMWARE_INSTALL_DIR "/lib/firmware/qhy") + set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") +-set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib") ++set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") + + IF(UNIX AND NOT WIN32) + IF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l" OR CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv7l") +@@ -43,12 +43,6 @@ + ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l" OR CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv7l") + ENDIF(UNIX AND NOT WIN32) + +-# Make sure symbolic links are installed +-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake " +-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION})\n +-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 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}) +@@ -58,7 +52,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) + |