Fix patches for sci-libs/sbig and libqhy. Symlink must be made after library is copied.

2 files changed, 19 insertions, 14 deletions

diff --git a/sci-libs/libqhy/files/libqhy-1.0.0_fix_cmake_symlinks.patch b/sci-libs/libqhy/files/libqhy-1.0.0_fix_cmake_symlinks.patch
index e806103..35b812e 100644
--- a/sci-libs/libqhy/files/libqhy-1.0.0_fix_cmake_symlinks.patch
+++ b/sci-libs/libqhy/files/libqhy-1.0.0_fix_cmake_symlinks.patch
@@ -1,22 +1,25 @@
 --- libindi_3rdparty/libqhy/CMakeLists.txt	2015-02-15 09:56:34.000000000 +0100
-+++ libindi_3rdparty.new/libqhy/CMakeLists.txt	2015-02-18 21:13:23.031333924 +0100
-@@ -21,10 +21,8 @@
++++ libindi_3rdparty.new/libqhy/CMakeLists.txt	2015-02-18 21:46:32.736203978 +0100
+@@ -20,12 +20,6 @@
+  ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l")

  ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)

  

- # Make sure symbolic links are installed

+-# 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(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_VERSION}\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION}\" )" )

-+install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION}\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so)\" )" )

- 

+-

  install(FILES qhyccd.h qhyccdcamdef.h qhyccderr.h qhyccdstruct.h DESTINATION include/libqhy)

  install(FILES ${CMAKE_BINARY_DIR}/libqhy.so.${LIBQHY_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX})

-@@ -35,6 +33,3 @@
+ install(FILES 85-qhy.rules DESTINATION ${UDEVRULES_INSTALL_DIR})

+@@ -35,6 +29,6 @@
     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 \"${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_VERSION}\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION}\" )" )

++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so.${LIBQHY_SOVERSION}\" \"\$ENV{DESTDIR}/${BUILD_ROOT}${LIB_INSTALL_DIR}${LIB_POSTFIX}/libqhy.so)\" )" )

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
index f4948f0..859073e 100644
--- 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
@@ -1,17 +1,19 @@
---- 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 @@
+--- libindi_3rdparty/sbig/CMakeLists.txt	2015-02-15 09:56:33.000000000 +0100

++++ libindi_3rdparty.new/sbig/CMakeLists.txt	2015-02-18 21:46:56.043183288 +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

+-# 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)

++# Make sure symbolic links are installed

++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)\" )" )