From 68c412d87c538511af0d8a2fd2168c70b68f40d5 Mon Sep 17 00:00:00 2001 From: Ctibor Date: Tue, 24 Nov 2015 21:27:40 +0100 Subject: Update patch for sci-libs/sbig --- .../sbig/files/sbig-1.0.0_fix_cmake_symlinks.patch | 19 ------------------- .../sbig/files/sbig-1.1.0_fix_cmake_symlinks.patch | 21 +++++++++++++++++++++ sci-libs/sbig/sbig-1.1.0.ebuild | 2 +- 3 files changed, 22 insertions(+), 20 deletions(-) delete mode 100644 sci-libs/sbig/files/sbig-1.0.0_fix_cmake_symlinks.patch create mode 100644 sci-libs/sbig/files/sbig-1.1.0_fix_cmake_symlinks.patch diff --git a/sci-libs/sbig/files/sbig-1.0.0_fix_cmake_symlinks.patch b/sci-libs/sbig/files/sbig-1.0.0_fix_cmake_symlinks.patch deleted file mode 100644 index 0b360e9..0000000 --- a/sci-libs/sbig/files/sbig-1.0.0_fix_cmake_symlinks.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- libindi_3rdparty/sbig/CMakeLists.txt 2015-02-15 09:56:33.000000000 +0100 -+++ libindi_3rdparty.new/sbig/CMakeLists.txt 2015-02-18 22:57:51.781134700 +0100 -@@ -22,13 +22,9 @@ - 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 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/sbig/files/sbig-1.1.0_fix_cmake_symlinks.patch b/sci-libs/sbig/files/sbig-1.1.0_fix_cmake_symlinks.patch new file mode 100644 index 0000000..0635fbe --- /dev/null +++ b/sci-libs/sbig/files/sbig-1.1.0_fix_cmake_symlinks.patch @@ -0,0 +1,21 @@ +--- CMakeLists.txt 2015-09-06 15:21:02.000000000 +0200 ++++ CMakeLists.txt.new 2015-11-24 21:26:14.494287708 +0100 +@@ -22,14 +22,11 @@ + 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 \"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}\" )" ) diff --git a/sci-libs/sbig/sbig-1.1.0.ebuild b/sci-libs/sbig/sbig-1.1.0.ebuild index 1c72401..9e224f8 100644 --- a/sci-libs/sbig/sbig-1.1.0.ebuild +++ b/sci-libs/sbig/sbig-1.1.0.ebuild @@ -17,4 +17,4 @@ SLOT="0" S="${WORKDIR}/libindi_3rdparty_${PV}/${PN}" -PATCHES=( "${FILESDIR}/sbig-1.0.0_fix_cmake_symlinks.patch" ) \ No newline at end of file +PATCHES=( "${FILESDIR}/sbig-1.1.0_fix_cmake_symlinks.patch" ) -- cgit v1.2.3