From 317b31a97d12c528a561d747c1f52208a496e50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ctibor=20Bran=C4=8D=C3=ADk?= Date: Sat, 27 Jan 2018 14:16:08 +0100 Subject: Update sci-libs/libqhy to comply with multilib strict --- .../files/libqhy-1.3.0_fix_cmake_symlinks.patch | 26 ---------------- .../files/libqhy-1.5.0_fix_cmake_symlinks.patch | 36 ++++++++++++++++++++++ sci-libs/libqhy/libqhy-1.5.0.ebuild | 2 +- 3 files changed, 37 insertions(+), 27 deletions(-) delete mode 100644 sci-libs/libqhy/files/libqhy-1.3.0_fix_cmake_symlinks.patch create mode 100644 sci-libs/libqhy/files/libqhy-1.5.0_fix_cmake_symlinks.patch diff --git a/sci-libs/libqhy/files/libqhy-1.3.0_fix_cmake_symlinks.patch b/sci-libs/libqhy/files/libqhy-1.3.0_fix_cmake_symlinks.patch deleted file mode 100644 index c559cd4..0000000 --- a/sci-libs/libqhy/files/libqhy-1.3.0_fix_cmake_symlinks.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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") - ENDIF(UNIX AND NOT WIN32) - --# 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(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 @@ - 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 \"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}\" )" ) - - ENDIF (APPLE) - diff --git a/sci-libs/libqhy/files/libqhy-1.5.0_fix_cmake_symlinks.patch b/sci-libs/libqhy/files/libqhy-1.5.0_fix_cmake_symlinks.patch new file mode 100644 index 0000000..9073b87 --- /dev/null +++ b/sci-libs/libqhy/files/libqhy-1.5.0_fix_cmake_symlinks.patch @@ -0,0 +1,36 @@ +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 +-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(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}) +@@ -58,7 +52,9 @@ + 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 \"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}\" )" ) + + ENDIF (APPLE) + 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-**}" -- cgit v1.2.3