commit d629daeb2c9e8eec3f4ce9ec6456ddad8531f06d · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

cfitsio: use absolute references instead of rpath on darwin

Sebastien Maret 7 years ago d629daeb 3d2fd226

+22 -13

3 changed files

expand all

unified split

pkgs

development

libraries

cfitsio

darwin-rpath-universal.patch

darwin-universal.patch

default.nix

+21

pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch

··· 1 + diff -ruN cfitsio/configure cfitsio-rpath-universal/configure 2 + --- cfitsio/configure 2018-05-09 21:16:00.000000000 +0200 3 + +++ cfitsio-rpath-universal/configure 2018-05-31 12:02:25.000000000 +0200 4 + @@ -4727,16 +4727,7 @@ 5 + SHLIB_SUFFIX=".dylib" 6 + CFITSIO_SHLIB="lib\${PACKAGE}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}\${SHLIB_SUFFIX}" 7 + CFITSIO_SHLIB_SONAME="lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX}" 8 + - case $host in 9 + - *darwin[56789]*) 10 + - SHLIB_LD="$CC -dynamiclib -install_name lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}" 11 + - ;; 12 + - *) 13 + - # Build 'Universal' binaries (i386 & x86_64 architectures) and 14 + - # use rpath token on Darwin 10.x or newer: 15 + - SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}" 16 + - ;; 17 + - esac 18 + + SHLIB_LD="$CC -dynamiclib -install_name ${out}/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}" 19 + 20 + lhea_shlib_cflags="-fPIC -fno-common" 21 + ;;

-12

pkgs/development/libraries/cfitsio/darwin-universal.patch

··· 1 - diff -ruN cfitsio/configure cfitsio-universal/configure 2 - --- cfitsio/configure 2018-05-09 21:16:00.000000000 +0200 3 - +++ cfitsio-universal/configure 2018-05-30 14:26:03.000000000 +0200 4 - @@ -4734,7 +4734,7 @@ 5 - *) 6 - # Build 'Universal' binaries (i386 & x86_64 architectures) and 7 - # use rpath token on Darwin 10.x or newer: 8 - - SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}" 9 - + SHLIB_LD="$CC -dynamiclib -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}" 10 - ;; 11 - esac 12 -

+1 -1

pkgs/development/libraries/cfitsio/default.nix

··· 8 8 sha256 = "07fghxh5fl8nqk3q0dh8rvc83npnm0hisxzcj16a6r7gj5pmp40l"; 9 9 }; 10 10 11 - patches = [ ./darwin-curl-config.patch ./darwin-universal.patch ]; 11 + patches = [ ./darwin-curl-config.patch ./darwin-rpath-universal.patch ]; 12 12 13 13 # Shared-only build 14 14 buildFlags = "shared";