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) u/packages/pcre.scm?id=cdffb73c04d0c68d7edf19ee02fc3a554dea04bc'>diff
path: root/gnu/packages/pcre.scm
AgeCommit message (Expand)Author
2019-08-13Merge branch 'master' into core-updatesMarius Bakke
2019-08-04gnu: Remove pcre2/fixed....* gnu/packages/pcre.scm (pcre2/fixed): Remove variable. (pcre2)[replacement]: Remove. [source](patches): New field. * gnu/packages/php.scm (php)[inputs]: Change PCRE2/FIXED to PCRE2. Marius Bakke
2019-08-02gnu: pcre@2: Fix run-time crash [security fix]....* gnu/packages/pcre.scm (pcre2)[replacement]: New field. (pcre2/fixed): New public variable. * packages/patches/pcre2-fix-jit_match-crash.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Tobias Geerinckx-Rice
2019-05-25Merge branch 'staging' into core-updatesMarius Bakke
2019-05-04gnu: pcre2: Update to 10.33....* gnu/packages/pcre.scm (pcre2): Update to 10.33. Marius Bakke
2019-03-04gnu: pcre: Update to 8.43....* gnu/packages/pcre.scm (pcre): Update to 8.43. Marius Bakke
2019-02-07gnu: pcre2: Update to 10.32....* gnu/packages/pcre.scm (pcre2): Update to 10.32. Marius Bakke