Patch by Andreas Enge to force installation of libraries into lib independently of the architecture, instead of lib32 or lib64. On x86_64, the C library path coded in CMAKE_C_IMPLICIT_LINK_DIRECTORIES contains a library (jack) installed into lib64, which forces lib64 for avidemux with the original code. diff -u -r avidemux_2.6.8.orig/cmake/admInstallDir.cmake avidemux_2.6.8/cmake/admInstallDir.cmake --- avidemux_2.6.8.orig/cmake/admInstallDir.cmake 2014-03-12 07:15:23.000000000 +0100 +++ avidemux_2.6.8/cmake/admInstallDir.cmake 2015-07-26 14:31:10.418459984 +0200 @@ -16,13 +16,7 @@ MESSAGE(STATUS "No install dir provided, using /usr/local") ENDIF(NOT AVIDEMUX_INSTALL_DIR ) SET(AVIDEMUX_BIN_DIR ${AVIDEMUX_INSTALL_DIR}/bin) - IF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)") - SET(AVIDEMUX_RELATIVE_LIB_DIR lib64) - ELSEIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib32([; ]|$)") - SET(AVIDEMUX_RELATIVE_LIB_DIR lib32) - ELSE(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)") - SET(AVIDEMUX_RELATIVE_LIB_DIR lib) - ENDIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)") + SET(AVIDEMUX_RELATIVE_LIB_DIR lib) SET(AVIDEMUX_LIB_DIR ${AVIDEMUX_INSTALL_DIR}/${AVIDEMUX_RELATIVE_LIB_DIR}) ENDIF(WIN32) SET(AVIDEMUX_INCLUDE_DIR ${AVIDEMUX_INSTALL_DIR}/include) href='/guix/diff/build-aux/compile-all.scm?id=08df30f232afc1fc1ae7fb3c9889b5ad96bc5dea'>diff
path: root/build-aux/compile-all.scm
AgeCommit message (Expand)Author
2021-06-23build: Makefile splits Scheme compilation in four steps....Fixes <https://bugs.gnu.org/48963>. Reported by Julien Lepiller <julien@lepiller.eu>. This reduces peak memory consumption to something less unreasonable. * Makefile.am (make-go): Depend on 'make-*-go' targets; remove body. (guile-compilation-rule): New function. (MODULES_CORE, MODULES_PACKAGES, MODULES_SYSTEM, MODULES_CLI): New variables. <top level>: Call 'guile-compilation-rule' 4 times. * build-aux/compile-all.scm <top level>: Expect "--total" and "--processed". Take them into account when displaying progress reports. Ludovic Courtès
2021-06-18build: Remove Guile 2.2 workaround....* build-aux/compile-all.scm <top level>: Remove Guile 2.2 workaround. Ludovic Courtès
2020-04-12build: Cap build parallelism on i686....Works around <https://bugs.gnu.org/40522>. * build-aux/compile-all.scm (parallel-job-count*): New procedure. <top level>: Use it instead of 'parallel-job-count'. Ludovic Courtès