From 694a3701423cc101bc6d3453a9ba3f9be67119db Mon Sep 17 00:00:00 2001 From: Ctibor Date: Tue, 24 Nov 2015 22:36:29 +0100 Subject: Fix patch for sci-libs/sbig confused with libqhy. --- .../sbig/files/sbig-1.1.0_fix_cmake_symlinks.patch | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) 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 index 0635fbe..9bc1e9a 100644 --- 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 @@ -1,21 +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}\" )" ) + 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}\" )" ) -- cgit v1.2.3