From e08708a69f004f32a34e958b1e8dfa2656f781a7 Mon Sep 17 00:00:00 2001 From: Niels Kristian Bech Jensen Date: Sun, 24 Mar 2013 14:08:29 +1100 Subject: package cfitsio: fix ar detection --- src/cfitsio-1-ar.patch | 214 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 214 insertions(+) create mode 100644 src/cfitsio-1-ar.patch diff --git a/src/cfitsio-1-ar.patch b/src/cfitsio-1-ar.patch new file mode 100644 index 0000000..07eb5b1 --- /dev/null +++ b/src/cfitsio-1-ar.patch @@ -0,0 +1,214 @@ +This file is part of MXE. +See index.html for further information. + +Submitted upstream by mail since this package has no bug tracking system. + +--- cfitsio.orig/configure 2013-03-20 21:02:48.000000000 +0100 ++++ cfitsio/configure 2013-03-24 02:49:59.195998683 +0100 +@@ -614,6 +614,8 @@ + GREP + CPP + RANLIB ++ac_ct_AR ++AR + FC + OBJEXT + EXEEXT +@@ -3136,6 +3138,170 @@ + fi + fi + ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++ ++ ++if test -n "$ac_tool_prefix"; then ++ for ac_prog in ar lib "link -lib" ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_AR+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$AR"; then ++ ac_cv_prog_AR="$AR" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++AR=$ac_cv_prog_AR ++if test -n "$AR"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 ++$as_echo "$AR" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$AR" && break ++ done ++fi ++if test -z "$AR"; then ++ ac_ct_AR=$AR ++ for ac_prog in ar lib "link -lib" ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_ac_ct_AR+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_AR"; then ++ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_AR="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_AR=$ac_cv_prog_ac_ct_AR ++if test -n "$ac_ct_AR"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 ++$as_echo "$ac_ct_AR" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_AR" && break ++done ++ ++ if test "x$ac_ct_AR" = x; then ++ AR="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ AR=$ac_ct_AR ++ fi ++fi ++ ++: ${AR=ar} ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5 ++$as_echo_n "checking the archiver ($AR) interface... " >&6; } ++if ${am_cv_ar_interface+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ am_cv_ar_interface=ar ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++int some_variable = 0; ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5' ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 ++ (eval $am_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -eq 0; then ++ am_cv_ar_interface=ar ++ else ++ am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5' ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 ++ (eval $am_ar_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if test "$ac_status" -eq 0; then ++ am_cv_ar_interface=lib ++ else ++ am_cv_ar_interface=unknown ++ fi ++ fi ++ rm -f conftest.lib libconftest.a ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 ++$as_echo "$am_cv_ar_interface" >&6; } ++ ++case $am_cv_ar_interface in ++ar) ++ ;; ++lib) ++ # Microsoft lib, so override with the ar-lib wrapper script. ++ # FIXME: It is wrong to rewrite AR. ++ # But if we don't then we get into trouble of one sort or another. ++ # A longer-term fix would be to have automake use am__AR in this case, ++ # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something ++ # similar. ++ AR="$am_aux_dir/ar-lib $AR" ++ ;; ++unknown) ++ as_fn_error $? "could not determine $AR interface" "$LINENO" 5 ++ ;; ++esac ++ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +@@ -3229,7 +3395,6 @@ + fi + + +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +--- cfitsio.orig/Makefile.in 2013-03-20 20:53:22.000000000 +0100 ++++ cfitsio/Makefile.in 2013-03-24 02:42:38.055988617 +0100 +@@ -27,6 +27,7 @@ + + + SHELL = /bin/sh ++AR = @AR@ + RANLIB = @RANLIB@ + CC = @CC@ + CFLAGS = @CFLAGS@ +@@ -81,7 +82,7 @@ + stand_alone: libcfitsio.a + + libcfitsio.a: ${OBJECTS} +- ar rv libcfitsio.a ${OBJECTS}; \ ++ ${AR} rv libcfitsio.a ${OBJECTS}; \ + ${RANLIB} libcfitsio.a; + + shared: libcfitsio${SHLIB_SUFFIX} -- cgit v0.12