diff options
| author | Ctibor <ctibor.brancik@seznam.cz> | 2015-02-18 23:05:12 +0100 |
|---|---|---|
| committer | Ctibor <ctibor.brancik@seznam.cz> | 2015-02-18 23:05:12 +0100 |
| commit | 3d035e02c49940f003978dffa81c6ff99ec55713 (patch) | |
| tree | d6f7bb5849db3e598d3c445571468973f50655cf | |
| parent | 8d9af0cd81ce4f2fb092cad310c034e001872066 (diff) | |
| download | brancik-overlay-3d035e02c49940f003978dffa81c6ff99ec55713.tar.gz brancik-overlay-3d035e02c49940f003978dffa81c6ff99ec55713.tar.bz2 | |
Final version of the patches for sci-libs/sbig and libqhy.
| -rw-r--r-- | sci-libs/libqhy/files/libqhy-1.0.0_fix_cmake_symlinks.patch | 6 | ||||
| -rw-r--r-- | sci-libs/sbig/files/sbig-1.0.0_fix_cmake_symlinks.patch | 9 |
2 files changed, 7 insertions, 8 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 35b812e..87964bd 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,5 +1,5 @@ --- libindi_3rdparty/libqhy/CMakeLists.txt 2015-02-15 09:56:34.000000000 +0100 -+++ libindi_3rdparty.new/libqhy/CMakeLists.txt 2015-02-18 21:46:32.736203978 +0100 ++++ libindi_3rdparty.new/libqhy/CMakeLists.txt 2015-02-18 23:03:59.954691783 +0100 @@ -20,12 +20,6 @@ ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l")
ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
@@ -21,5 +21,5 @@ -
-
+# 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)\" )" )
++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/files/sbig-1.0.0_fix_cmake_symlinks.patch b/sci-libs/sbig/files/sbig-1.0.0_fix_cmake_symlinks.patch index f14e58a..0b360e9 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,6 +1,6 @@ --- libindi_3rdparty/sbig/CMakeLists.txt 2015-02-15 09:56:33.000000000 +0100 -+++ libindi_3rdparty.new/sbig/CMakeLists.txt 2015-02-18 21:52:44.118868395 +0100 -@@ -22,13 +22,10 @@ ++++ 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)
@@ -14,7 +14,6 @@ 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)\" )" )
++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}\" )" )
|