ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix autoconf macros

Browse Source
This commit is contained in:
Anthony Green
2012-10-30 06:59:32 -04:00
parent 70084e70dd
commit 6993a6686f
32 changed files with 9483 additions and 24708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/aix-fix
View File

@@ -2,7 +2,7 @@ Index: libffi/ChangeLog
===================================================================
--- libffi.orig/ChangeLog
+++ libffi/ChangeLog
@@ -6,6 +6,11 @@
@@ -32,6 +32,11 @@
(ffi_call): Silence possibly undefined warning.
(ffi_closure_helper_SYSV): Declare variable type.

32
patches/bfin
View File

@@ -106,7 +106,7 @@ Index: libffi/Makefile.in
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \
@@ -139,44 +140,45 @@ am_libffi_la_OBJECTS = src/prep_cif.lo s
@@ -150,44 +151,45 @@ am_libffi_la_OBJECTS = src/prep_cif.lo s
@FFI_DEBUG_TRUE@am__objects_1 = src/debug.lo
@MIPS_TRUE@am__objects_2 = src/mips/ffi.lo src/mips/o32.lo \
@MIPS_TRUE@ src/mips/n32.lo
@@ -178,7 +178,7 @@ Index: libffi/Makefile.in
nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_3) $(am__objects_4) $(am__objects_5) \
$(am__objects_6) $(am__objects_7) $(am__objects_8) \
@@ -186,17 +188,17 @@ nodist_libffi_la_OBJECTS = $(am__objects
@@ -197,17 +199,17 @@ nodist_libffi_la_OBJECTS = $(am__objects
$(am__objects_18) $(am__objects_19) $(am__objects_20) \
$(am__objects_21) $(am__objects_22) $(am__objects_23) \
$(am__objects_24) $(am__objects_25) $(am__objects_26) \
@@ -200,7 +200,7 @@ Index: libffi/Makefile.in
$(am__objects_4) $(am__objects_5) $(am__objects_6) \
$(am__objects_7) $(am__objects_8) $(am__objects_9) \
$(am__objects_10) $(am__objects_11) $(am__objects_12) \
@@ -205,8 +207,8 @@ am__objects_30 = $(am__objects_1) $(am__
@@ -216,8 +218,8 @@ am__objects_30 = $(am__objects_1) $(am__
$(am__objects_19) $(am__objects_20) $(am__objects_21) \
$(am__objects_22) $(am__objects_23) $(am__objects_24) \
$(am__objects_25) $(am__objects_26) $(am__objects_27) \
@@ -211,7 +211,7 @@ Index: libffi/Makefile.in
libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \
$(nodist_libffi_convenience_la_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@
@@ -460,6 +462,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
@@ -473,6 +475,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
src/x86/win64.S src/x86/freebsd.S src/x86/ffi64.c \
src/x86/unix64.S src/x86/ffitarget.h src/pa/ffitarget.h \
src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c \
@@ -219,7 +219,7 @@ Index: libffi/Makefile.in
src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
src/moxie/ffi.c src/moxie/eabi.S libtool-version \
ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \
@@ -528,10 +531,10 @@ nodist_libffi_la_SOURCES = $(am__append_
@@ -541,10 +544,10 @@ nodist_libffi_la_SOURCES = $(am__append_
$(am__append_18) $(am__append_19) $(am__append_20) \
$(am__append_21) $(am__append_22) $(am__append_23) \
$(am__append_24) $(am__append_25) $(am__append_26) \
@@ -232,7 +232,7 @@ Index: libffi/Makefile.in
libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src -DFFI_BUILDING
AM_CCASFLAGS = $(AM_CPPFLAGS) -g
@@ -656,6 +659,16 @@ src/mips/o32.lo: src/mips/$(am__dirstamp
@@ -669,6 +672,16 @@ src/mips/o32.lo: src/mips/$(am__dirstamp
src/mips/$(DEPDIR)/$(am__dirstamp)
src/mips/n32.lo: src/mips/$(am__dirstamp) \
src/mips/$(DEPDIR)/$(am__dirstamp)
@@ -249,7 +249,7 @@ Index: libffi/Makefile.in
src/x86/$(am__dirstamp):
@$(MKDIR_P) src/x86
@: > src/x86/$(am__dirstamp)
@@ -871,6 +884,10 @@ mostlyclean-compile:
@@ -884,6 +897,10 @@ mostlyclean-compile:
-rm -f src/avr32/ffi.lo
-rm -f src/avr32/sysv.$(OBJEXT)
-rm -f src/avr32/sysv.lo
@@ -260,7 +260,7 @@ Index: libffi/Makefile.in
-rm -f src/closures.$(OBJEXT)
-rm -f src/closures.lo
-rm -f src/cris/ffi.$(OBJEXT)
@@ -992,6 +1009,8 @@ distclean-compile:
@@ -1005,6 +1022,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/trampoline.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/avr32/$(DEPDIR)/ffi.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/avr32/$(DEPDIR)/sysv.Plo@am__quote@
@@ -269,7 +269,7 @@ Index: libffi/Makefile.in
@AMDEP_TRUE@@am__include@ @am__quote@src/cris/$(DEPDIR)/ffi.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/cris/$(DEPDIR)/sysv.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/frv/$(DEPDIR)/eabi.Plo@am__quote@
@@ -1096,6 +1115,7 @@ clean-libtool:
@@ -1109,6 +1128,7 @@ clean-libtool:
-rm -rf src/alpha/.libs src/alpha/_libs
-rm -rf src/arm/.libs src/arm/_libs
-rm -rf src/avr32/.libs src/avr32/_libs
@@ -277,7 +277,7 @@ Index: libffi/Makefile.in
-rm -rf src/cris/.libs src/cris/_libs
-rm -rf src/frv/.libs src/frv/_libs
-rm -rf src/ia64/.libs src/ia64/_libs
@@ -1666,6 +1686,8 @@ distclean-generic:
@@ -1679,6 +1699,8 @@ distclean-generic:
-rm -f src/arm/$(am__dirstamp)
-rm -f src/avr32/$(DEPDIR)/$(am__dirstamp)
-rm -f src/avr32/$(am__dirstamp)
@@ -286,7 +286,7 @@ Index: libffi/Makefile.in
-rm -f src/cris/$(DEPDIR)/$(am__dirstamp)
-rm -f src/cris/$(am__dirstamp)
-rm -f src/frv/$(DEPDIR)/$(am__dirstamp)
@@ -1705,7 +1727,7 @@ clean-am: clean-aminfo clean-generic cle
@@ -1718,7 +1740,7 @@ clean-am: clean-aminfo clean-generic cle
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -295,7 +295,7 @@ Index: libffi/Makefile.in
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
@@ -1840,7 +1862,7 @@ installcheck-am:
@@ -1853,7 +1875,7 @@ installcheck-am:
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
@@ -317,7 +317,7 @@ Index: libffi/configure
MIPS_FALSE
MIPS_TRUE
AM_LTLDFLAGS
@@ -6739,14 +6741,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
@@ -6844,14 +6846,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
@@ -333,7 +333,7 @@ Index: libffi/configure
;;
ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
@@ -12132,6 +12127,10 @@ case "$host" in
@@ -13186,6 +13181,10 @@ case "$host" in
TARGET=AVR32; TARGETDIR=avr32
;;
@@ -344,7 +344,7 @@ Index: libffi/configure
cris-*-*)
TARGET=LIBFFI_CRIS; TARGETDIR=cris
;;
@@ -12277,6 +12276,14 @@ else
@@ -13331,6 +13330,14 @@ else
MIPS_FALSE=
fi
@@ -359,7 +359,7 @@ Index: libffi/configure
if test x$TARGET = xSPARC; then
SPARC_TRUE=
SPARC_FALSE='#'
@@ -13688,6 +13695,10 @@ if test -z "${MIPS_TRUE}" && test -z "${
@@ -14775,6 +14782,10 @@ if test -z "${MIPS_TRUE}" && test -z "${
as_fn_error $? "conditional \"MIPS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi

2
patches/dist-tests
View File

@@ -156,7 +156,7 @@ Index: libffi/testsuite/Makefile.in
===================================================================
--- libffi.orig/testsuite/Makefile.in
+++ libffi/testsuite/Makefile.in
@@ -215,69 +215,74 @@ RUNTEST = `if [ -f $(top_srcdir)/../deja
@@ -228,69 +228,74 @@ RUNTEST = `if [ -f $(top_srcdir)/../deja
else echo runtest; fi`
CLEANFILES = *.exe core* *.log *.sum

12119
patches/stand-alone
View File

File diff suppressed because it is too large Load Diff

30
patches/tile
View File

@@ -121,7 +121,7 @@ Index: libffi/Makefile.in
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \
@@ -179,6 +180,7 @@ am_libffi_la_OBJECTS = src/prep_cif.lo s
@@ -190,6 +191,7 @@ am_libffi_la_OBJECTS = src/prep_cif.lo s
@SH64_TRUE@am__objects_27 = src/sh64/sysv.lo src/sh64/ffi.lo
@PA_LINUX_TRUE@am__objects_28 = src/pa/linux.lo src/pa/ffi.lo
@PA_HPUX_TRUE@am__objects_29 = src/pa/hpux32.lo src/pa/ffi.lo
@@ -129,7 +129,7 @@ Index: libffi/Makefile.in
nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_3) $(am__objects_4) $(am__objects_5) \
$(am__objects_6) $(am__objects_7) $(am__objects_8) \
@@ -188,17 +190,18 @@ nodist_libffi_la_OBJECTS = $(am__objects
@@ -199,17 +201,18 @@ nodist_libffi_la_OBJECTS = $(am__objects
$(am__objects_18) $(am__objects_19) $(am__objects_20) \
$(am__objects_21) $(am__objects_22) $(am__objects_23) \
$(am__objects_24) $(am__objects_25) $(am__objects_26) \
@@ -152,7 +152,7 @@ Index: libffi/Makefile.in
$(am__objects_4) $(am__objects_5) $(am__objects_6) \
$(am__objects_7) $(am__objects_8) $(am__objects_9) \
$(am__objects_10) $(am__objects_11) $(am__objects_12) \
@@ -207,8 +210,8 @@ am__objects_31 = $(am__objects_1) $(am__
@@ -218,8 +221,8 @@ am__objects_31 = $(am__objects_1) $(am__
$(am__objects_19) $(am__objects_20) $(am__objects_21) \
$(am__objects_22) $(am__objects_23) $(am__objects_24) \
$(am__objects_25) $(am__objects_26) $(am__objects_27) \
@@ -163,7 +163,7 @@ Index: libffi/Makefile.in
libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \
$(nodist_libffi_convenience_la_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@
@@ -439,39 +442,39 @@ top_builddir = @top_builddir@
@@ -452,39 +455,39 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign subdir-objects
SUBDIRS = include testsuite man
@@ -236,7 +236,7 @@ Index: libffi/Makefile.in
info_TEXINFOS = doc/libffi.texi
@@ -531,10 +534,11 @@ nodist_libffi_la_SOURCES = $(am__append_
@@ -544,10 +547,11 @@ nodist_libffi_la_SOURCES = $(am__append_
$(am__append_18) $(am__append_19) $(am__append_20) \
$(am__append_21) $(am__append_22) $(am__append_23) \
$(am__append_24) $(am__append_25) $(am__append_26) \
@@ -250,7 +250,7 @@ Index: libffi/Makefile.in
libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src -DFFI_BUILDING
AM_CCASFLAGS = $(AM_CPPFLAGS) -g
@@ -863,6 +867,16 @@ src/pa/linux.lo: src/pa/$(am__dirstamp)
@@ -876,6 +880,16 @@ src/pa/linux.lo: src/pa/$(am__dirstamp)
src/pa/ffi.lo: src/pa/$(am__dirstamp) src/pa/$(DEPDIR)/$(am__dirstamp)
src/pa/hpux32.lo: src/pa/$(am__dirstamp) \
src/pa/$(DEPDIR)/$(am__dirstamp)
@@ -267,7 +267,7 @@ Index: libffi/Makefile.in
libffi.la: $(libffi_la_OBJECTS) $(libffi_la_DEPENDENCIES) $(EXTRA_libffi_la_DEPENDENCIES)
$(libffi_la_LINK) -rpath $(libdir) $(libffi_la_OBJECTS) $(libffi_la_LIBADD) $(LIBS)
libffi_convenience.la: $(libffi_convenience_la_OBJECTS) $(libffi_convenience_la_DEPENDENCIES) $(EXTRA_libffi_convenience_la_DEPENDENCIES)
@@ -972,6 +986,10 @@ mostlyclean-compile:
@@ -985,6 +999,10 @@ mostlyclean-compile:
-rm -f src/sparc/v8.lo
-rm -f src/sparc/v9.$(OBJEXT)
-rm -f src/sparc/v9.lo
@@ -278,7 +278,7 @@ Index: libffi/Makefile.in
-rm -f src/types.$(OBJEXT)
-rm -f src/types.lo
-rm -f src/x86/darwin.$(OBJEXT)
@@ -1048,6 +1066,8 @@ distclean-compile:
@@ -1061,6 +1079,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@src/sparc/$(DEPDIR)/ffi.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/sparc/$(DEPDIR)/v8.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/sparc/$(DEPDIR)/v9.Plo@am__quote@
@@ -287,7 +287,7 @@ Index: libffi/Makefile.in
@AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/darwin.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/darwin64.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/x86/$(DEPDIR)/ffi.Plo@am__quote@
@@ -1129,6 +1149,7 @@ clean-libtool:
@@ -1142,6 +1162,7 @@ clean-libtool:
-rm -rf src/sh/.libs src/sh/_libs
-rm -rf src/sh64/.libs src/sh64/_libs
-rm -rf src/sparc/.libs src/sparc/_libs
@@ -295,7 +295,7 @@ Index: libffi/Makefile.in
-rm -rf src/x86/.libs src/x86/_libs
distclean-libtool:
@@ -1714,6 +1735,8 @@ distclean-generic:
@@ -1727,6 +1748,8 @@ distclean-generic:
-rm -f src/sh64/$(am__dirstamp)
-rm -f src/sparc/$(DEPDIR)/$(am__dirstamp)
-rm -f src/sparc/$(am__dirstamp)
@@ -304,7 +304,7 @@ Index: libffi/Makefile.in
-rm -f src/x86/$(DEPDIR)/$(am__dirstamp)
-rm -f src/x86/$(am__dirstamp)
@@ -1727,7 +1750,7 @@ clean-am: clean-aminfo clean-generic cle
@@ -1740,7 +1763,7 @@ clean-am: clean-aminfo clean-generic cle
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -313,7 +313,7 @@ Index: libffi/Makefile.in
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
@@ -1862,7 +1885,7 @@ installcheck-am:
@@ -1875,7 +1898,7 @@ installcheck-am:
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
@@ -335,7 +335,7 @@ Index: libffi/configure
PA64_HPUX_FALSE
PA64_HPUX_TRUE
PA_HPUX_FALSE
@@ -12239,6 +12241,10 @@ case "$host" in
@@ -13293,6 +13295,10 @@ case "$host" in
TARGET=SPARC; TARGETDIR=sparc
;;
@@ -346,7 +346,7 @@ Index: libffi/configure
x86_64-*-darwin*)
TARGET=X86_DARWIN; TARGETDIR=x86
;;
@@ -12492,6 +12498,14 @@ else
@@ -13546,6 +13552,14 @@ else
PA64_HPUX_FALSE=
fi
@@ -361,7 +361,7 @@ Index: libffi/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
@@ -13803,6 +13817,10 @@ if test -z "${PA64_HPUX_TRUE}" && test -
@@ -14890,6 +14904,10 @@ if test -z "${PA64_HPUX_TRUE}" && test -
as_fn_error $? "conditional \"PA64_HPUX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi

2
patches/update-disty
View File

@@ -30,7 +30,7 @@ Index: libffi/Makefile.in
===================================================================
--- libffi.orig/Makefile.in
+++ libffi/Makefile.in
@@ -466,6 +466,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
@@ -479,6 +479,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 \
m4/ltversion.m4 src/arm/gentramp.sh src/debug.c \
msvcc.sh generate-ios-source-and-headers.py \

14
patches/v3_0_11
View File

@@ -34,7 +34,7 @@ Index: libffi/configure
PACKAGE_BUGREPORT='http://github.com/atgreen/libffi/issues'
PACKAGE_URL=''
@@ -1371,7 +1371,7 @@ if test "$ac_init_help" = "long"; then
@@ -1376,7 +1376,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
@@ -43,7 +43,7 @@ Index: libffi/configure
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1442,7 +1442,7 @@ fi
@@ -1447,7 +1447,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
@@ -52,7 +52,7 @@ Index: libffi/configure
esac
cat <<\_ACEOF
@@ -1551,7 +1551,7 @@ fi
@@ -1563,7 +1563,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
@@ -61,7 +61,7 @@ Index: libffi/configure
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2152,7 +2152,7 @@ cat >config.log <<_ACEOF
@@ -2164,7 +2164,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
@@ -70,7 +70,7 @@ Index: libffi/configure
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3087,7 +3087,7 @@ fi
@@ -3198,7 +3198,7 @@ fi
# Define the identity of the package.
PACKAGE='libffi'
@@ -79,7 +79,7 @@ Index: libffi/configure
cat >>confdefs.h <<_ACEOF
@@ -14210,7 +14210,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
@@ -15297,7 +15297,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
@@ -88,7 +88,7 @@ Index: libffi/configure
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14280,7 +14280,7 @@ _ACEOF
@@ -15367,7 +15367,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\

2
patches/x32libtool
View File

@@ -37,7 +37,7 @@ Index: libffi/configure
===================================================================
--- libffi.orig/configure
+++ libffi/configure
@@ -6739,7 +6739,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
@@ -6844,7 +6844,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)

2
patches/xcode
View File

@@ -645,7 +645,7 @@ Index: libffi/Makefile.in
===================================================================
--- libffi.orig/Makefile.in
+++ libffi/Makefile.in
@@ -463,9 +463,11 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
@@ -476,9 +476,11 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
src/moxie/ffi.c src/moxie/eabi.S libtool-version \
ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \