summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-10 11:59:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-15 08:10:11 +0000
commit7879893ae25d25888b661e2aa527d3cfa10a4038 (patch)
tree3da0296834587ff6992c323eaa106dead09978fc
parentf6bc65747601b960050b758a8e2dce94e9494977 (diff)
downloadpoky-7879893ae25d25888b661e2aa527d3cfa10a4038.tar.gz
python: replace obsolete automake macros with working ones
Add obsolete_automake_macros.patch for both python-dbus and python-pygobject that replace automake macros no longer supported by automake-1.13 with modern constructs. (From OE-Core rev: 9866bed92c0f3dee3f1674e9f9a28e21f5ba33fc) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python-dbus-1.1.1/obsolete_automake_macros.patch14
-rw-r--r--meta/recipes-devtools/python/python-dbus_1.1.1.bb6
-rw-r--r--meta/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch23
-rw-r--r--meta/recipes-devtools/python/python-pygobject_2.27.91.bb6
4 files changed, 45 insertions, 4 deletions
diff --git a/meta/recipes-devtools/python/python-dbus-1.1.1/obsolete_automake_macros.patch b/meta/recipes-devtools/python/python-dbus-1.1.1/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..9da9c4568e
--- /dev/null
+++ b/meta/recipes-devtools/python/python-dbus-1.1.1/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
1Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59006]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd dbus-python-1.1.1/configure.ac dbus-python-1.1.1/configure.ac
5--- dbus-python-1.1.1/configure.ac 2012-06-25 19:02:12.000000000 +0300
6+++ dbus-python-1.1.1/configure.ac 2013-01-03 05:42:00.498912733 +0200
7@@ -29,7 +29,7 @@
8 AC_SUBST(DBUS_PYTHON_MICRO_VERSION, dbus_python_micro_version)
9
10 AC_CONFIG_SRCDIR([_dbus_bindings/module.c])
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 AM_INIT_AUTOMAKE([1.9 -Wno-portability])
diff --git a/meta/recipes-devtools/python/python-dbus_1.1.1.bb b/meta/recipes-devtools/python/python-dbus_1.1.1.bb
index 5bf01a644f..465a7f4831 100644
--- a/meta/recipes-devtools/python/python-dbus_1.1.1.bb
+++ b/meta/recipes-devtools/python/python-dbus_1.1.1.bb
@@ -4,9 +4,11 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://COPYING;md5=f5612614133e9a2f2dad527d97554670" 5LIC_FILES_CHKSUM = "file://COPYING;md5=f5612614133e9a2f2dad527d97554670"
6DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" 6DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
7PR = "r1" 7PR = "r2"
8 8
9SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" 9SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \
10 file://obsolete_automake_macros.patch \
11"
10 12
11SRC_URI[md5sum] = "742c7432ad0f7c3f98291d58fa2e35dc" 13SRC_URI[md5sum] = "742c7432ad0f7c3f98291d58fa2e35dc"
12SRC_URI[sha256sum] = "8917ca4fb8f4d693aee18d200cbad166b2c938dfb88c03bb4ab3d90a7c915e88" 14SRC_URI[sha256sum] = "8917ca4fb8f4d693aee18d200cbad166b2c938dfb88c03bb4ab3d90a7c915e88"
diff --git a/meta/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch b/meta/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..c2591123b3
--- /dev/null
+++ b/meta/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch
@@ -0,0 +1,23 @@
1Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691101]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd pygobject-2.27.91/configure.ac pygobject-2.27.91/configure.ac
5--- pygobject-2.27.91/configure.ac 2011-02-23 22:14:37.000000000 +0200
6+++ pygobject-2.27.91/configure.ac 2013-01-03 05:13:44.034949954 +0200
7@@ -35,7 +35,7 @@
8 AC_DEFINE(PYGOBJECT_MICRO_VERSION, pygobject_micro_version, [pygobject micro version])
9 AC_SUBST(PYGOBJECT_MICRO_VERSION, pygobject_micro_version)
10
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
14 AM_INIT_AUTOMAKE(foreign)
15 AM_MAINTAINER_MODE
16@@ -82,7 +82,6 @@
17 m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
18 AC_ISC_POSIX
19 AC_PROG_CC
20-AM_PROG_CC_STDC
21 AM_PROG_CC_C_O
22
23 # check that we have the minimum version of python necisary to build
diff --git a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
index daf570dade..4381107ae5 100644
--- a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
+++ b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
@@ -5,11 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
5DEPENDS = "python python-pygobject-native glib-2.0" 5DEPENDS = "python python-pygobject-native glib-2.0"
6DEPENDS_class-native = "glib-2.0-native" 6DEPENDS_class-native = "glib-2.0-native"
7RDEPENDS_class-native = "" 7RDEPENDS_class-native = ""
8PR = "r5" 8PR = "r6"
9 9
10MAJ_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" 10MAJ_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
11 11
12SRC_URI = "${GNOME_MIRROR}/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2" 12SRC_URI = "${GNOME_MIRROR}/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
13 file://obsolete_automake_macros.patch \
14"
13 15
14SRC_URI[md5sum] = "2b11a3050264721aac83188224b093a8" 16SRC_URI[md5sum] = "2b11a3050264721aac83188224b093a8"
15SRC_URI[sha256sum] = "a1dffbe2a8e0d490594554ed8d06f0ee4a371acb6c210e7f35158e9ae77e0df4" 17SRC_URI[sha256sum] = "a1dffbe2a8e0d490594554ed8d06f0ee4a371acb6c210e7f35158e9ae77e0df4"