From a0fd8db9f826e43f8e3d56c861676cedf2c0539a Mon Sep 17 00:00:00 2001 From: Ctibor Date: Wed, 18 Feb 2015 21:02:53 +0100 Subject: Modify patch for sci-libs/sbig and remove workarounds in ebuild. --- sci-libs/sbig/files/sbig-0.9.9-fix-symlink.patch | 16 ---------------- sci-libs/sbig/files/sbig-1.0.0_fix_cmake_symlinks.patch | 17 +++++++++++++++++ sci-libs/sbig/files/sbig-9999-fix-symlink.patch | 16 ---------------- sci-libs/sbig/sbig-1.0.0.ebuild | 9 +-------- sci-libs/sbig/sbig-9999.ebuild | 7 ------- 5 files changed, 18 insertions(+), 47 deletions(-) delete mode 100644 sci-libs/sbig/files/sbig-0.9.9-fix-symlink.patch create mode 100644 sci-libs/sbig/files/sbig-1.0.0_fix_cmake_symlinks.patch delete mode 100644 sci-libs/sbig/files/sbig-9999-fix-symlink.patch diff --git a/sci-libs/sbig/files/sbig-0.9.9-fix-symlink.patch b/sci-libs/sbig/files/sbig-0.9.9-fix-symlink.patch deleted file mode 100644 index 48d34c9..0000000 --- a/sci-libs/sbig/files/sbig-0.9.9-fix-symlink.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- CMakeLists.txt 2015-01-04 22:22:44.188535235 +0100 -+++ CMakeLists.txt.new 2015-01-04 23:01:47.350482273 +0100 -@@ -33,13 +33,6 @@ - exec_program(cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/libsbigudrv32.bin ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION}) - endif(LIB_ARMHF) - --# 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) 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 new file mode 100644 index 0000000..f4948f0 --- /dev/null +++ b/sci-libs/sbig/files/sbig-1.0.0_fix_cmake_symlinks.patch @@ -0,0 +1,17 @@ +--- libindi_3rdparty/sbig/CMakeLists.txt 2015-02-15 09:56:33.000000000 +0100 ++++ libindi_3rdparty.new/sbig/CMakeLists.txt 2015-02-18 21:00:30.751151635 +0100 +@@ -23,12 +23,9 @@ + 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(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_VERSION}\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION}\" )" ) ++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION}\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so)\" )" ) + + 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) diff --git a/sci-libs/sbig/files/sbig-9999-fix-symlink.patch b/sci-libs/sbig/files/sbig-9999-fix-symlink.patch deleted file mode 100644 index 19db487..0000000 --- a/sci-libs/sbig/files/sbig-9999-fix-symlink.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- CMakeLists.txt 2015-01-21 19:32:21.000000000 +0100 -+++ CMakeLists.txt.new 2015-01-21 22:55:15.423084164 +0100 -@@ -33,13 +33,6 @@ - exec_program(cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/libsbigudrv32.bin ${CMAKE_BINARY_DIR}/libsbigudrv.so.${SBIG_VERSION}) - endif(LIB_ARMHF) - --# 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) diff --git a/sci-libs/sbig/sbig-1.0.0.ebuild b/sci-libs/sbig/sbig-1.0.0.ebuild index 78db00e..773e296 100644 --- a/sci-libs/sbig/sbig-1.0.0.ebuild +++ b/sci-libs/sbig/sbig-1.0.0.ebuild @@ -17,11 +17,4 @@ SLOT="0" S="${WORKDIR}/libindi_3rdparty/${PN}" -PATCHES=( "${FILESDIR}/sbig-0.9.9-fix-symlink.patch" ) - -src_install() { - cmake-utils_src_install - cd "${D}"/usr/lib || die - ln -snf libsbigudrv.so.2.0.2 libsbigudrv.so.2 || die - ln -snf libsbigudrv.so.2 libsbigudrv.so || die -} \ No newline at end of file +PATCHES=( "${FILESDIR}/sbig-1.0.0_fix_cmake_symlinks.patch" ) \ No newline at end of file diff --git a/sci-libs/sbig/sbig-9999.ebuild b/sci-libs/sbig/sbig-9999.ebuild index 7f15b9e..3ce69e4 100644 --- a/sci-libs/sbig/sbig-9999.ebuild +++ b/sci-libs/sbig/sbig-9999.ebuild @@ -23,11 +23,4 @@ ESVN_PATCHES=( "${FILESDIR}/sbig-9999-fix-symlink.patch" ) src_unpack() { subversion_src_unpack -} - -src_install() { - cmake-utils_src_install - cd "${D}"/usr/lib || die - ln -snf libsbigudrv.so."${SBIG_VERSION}" libsbigudrv.so."${SBIG_SOVERSION}" || die - ln -snf libsbigudrv.so."${SBIG_SOVERSION}" libsbigudrv.so || die } \ No newline at end of file -- cgit v1.2.3