diff options
| author | Ctibor Brančík <ctibor@brancik.cz> | 2018-01-22 19:07:53 +0100 |
|---|---|---|
| committer | Ctibor Brančík <ctibor@brancik.cz> | 2018-01-22 19:07:53 +0100 |
| commit | ff60cfc8ed57723173f09d37f1f731725a5eee82 (patch) | |
| tree | e6d88adb2ad3d783f5dfaf944753e948d6da686e | |
| parent | 8004a9b86605fbcd69e5405177145ec0d8095732 (diff) | |
| download | brancik-overlay-ff60cfc8ed57723173f09d37f1f731725a5eee82.tar.gz brancik-overlay-ff60cfc8ed57723173f09d37f1f731725a5eee82.tar.bz2 | |
Update sci-libs/libsbig allowing to bypass strict-multilib-check
| -rw-r--r-- | sci-libs/libsbig/files/libsbig-1.5.0_fix_cmake_symlinks.patch (renamed from sci-libs/libsbig/files/libsbig-1.3.0_fix_cmake_symlinks.patch) | 17 | ||||
| -rw-r--r-- | sci-libs/libsbig/libsbig-1.5.0.ebuild | 2 |
2 files changed, 14 insertions, 5 deletions
diff --git a/sci-libs/libsbig/files/libsbig-1.3.0_fix_cmake_symlinks.patch b/sci-libs/libsbig/files/libsbig-1.5.0_fix_cmake_symlinks.patch index bc5038b..5a6c41a 100644 --- a/sci-libs/libsbig/files/libsbig-1.3.0_fix_cmake_symlinks.patch +++ b/sci-libs/libsbig/files/libsbig-1.5.0_fix_cmake_symlinks.patch @@ -1,6 +1,16 @@ ---- CMakeLists.txt 2016-10-30 10:10:00.000000000 +0100 -+++ CMakeLists.txt.new 2016-11-02 23:52:51.688242341 +0100 -@@ -22,14 +22,11 @@ +diff -uNr indi-1.5.0/3rdparty/libsbig/CMakeLists.txt indi-1.5.0.new/3rdparty/libsbig/CMakeLists.txt +--- indi-1.5.0/3rdparty/libsbig/CMakeLists.txt 2017-08-20 11:44:27.000000000 +0200 ++++ indi-1.5.0.new/3rdparty/libsbig/CMakeLists.txt 2018-01-22 19:05:23.076574405 +0100 +@@ -6,7 +6,7 @@ + + set(FIRMWARE_INSTALL_DIR "/lib/firmware") + set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") +-set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib") ++set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") + + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error") +@@ -25,14 +25,10 @@ ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l") ENDIF(UNIX AND NOT WIN32 AND NOT APPLE) @@ -15,7 +25,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 \"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 --git a/sci-libs/libsbig/libsbig-1.5.0.ebuild b/sci-libs/libsbig/libsbig-1.5.0.ebuild index b65ae04..231fb21 100644 --- a/sci-libs/libsbig/libsbig-1.5.0.ebuild +++ b/sci-libs/libsbig/libsbig-1.5.0.ebuild @@ -20,4 +20,4 @@ INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}" S="${WORKDIR}/${MY_PN}-${PV}/3rdparty/${INDI_TARGET_DIRECTORY}" -PATCHES=( "${FILESDIR}/libsbig-1.3.0_fix_cmake_symlinks.patch" ) +PATCHES=( "${FILESDIR}/libsbig-1.5.0_fix_cmake_symlinks.patch" ) |