diff options
| author | Ctibor Brančík <ctibor@brancik.cz> | 2018-01-27 14:16:08 +0100 |
|---|---|---|
| committer | Ctibor Brančík <ctibor@brancik.cz> | 2018-01-27 14:16:08 +0100 |
| commit | 317b31a97d12c528a561d747c1f52208a496e50c (patch) | |
| tree | 36b7cf2cfc0788c06a280388b0c2f469f7130fef | |
| parent | 1aa8f65a384e1ad1aa8b788ed6f819f83ae91823 (diff) | |
| download | brancik-overlay-317b31a97d12c528a561d747c1f52208a496e50c.tar.gz brancik-overlay-317b31a97d12c528a561d747c1f52208a496e50c.tar.bz2 | |
Update sci-libs/libqhy to comply with multilib strict
| -rw-r--r-- | sci-libs/libqhy/files/libqhy-1.5.0_fix_cmake_symlinks.patch (renamed from sci-libs/libqhy/files/libqhy-1.3.0_fix_cmake_symlinks.patch) | 20 | ||||
| -rw-r--r-- | sci-libs/libqhy/libqhy-1.5.0.ebuild | 2 |
2 files changed, 16 insertions, 6 deletions
diff --git a/sci-libs/libqhy/files/libqhy-1.3.0_fix_cmake_symlinks.patch b/sci-libs/libqhy/files/libqhy-1.5.0_fix_cmake_symlinks.patch index c559cd4..9073b87 100644 --- a/sci-libs/libqhy/files/libqhy-1.3.0_fix_cmake_symlinks.patch +++ b/sci-libs/libqhy/files/libqhy-1.5.0_fix_cmake_symlinks.patch @@ -1,7 +1,17 @@ ---- CMakeLists.txt 2016-10-30 10:10:00.000000000 +0100 -+++ CMakeLists.txt.new 2016-11-03 00:00:53.900449996 +0100 -@@ -33,12 +33,6 @@ - ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l") +diff -urN indi-1.5.0/3rdparty/libqhy/CMakeLists.txt indi-1.5.0.new/3rdparty/libqhy/CMakeLists.txt +--- indi-1.5.0/3rdparty/libqhy/CMakeLists.txt 2017-08-20 11:44:27.000000000 +0200 ++++ indi-1.5.0.new/3rdparty/libqhy/CMakeLists.txt 2018-01-27 14:12:12.872891242 +0100 +@@ -29,7 +29,7 @@ + + set(FIRMWARE_INSTALL_DIR "/lib/firmware/qhy") + 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}") + + IF(UNIX AND NOT WIN32) + IF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l" OR CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv7l") +@@ -43,12 +43,6 @@ + ENDIF (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv6l" OR CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv7l") ENDIF(UNIX AND NOT WIN32) -# Make sure symbolic links are installed @@ -13,7 +23,7 @@ install(FILES qhyccd.h qhyccdcamdef.h qhyccderr.h qhyccdstruct.h log4z.h DESTINATION include/libqhy) install(FILES ${CMAKE_BINARY_DIR}/libqhy.so.${LIBQHY_VERSION} DESTINATION ${LIB_INSTALL_DIR}${LIB_POSTFIX}) install(FILES 85-qhy.rules DESTINATION ${UDEVRULES_INSTALL_DIR}) -@@ -48,7 +42,9 @@ +@@ -58,7 +52,9 @@ file(INSTALL DESTINATION ${FIRMWARE_INSTALL_DIR} TYPE FILE FILES \${QHY_FIRMWARE})" ) diff --git a/sci-libs/libqhy/libqhy-1.5.0.ebuild b/sci-libs/libqhy/libqhy-1.5.0.ebuild index ee3e233..3bdbb05 100644 --- a/sci-libs/libqhy/libqhy-1.5.0.ebuild +++ b/sci-libs/libqhy/libqhy-1.5.0.ebuild @@ -21,7 +21,7 @@ DEPEND="virtual/libusb:1 RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/libqhy-1.3.0_fix_cmake_symlinks.patch" ) +PATCHES=( "${FILESDIR}/libqhy-1.5.0_fix_cmake_symlinks.patch" ) INDI_TARGET_DIRECTORY="${PN%%lib-driver-**}" |