diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/parallel-netcdf/nag_libtool.patch')
-rw-r--r-- | var/spack/repos/builtin/packages/parallel-netcdf/nag_libtool.patch | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/var/spack/repos/builtin/packages/parallel-netcdf/nag_libtool.patch b/var/spack/repos/builtin/packages/parallel-netcdf/nag_libtool.patch deleted file mode 100644 index f391c1dc5e..0000000000 --- a/var/spack/repos/builtin/packages/parallel-netcdf/nag_libtool.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- a/configure -+++ b/configure -@@ -11745,6 +11745,8 @@ _LT_EOF - whole_archive_flag_spec= - tmp_sharedflag='--shared' ;; - nagfor*) # NAGFOR 5.3 -+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' -+ compiler_needs_object=yes - tmp_sharedflag='-Wl,-shared' ;; - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' -@@ -21030,6 +21032,8 @@ _LT_EOF - whole_archive_flag_spec_F77= - tmp_sharedflag='--shared' ;; - nagfor*) # NAGFOR 5.3 -+ whole_archive_flag_spec_F77='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' -+ compiler_needs_object_F77=yes - tmp_sharedflag='-Wl,-shared' ;; - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' -@@ -24765,6 +24769,8 @@ _LT_EOF - whole_archive_flag_spec_FC= - tmp_sharedflag='--shared' ;; - nagfor*) # NAGFOR 5.3 -+ whole_archive_flag_spec_FC='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' -+ compiler_needs_object_FC=yes - tmp_sharedflag='-Wl,-shared' ;; - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' ---- a/scripts/ltmain.sh -+++ b/scripts/ltmain.sh -@@ -7862,6 +7862,13 @@ func_mode_link () - # Convert "-framework foo" to "foo.ltframework" - if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` -+ -+ # Additionally convert " -pthread" to " -Wl,-pthread" for nagfor -+ func_cc_basename $CC -+ case $func_cc_basename_result in -+ nagfor*) tmp_inherited_linker_flags=`$ECHO "$tmp_inherited_linker_flags" | $SED 's/ -pthread/ -Wl,-pthread/g'` ;; -+ esac -+ - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; -@@ -8881,7 +8888,8 @@ func_mode_link () - xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - # On Darwin other compilers -- case $CC in -+ func_cc_basename $CC -+ case $func_cc_basename_result in - nagfor*) - verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" - ;; -@@ -9493,6 +9501,13 @@ EOF - ;; - esac - -+ # Time to revert the changes made for nagfor. -+ func_cc_basename $CC -+ case $func_cc_basename_result in -+ nagfor*) -+ new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% -Wl,-pthread% -pthread%g'` ;; -+ esac -+ - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= |