* [PATCH] python-2.6.4: make Modules/_ctypes/libffi configure
@ 2010-04-22 15:00 Antonio Ospite
2010-04-22 15:15 ` Martin Jansa
2010-04-22 15:15 ` Koen Kooi
0 siblings, 2 replies; 3+ messages in thread
From: Antonio Ospite @ 2010-04-22 15:00 UTC (permalink / raw)
To: openembedded-devel; +Cc: Martin Jansa
This fixes configure issues with recent autoconf, e.g:
autoreconf: Entering directory `Modules/_ctypes/libffi'
autoreconf: configure.ac: not using Gettext
autoreconf: running: aclocal --force
configure.ac:26: error: m4_copy: won't overwrite defined macro: \
_AC_ARG_VAR_PRECIOUS
configure.ac:26: the top level
It also adjustes Makefile.am to take into account the fact that python ships
incomplete source from libffi.
Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
---
.../06-ctypes-libffi-fix-configure.patch | 51 ++++++++++++++++++++
recipes/python/python-native_2.6.4.bb | 1 +
recipes/python/python_2.6.4.bb | 1 +
3 files changed, 53 insertions(+), 0 deletions(-)
create mode 100644 recipes/python/python-2.6.4/06-ctypes-libffi-fix-configure.patch
diff --git a/recipes/python/python-2.6.4/06-ctypes-libffi-fix-configure.patch b/recipes/python/python-2.6.4/06-ctypes-libffi-fix-configure.patch
new file mode 100644
index 0000000..3773791
--- /dev/null
+++ b/recipes/python/python-2.6.4/06-ctypes-libffi-fix-configure.patch
@@ -0,0 +1,51 @@
+This fixes configure issues with recent autoconf, e.g:
+ autoreconf: Entering directory `Modules/_ctypes/libffi'
+ autoreconf: configure.ac: not using Gettext
+ autoreconf: running: aclocal --force
+ configure.ac:26: error: m4_copy: won't overwrite defined macro: _AC_ARG_VAR_PRECIOUS
+ configure.ac:26: the top level
+
+The problem is still present in python-2.6.5 but fixed in python-svn.
+
+diff -pruN Python-2.6.4.orig//Modules/_ctypes/libffi/configure.ac Python-2.6.4/Modules/_ctypes/libffi/configure.ac
+--- Python-2.6.4.orig//Modules/_ctypes/libffi/configure.ac 2009-04-28 22:01:18.000000000 +0200
++++ Python-2.6.4/Modules/_ctypes/libffi/configure.ac 2010-04-20 22:46:02.000000000 +0200
+@@ -23,6 +23,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)
+@@ -366,7 +367,7 @@ test -d src/$TARGETDIR || mkdir src/$TAR
+
+ AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h)
+
+-AC_CONFIG_FILES(include/ffi.h)
++AC_CONFIG_FILES(include/ffi.h include/Makefile Makefile)
+
+ AC_CONFIG_LINKS(include/ffi_common.h:include/ffi_common.h)
+
+diff -pruN Python-2.6.4.orig//Modules/_ctypes/libffi/Makefile.am Python-2.6.4/Modules/_ctypes/libffi/Makefile.am
+--- Python-2.6.4.orig//Modules/_ctypes/libffi/Makefile.am 2008-03-04 21:09:11.000000000 +0100
++++ Python-2.6.4/Modules/_ctypes/libffi/Makefile.am 2010-04-20 22:54:03.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ AUTOMAKE_OPTIONS = foreign subdir-objects
+
+-SUBDIRS = include testsuite man
++SUBDIRS = include
+
+ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
+ src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
+@@ -32,8 +32,6 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
+ src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
+ libtool-version ChangeLog.libffi
+
+-info_TEXINFOS = doc/libffi.texi
+-
+ ## ################################################################
+
+ ##
+
diff --git a/recipes/python/python-native_2.6.4.bb b/recipes/python/python-native_2.6.4.bb
index ca65057..87a74de 100644
--- a/recipes/python/python-native_2.6.4.bb
+++ b/recipes/python/python-native_2.6.4.bb
@@ -7,6 +7,7 @@ SRC_URI = "\
file://00-fix-bindir-libdir-for-cross.patch;patch=1 \
file://04-default-is-optimized.patch;patch=1 \
file://05-enable-ctypes-cross-build.patch;patch=1 \
+ file://06-ctypes-libffi-fix-configure.patch;patch=1 \
file://10-distutils-fix-swig-parameter.patch;patch=1 \
file://11-distutils-never-modify-shebang-line.patch;patch=1 \
file://12-distutils-prefix-is-inside-staging-area.patch;patch=1 \
diff --git a/recipes/python/python_2.6.4.bb b/recipes/python/python_2.6.4.bb
index 6d93c2c..e4bdd5e 100644
--- a/recipes/python/python_2.6.4.bb
+++ b/recipes/python/python_2.6.4.bb
@@ -13,6 +13,7 @@ SRC_URI = "\
file://03-fix-tkinter-detection.patch;patch=1 \
file://04-default-is-optimized.patch;patch=1 \
file://05-enable-ctypes-cross-build.patch;patch=1 \
+ file://06-ctypes-libffi-fix-configure.patch;patch=1 \
file://99-ignore-optimization-flag.patch;patch=1 \
\
# not yet pushed forward
--
1.7.0.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] python-2.6.4: make Modules/_ctypes/libffi configure
2010-04-22 15:00 [PATCH] python-2.6.4: make Modules/_ctypes/libffi configure Antonio Ospite
@ 2010-04-22 15:15 ` Martin Jansa
2010-04-22 15:15 ` Koen Kooi
1 sibling, 0 replies; 3+ messages in thread
From: Martin Jansa @ 2010-04-22 15:15 UTC (permalink / raw)
To: openembedded-devel
On Thu, Apr 22, 2010 at 5:00 PM, Antonio Ospite
<ospite@studenti.unina.it> wrote:
> This fixes configure issues with recent autoconf, e.g:
> autoreconf: Entering directory `Modules/_ctypes/libffi'
> autoreconf: configure.ac: not using Gettext
> autoreconf: running: aclocal --force
> configure.ac:26: error: m4_copy: won't overwrite defined macro: \
> _AC_ARG_VAR_PRECIOUS
> configure.ac:26: the top level
>
> It also adjustes Makefile.am to take into account the fact that python ships
> incomplete source from libffi.
>
> Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
I'll apply soon with added PR bump.
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] python-2.6.4: make Modules/_ctypes/libffi configure
2010-04-22 15:00 [PATCH] python-2.6.4: make Modules/_ctypes/libffi configure Antonio Ospite
2010-04-22 15:15 ` Martin Jansa
@ 2010-04-22 15:15 ` Koen Kooi
1 sibling, 0 replies; 3+ messages in thread
From: Koen Kooi @ 2010-04-22 15:15 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
You forgot to bump PR, so this change won't get pickup by the package
manager
On 22-04-10 17:00, Antonio Ospite wrote:
> This fixes configure issues with recent autoconf, e.g:
> autoreconf: Entering directory `Modules/_ctypes/libffi'
> autoreconf: configure.ac: not using Gettext
> autoreconf: running: aclocal --force
> configure.ac:26: error: m4_copy: won't overwrite defined macro: \
> _AC_ARG_VAR_PRECIOUS
> configure.ac:26: the top level
>
> It also adjustes Makefile.am to take into account the fact that python ships
> incomplete source from libffi.
>
> Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
> ---
> .../06-ctypes-libffi-fix-configure.patch | 51 ++++++++++++++++++++
> recipes/python/python-native_2.6.4.bb | 1 +
> recipes/python/python_2.6.4.bb | 1 +
> 3 files changed, 53 insertions(+), 0 deletions(-)
> create mode 100644 recipes/python/python-2.6.4/06-ctypes-libffi-fix-configure.patch
>
> diff --git a/recipes/python/python-2.6.4/06-ctypes-libffi-fix-configure.patch b/recipes/python/python-2.6.4/06-ctypes-libffi-fix-configure.patch
> new file mode 100644
> index 0000000..3773791
> --- /dev/null
> +++ b/recipes/python/python-2.6.4/06-ctypes-libffi-fix-configure.patch
> @@ -0,0 +1,51 @@
> +This fixes configure issues with recent autoconf, e.g:
> + autoreconf: Entering directory `Modules/_ctypes/libffi'
> + autoreconf: configure.ac: not using Gettext
> + autoreconf: running: aclocal --force
> + configure.ac:26: error: m4_copy: won't overwrite defined macro: _AC_ARG_VAR_PRECIOUS
> + configure.ac:26: the top level
> +
> +The problem is still present in python-2.6.5 but fixed in python-svn.
> +
> +diff -pruN Python-2.6.4.orig//Modules/_ctypes/libffi/configure.ac Python-2.6.4/Modules/_ctypes/libffi/configure.ac
> +--- Python-2.6.4.orig//Modules/_ctypes/libffi/configure.ac 2009-04-28 22:01:18.000000000 +0200
> ++++ Python-2.6.4/Modules/_ctypes/libffi/configure.ac 2010-04-20 22:46:02.000000000 +0200
> +@@ -23,6 +23,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)
> +@@ -366,7 +367,7 @@ test -d src/$TARGETDIR || mkdir src/$TAR
> +
> + AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h)
> +
> +-AC_CONFIG_FILES(include/ffi.h)
> ++AC_CONFIG_FILES(include/ffi.h include/Makefile Makefile)
> +
> + AC_CONFIG_LINKS(include/ffi_common.h:include/ffi_common.h)
> +
> +diff -pruN Python-2.6.4.orig//Modules/_ctypes/libffi/Makefile.am Python-2.6.4/Modules/_ctypes/libffi/Makefile.am
> +--- Python-2.6.4.orig//Modules/_ctypes/libffi/Makefile.am 2008-03-04 21:09:11.000000000 +0100
> ++++ Python-2.6.4/Modules/_ctypes/libffi/Makefile.am 2010-04-20 22:54:03.000000000 +0200
> +@@ -2,7 +2,7 @@
> +
> + AUTOMAKE_OPTIONS = foreign subdir-objects
> +
> +-SUBDIRS = include testsuite man
> ++SUBDIRS = include
> +
> + EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
> + src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
> +@@ -32,8 +32,6 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
> + src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
> + libtool-version ChangeLog.libffi
> +
> +-info_TEXINFOS = doc/libffi.texi
> +-
> + ## ################################################################
> +
> + ##
> +
> diff --git a/recipes/python/python-native_2.6.4.bb b/recipes/python/python-native_2.6.4.bb
> index ca65057..87a74de 100644
> --- a/recipes/python/python-native_2.6.4.bb
> +++ b/recipes/python/python-native_2.6.4.bb
> @@ -7,6 +7,7 @@ SRC_URI = "\
> file://00-fix-bindir-libdir-for-cross.patch;patch=1 \
> file://04-default-is-optimized.patch;patch=1 \
> file://05-enable-ctypes-cross-build.patch;patch=1 \
> + file://06-ctypes-libffi-fix-configure.patch;patch=1 \
> file://10-distutils-fix-swig-parameter.patch;patch=1 \
> file://11-distutils-never-modify-shebang-line.patch;patch=1 \
> file://12-distutils-prefix-is-inside-staging-area.patch;patch=1 \
> diff --git a/recipes/python/python_2.6.4.bb b/recipes/python/python_2.6.4.bb
> index 6d93c2c..e4bdd5e 100644
> --- a/recipes/python/python_2.6.4.bb
> +++ b/recipes/python/python_2.6.4.bb
> @@ -13,6 +13,7 @@ SRC_URI = "\
> file://03-fix-tkinter-detection.patch;patch=1 \
> file://04-default-is-optimized.patch;patch=1 \
> file://05-enable-ctypes-cross-build.patch;patch=1 \
> + file://06-ctypes-libffi-fix-configure.patch;patch=1 \
> file://99-ignore-optimization-flag.patch;patch=1 \
> \
> # not yet pushed forward
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFL0GgcMkyGM64RGpERAtu3AKCYOqwsH01MEAZEfI0eDOhE1YgbBACfSiee
3UMuHNieVNJp3EUrTFlVmGE=
=bKKP
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-04-22 15:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-04-22 15:00 [PATCH] python-2.6.4: make Modules/_ctypes/libffi configure Antonio Ospite
2010-04-22 15:15 ` Martin Jansa
2010-04-22 15:15 ` Koen Kooi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.