diff options
| author | Ctibor Brančík <ctibor@brancik.cz> | 2017-12-27 18:37:18 +0100 |
|---|---|---|
| committer | Ctibor Brančík <ctibor@brancik.cz> | 2017-12-27 18:37:18 +0100 |
| commit | f104496891932c2bd7667560697e7462f55e981a (patch) | |
| tree | da0d92a850391d3ccdf5a5a7e1d54948bc6a0eb2 /sci-libs/libsbig | |
| parent | d1ec4e7dbcfe03bb5beb2f8ff3dd602b9e3f3b31 (diff) | |
| download | brancik-overlay-f104496891932c2bd7667560697e7462f55e981a.tar.gz brancik-overlay-f104496891932c2bd7667560697e7462f55e981a.tar.bz2 | |
Update patches for libqhy and libsbig from git
Diffstat (limited to 'sci-libs/libsbig')
| -rw-r--r-- | sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch b/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch index 5f7946b..669b371 100644 --- a/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch +++ b/sci-libs/libsbig/files/libsbig-9999_fix_cmake_symlinks.patch @@ -1,20 +1,21 @@ ---- CMakeLists.txt 2015-04-15 21:50:44.060806200 +0200
-+++ CMakeLists.txt.new 2015-04-15 21:52:22.257882425 +0200
-@@ -22,14 +22,10 @@
- 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}\" )" )
+diff -urN libsbig-9999/3rdparty/libsbig/CMakeLists.txt libsbig-9999.new/3rdparty/libsbig/CMakeLists.txt +--- libsbig-9999/3rdparty/libsbig/CMakeLists.txt 2017-12-27 18:34:47.394240953 +0100 ++++ libsbig-9999.new/3rdparty/libsbig/CMakeLists.txt 2017-12-27 18:36:05.916025476 +0100 +@@ -27,14 +27,10 @@ + 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 libsbigudrv.so.${SBIG_VERSION} ${LIB_INSTALL_DIR}${LIB_POSTFIX}/libsbigudrv.so.${SBIG_SOVERSION})\n +-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink 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}\" )" ) |