Commit 9c157d3215e4393777f83eb6fa801df6528f40d7

Anthony Green 2009-12-25T02:15:40

Clean up undefine_AC_ARG_VAR_PRECIOUS patch.

diff --git a/.pc/undefine_AC_ARG_VAR_PRECIOUS/.timestamp b/.pc/undefine_AC_ARG_VAR_PRECIOUS/.timestamp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.pc/undefine_AC_ARG_VAR_PRECIOUS/.timestamp
diff --git a/patches/undefine_AC_ARG_VAR_PRECIOUS b/patches/undefine_AC_ARG_VAR_PRECIOUS
new file mode 100644
index 0000000..5aa198f
--- /dev/null
+++ b/patches/undefine_AC_ARG_VAR_PRECIOUS
@@ -0,0 +1,138 @@
+Index: libffi/ChangeLog.libffi
+===================================================================
+--- libffi.orig/ChangeLog.libffi
++++ libffi/ChangeLog.libffi
+@@ -1,3 +1,9 @@
++2009-12-25  Samuli Suominen  <ssuominen@gentoo.org>
++
++	* configure.ac: Undefine _AC_ARG_VAR_PRECIOUS for autoconf 2.64.
++	* configure: Rebuilt.
++	* fficonfig.h.in: Rebuilt.
++
+ 2009-12-25  Carlo Bramini  <carlo.bramix@libero.it>
+ 
+ 	* configure.ac (AM_LTLDFLAGS): Define for windows hosts.
+Index: libffi/configure
+===================================================================
+--- libffi.orig/configure
++++ libffi/configure
+@@ -3890,6 +3890,7 @@ fi
+ 
+ 
+ 
++
+ # By default we simply use the C compiler to build assembly code.
+ 
+ test "${CCAS+set}" = set || CCAS=$CC
+@@ -4773,13 +4774,13 @@ if test "${lt_cv_nm_interface+set}" = se
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:4776: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:4777: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:4779: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:4780: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:4782: output\"" >&5)
++  (eval echo "\"\$as_me:4783: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -5985,7 +5986,7 @@ ia64-*-hpux*)
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 5988 "configure"' > conftest.$ac_ext
++  echo '#line 5989 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -7838,11 +7839,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7841: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7842: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:7845: \$? = $ac_status" >&5
++   echo "$as_me:7846: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -8177,11 +8178,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8180: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8181: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8184: \$? = $ac_status" >&5
++   echo "$as_me:8185: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -8282,11 +8283,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8285: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8286: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:8289: \$? = $ac_status" >&5
++   echo "$as_me:8290: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -8337,11 +8338,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8340: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8341: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:8344: \$? = $ac_status" >&5
++   echo "$as_me:8345: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -11140,7 +11141,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11143 "configure"
++#line 11144 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11236,7 +11237,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11239 "configure"
++#line 11240 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+Index: libffi/configure.ac
+===================================================================
+--- libffi.orig/configure.ac
++++ libffi/configure.ac
+@@ -20,6 +20,7 @@ AM_INIT_AUTOMAKE
+ m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
+ m4_define([_AC_ARG_VAR_PRECIOUS],[])
+ AC_PROG_CC
++m4_undefine([_AC_ARG_VAR_PRECIOUS])
+ m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
+ 
+ AC_SUBST(CFLAGS)