From b3eda7135c9f6094ee3580583f066ab532032110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ctibor=20Bran=C4=8D=C3=ADk?= Date: Mon, 29 Jan 2018 22:26:57 +0100 Subject: Update patches for indi 3rd party libs --- .../files/libapogee_1.5.0-fix_cmake_libdir.patch | 12 -------- sci-libs/libapogee/libapogee-1.6.2.ebuild | 2 -- .../files/libinova-1.5.0_fix_cmake_symlinks.patch | 27 ---------------- .../files/libinova-1.6.2_fix_cmake_symlinks.patch | 19 ++++++++++++ sci-libs/libinova/libinova-1.6.2.ebuild | 2 +- .../files/libqhy-1.5.0_fix_cmake_symlinks.patch | 36 ---------------------- .../files/libqhy-1.6.2_fix_cmake_symlinks.patch | 24 +++++++++++++++ sci-libs/libqhy/libqhy-1.6.2.ebuild | 2 +- .../files/libsbig-1.5.0_fix_cmake_symlinks.patch | 30 ------------------ .../files/libsbig-1.6.2_fix_cmake_symlinks.patch | 21 +++++++++++++ sci-libs/libsbig/libsbig-1.6.2.ebuild | 2 +- 11 files changed, 67 insertions(+), 110 deletions(-) delete mode 100644 sci-libs/libapogee/files/libapogee_1.5.0-fix_cmake_libdir.patch delete mode 100644 sci-libs/libinova/files/libinova-1.5.0_fix_cmake_symlinks.patch create mode 100644 sci-libs/libinova/files/libinova-1.6.2_fix_cmake_symlinks.patch delete mode 100644 sci-libs/libqhy/files/libqhy-1.5.0_fix_cmake_symlinks.patch create mode 100644 sci-libs/libqhy/files/libqhy-1.6.2_fix_cmake_symlinks.patch delete mode 100644 sci-libs/libsbig/files/libsbig-1.5.0_fix_cmake_symlinks.patch create mode 100644 sci-libs/libsbig/files/libsbig-1.6.2_fix_cmake_symlinks.patch diff --git a/sci-libs/libapogee/files/libapogee_1.5.0-fix_cmake_libdir.patch b/sci-libs/libapogee/files/libapogee_1.5.0-fix_cmake_libdir.patch deleted file mode 100644 index 7203da7..0000000 --- a/sci-libs/libapogee/files/libapogee_1.5.0-fix_cmake_libdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN indi-1.5.0/3rdparty/libapogee/CMakeLists.txt indi-1.5.0.new/3rdparty/libapogee/CMakeLists.txt ---- indi-1.5.0/3rdparty/libapogee/CMakeLists.txt 2017-08-20 11:44:27.000000000 +0200 -+++ indi-1.5.0.new/3rdparty/libapogee/CMakeLists.txt 2017-12-27 18:03:46.578437290 +0100 -@@ -94,7 +94,7 @@ - - target_link_libraries(apogee ${LIBUSB_1_LIBRARIES} ${CURL_LIBRARY} ${Boost_LIBRARIES}) - --install(TARGETS apogee LIBRARY DESTINATION lib) -+install(TARGETS apogee LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - install( FILES ApogeeCam.h Alta.h AltaF.h Ascent.h CamGen2Base.h CameraInfo.h CameraStatusRegs.h Aspen.h FindDeviceEthernet.h FindDeviceUsb.h HiC.h ApogeeFilterWheel.h Quad.h DefDllExport.h versionNo.h doc.h ApgLogger.h LoggerSyslog.h DESTINATION include/libapogee COMPONENT Devel) - diff --git a/sci-libs/libapogee/libapogee-1.6.2.ebuild b/sci-libs/libapogee/libapogee-1.6.2.ebuild index 2fbe3d7..005d89d 100644 --- a/sci-libs/libapogee/libapogee-1.6.2.ebuild +++ b/sci-libs/libapogee/libapogee-1.6.2.ebuild @@ -21,8 +21,6 @@ DEPEND="virtual/libusb:1 RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/libapogee_1.5.0-fix_cmake_libdir.patch" ) - INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}" S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}" diff --git a/sci-libs/libinova/files/libinova-1.5.0_fix_cmake_symlinks.patch b/sci-libs/libinova/files/libinova-1.5.0_fix_cmake_symlinks.patch deleted file mode 100644 index 5d713cc..0000000 --- a/sci-libs/libinova/files/libinova-1.5.0_fix_cmake_symlinks.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ruN indi-1.5.0/3rdparty/libinovasdk/CMakeLists.txt indi-1.5.0.new/3rdparty/libinovasdk/CMakeLists.txt ---- indi-1.5.0/3rdparty/libinovasdk/CMakeLists.txt 2017-08-20 11:44:27.000000000 +0200 -+++ indi-1.5.0.new/3rdparty/libinovasdk/CMakeLists.txt 2017-12-26 22:25:12.524888994 +0100 -@@ -6,7 +6,7 @@ - - set(FIRMWARE_INSTALL_DIR "/lib/firmware") - 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}") - - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error") -@@ -26,12 +26,8 @@ - ENDIF(UNIX AND NOT WIN32 AND NOT APPLE) - - # Make sure symbolic links are installed --file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_inovasdk_symlink.cmake " --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so.${INOVASDK_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so.${INOVASDK_SOVERSION})\n --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so.${INOVASDK_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so)\n --") -- - install( FILES ${CMAKE_BINARY_DIR}/libinovasdk.so.${INOVASDK_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX}) - install( FILES inovasdk.h DESTINATION include/inovasdk) - install( FILES 99-inovaplx.rules DESTINATION ${UDEVRULES_INSTALL_DIR}) --install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_inovasdk_symlink.cmake) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libinovasdk.so.${INOVASDK_VERSION}\" \"libinovasdk.so.${INOVASDK_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libinovasdk.so.${INOVASDK_SOVERSION}\" \"libinovasdk.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) diff --git a/sci-libs/libinova/files/libinova-1.6.2_fix_cmake_symlinks.patch b/sci-libs/libinova/files/libinova-1.6.2_fix_cmake_symlinks.patch new file mode 100644 index 0000000..827e616 --- /dev/null +++ b/sci-libs/libinova/files/libinova-1.6.2_fix_cmake_symlinks.patch @@ -0,0 +1,19 @@ +diff -urN indi-1.6.2/3rdparty/libinovasdk/CMakeLists.txt indi-1.6.2.new/3rdparty/libinovasdk/CMakeLists.txt +--- indi-1.6.2/3rdparty/libinovasdk/CMakeLists.txt 2018-01-08 14:45:25.000000000 +0100 ++++ indi-1.6.2.new/3rdparty/libinovasdk/CMakeLists.txt 2018-01-29 22:13:35.755950489 +0100 +@@ -27,13 +27,8 @@ + ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l") + ENDIF(UNIX AND NOT WIN32 AND NOT APPLE) + +-# Make sure symbolic links are installed +-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_inovasdk_symlink.cmake " +-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libinovasdk.so.${INOVASDK_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so.${INOVASDK_SOVERSION})\n +-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libinovasdk.so.${INOVASDK_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libinovasdk.so)\n +-") +- + install( FILES ${CMAKE_BINARY_DIR}/libinovasdk.so.${INOVASDK_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX}) + install( FILES inovasdk.h DESTINATION include/inovasdk) + install( FILES 99-inovaplx.rules DESTINATION ${UDEVRULES_INSTALL_DIR}) +-install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_inovasdk_symlink.cmake) ++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libinovasdk.so.${INOVASDK_VERSION}\" \"libinovasdk.so.${INOVASDK_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) ++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libinovasdk.so.${INOVASDK_SOVERSION}\" \"libinovasdk.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) diff --git a/sci-libs/libinova/libinova-1.6.2.ebuild b/sci-libs/libinova/libinova-1.6.2.ebuild index 58d1c4b..a9e6b1d 100644 --- a/sci-libs/libinova/libinova-1.6.2.ebuild +++ b/sci-libs/libinova/libinova-1.6.2.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86 ~arm" SLOT="0" -PATCHES=( "${FILESDIR}/libinova-1.5.0_fix_cmake_symlinks.patch" ) +PATCHES=( "${FILESDIR}/libinova-1.6.2_fix_cmake_symlinks.patch" ) INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}" 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 deleted file mode 100644 index 9073b87..0000000 --- a/sci-libs/libqhy/files/libqhy-1.5.0_fix_cmake_symlinks.patch +++ /dev/null @@ -1,36 +0,0 @@ -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) - diff --git a/sci-libs/libqhy/files/libqhy-1.6.2_fix_cmake_symlinks.patch b/sci-libs/libqhy/files/libqhy-1.6.2_fix_cmake_symlinks.patch new file mode 100644 index 0000000..ad8eb19 --- /dev/null +++ b/sci-libs/libqhy/files/libqhy-1.6.2_fix_cmake_symlinks.patch @@ -0,0 +1,24 @@ +diff -urN indi-1.6.2/3rdparty/libqhy/CMakeLists.txt indi-1.6.2.new/3rdparty/libqhy/CMakeLists.txt +--- indi-1.6.2/3rdparty/libqhy/CMakeLists.txt 2018-01-08 14:45:25.000000000 +0100 ++++ indi-1.6.2.new/3rdparty/libqhy/CMakeLists.txt 2018-01-29 22:17:29.543186992 +0100 +@@ -44,17 +44,13 @@ + install(FILES 85-qhy.rules DESTINATION ${UDEVRULES_INSTALL_DIR}) + install(FILES ${CMAKE_BINARY_DIR}/libqhy.so.${LIBQHY_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX}) + +-# Make sure symbolic links are installed +-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_libqhy_symlink.cmake " +-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libqhy.so.${LIBQHY_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION})\n +-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libqhy.so.${LIBQHY_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so)\n +-") +- + ENDIF (APPLE) + + install(FILES qhyccd.h qhyccdcamdef.h qhyccderr.h qhyccdstruct.h log4z.h qhycam.h DESTINATION include/libqhy) + +-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}\" )" ) + install( + CODE " + file(GLOB QHY_FIRMWARE ${CMAKE_CURRENT_SOURCE_DIR}/firmware/*) \n diff --git a/sci-libs/libqhy/libqhy-1.6.2.ebuild b/sci-libs/libqhy/libqhy-1.6.2.ebuild index 3bdbb05..28ff7ef 100644 --- a/sci-libs/libqhy/libqhy-1.6.2.ebuild +++ b/sci-libs/libqhy/libqhy-1.6.2.ebuild @@ -21,7 +21,7 @@ DEPEND="virtual/libusb:1 RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/libqhy-1.5.0_fix_cmake_symlinks.patch" ) +PATCHES=( "${FILESDIR}/libqhy-1.6.2_fix_cmake_symlinks.patch" ) INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}" diff --git a/sci-libs/libsbig/files/libsbig-1.5.0_fix_cmake_symlinks.patch b/sci-libs/libsbig/files/libsbig-1.5.0_fix_cmake_symlinks.patch deleted file mode 100644 index 5a6c41a..0000000 --- a/sci-libs/libsbig/files/libsbig-1.5.0_fix_cmake_symlinks.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -uNr indi-1.5.0/3rdparty/libsbig/CMakeLists.txt indi-1.5.0.new/3rdparty/libsbig/CMakeLists.txt ---- indi-1.5.0/3rdparty/libsbig/CMakeLists.txt 2017-08-20 11:44:27.000000000 +0200 -+++ indi-1.5.0.new/3rdparty/libsbig/CMakeLists.txt 2018-01-22 19:05:23.076574405 +0100 -@@ -6,7 +6,7 @@ - - set(FIRMWARE_INSTALL_DIR "/lib/firmware") - 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}") - - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error") -@@ -25,14 +25,10 @@ - ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l") - ENDIF(UNIX AND NOT WIN32 AND NOT APPLE) - --# Make sure symbolic links are installed --file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake " --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION})\n --exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so)\n --") -- - install( FILES ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX}) - install( FILES sbigudrv.h DESTINATION include/libsbig) - install( FILES sbigucam.hex sbiglcam.hex sbigfcam.hex sbigpcam.hex stfga.bin DESTINATION ${FIRMWARE_INSTALL_DIR}) - install( FILES 51-sbig-debian.rules DESTINATION ${UDEVRULES_INSTALL_DIR}) --install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake) -+# Make sure symbolic links are installed -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_VERSION}\" \"libsbigudrv.so.${SBIG_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) -+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_SOVERSION}\" \"libsbigudrv.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) diff --git a/sci-libs/libsbig/files/libsbig-1.6.2_fix_cmake_symlinks.patch b/sci-libs/libsbig/files/libsbig-1.6.2_fix_cmake_symlinks.patch new file mode 100644 index 0000000..28f5391 --- /dev/null +++ b/sci-libs/libsbig/files/libsbig-1.6.2_fix_cmake_symlinks.patch @@ -0,0 +1,21 @@ +diff -urN indi-1.6.2/3rdparty/libsbig/CMakeLists.txt indi-1.6.2.new/3rdparty/libsbig/CMakeLists.txt +--- indi-1.6.2/3rdparty/libsbig/CMakeLists.txt 2018-01-08 14:45:25.000000000 +0100 ++++ indi-1.6.2.new/3rdparty/libsbig/CMakeLists.txt 2018-01-29 22:23:12.238079370 +0100 +@@ -27,14 +27,10 @@ + ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l") + ENDIF(UNIX AND NOT WIN32 AND NOT APPLE) + +-# Make sure symbolic links are installed +-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake " +-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libsbig.so.${SBIG_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbig.so.${SBIG_SOVERSION})\n +-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink libsbig.so.${SBIG_SOVERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbig.so)\n +-") +- + install( FILES ${CMAKE_BINARY_DIR}/libsbig.so.${SBIG_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX}) + install( FILES sbigudrv.h DESTINATION include/libsbig) + install( FILES sbigucam.hex sbiglcam.hex sbigfcam.hex sbigpcam.hex stfga.bin DESTINATION ${FIRMWARE_INSTALL_DIR}) + install( FILES 51-sbig-debian.rules DESTINATION ${UDEVRULES_INSTALL_DIR}) +-install( SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_sbig_symlink.cmake) ++# Make sure symbolic links are installed ++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_VERSION}\" \"libsbigudrv.so.${SBIG_SOVERSION}\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) ++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libsbigudrv.so.${SBIG_SOVERSION}\" \"libsbigudrv.so\" WORKING_DIRECTORY \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}\" )" ) diff --git a/sci-libs/libsbig/libsbig-1.6.2.ebuild b/sci-libs/libsbig/libsbig-1.6.2.ebuild index 231fb21..6cdc4fc 100644 --- a/sci-libs/libsbig/libsbig-1.6.2.ebuild +++ b/sci-libs/libsbig/libsbig-1.6.2.ebuild @@ -20,4 +20,4 @@ INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}" S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}" -PATCHES=( "${FILESDIR}/libsbig-1.5.0_fix_cmake_symlinks.patch" ) +PATCHES=( "${FILESDIR}/libsbig-1.6.2_fix_cmake_symlinks.patch" ) -- cgit v1.2.3