[oe-commits] org.oe.dev python-pygobject[-native] 2.12.3: update to 2.14.2, adjust patches and -native package
mickeyl commit
oe at amethyst.openembedded.net
Sun Jun 22 12:02:30 UTC 2008
python-pygobject[-native] 2.12.3: update to 2.14.2, adjust patches and -native package
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: ef57d7f9782540c734ca9342f8a136c7bbeb5074
ViewMTN: http://monotone.openembedded.org/revision/info/ef57d7f9782540c734ca9342f8a136c7bbeb5074
Files:
1
packages/python/python-pygobject-native_2.12.3.bb
packages/python/python-pygobject-native_2.14.2.bb
packages/python/python-pygobject_2.12.3.bb
packages/python/python-pygobject_2.14.2.bb
packages/python/python-pygobject/generate-constants.patch
packages/python/python-pygobject/python-path.patch
Diffs:
#
# mt diff -raf58bf2bea9aa9af6a894eee040efbe061ffbcf5 -ref57d7f9782540c734ca9342f8a136c7bbeb5074
#
#
#
# rename "packages/python/python-pygobject-native_2.12.3.bb"
# to "packages/python/python-pygobject-native_2.14.2.bb"
#
# rename "packages/python/python-pygobject_2.12.3.bb"
# to "packages/python/python-pygobject_2.14.2.bb"
#
# add_file "packages/python/python-pygobject/generate-constants.patch"
# content [1726f18a8e65fb7fe7a860bd1bd79e09c0dd2de1]
#
# patch "packages/python/python-pygobject/python-path.patch"
# from [456c80476d80369857a7d37278a32421de5f4674]
# to [3d76576cef503c3fdc33b910140a9b6cbbb6be0a]
#
# patch "packages/python/python-pygobject-native_2.14.2.bb"
# from [a71881af165074dfb63c5cc7e67732e824b04644]
# to [2c5a99049d9b09d3da49735baee00883f198ddd5]
#
# patch "packages/python/python-pygobject_2.14.2.bb"
# from [e837d955710df4cd8216f94c3eedfba7d8a1a0c5]
# to [7ac8453a5f164b5387345d2d84d82158b4a62738]
#
============================================================
--- packages/python/python-pygobject/generate-constants.patch 1726f18a8e65fb7fe7a860bd1bd79e09c0dd2de1
+++ packages/python/python-pygobject/generate-constants.patch 1726f18a8e65fb7fe7a860bd1bd79e09c0dd2de1
@@ -0,0 +1,18 @@
+Index: pygobject-2.14.2/gobject/Makefile.am
+===================================================================
+--- pygobject-2.14.2.orig/gobject/Makefile.am
++++ pygobject-2.14.2/gobject/Makefile.am
+@@ -21,11 +21,11 @@ if PLATFORM_WIN32
+ common_ldflags += -no-undefined
+ endif
+
+-constants.py: generate-constants$(EXEEXT) constants.py.in
++constants.py: constants.py.in
+ rm -f constants.py
+ cp $(srcdir)/constants.py.in constants.py
+ chmod 644 constants.py
+- $(top_builddir)/gobject/generate-constants$(EXEEXT) >> constants.py
++ gobject-generate-constants$(EXEEXT) >> constants.py
+ chmod 444 constants.py
+
+ generate_constants_CFLAGS = $(GLIB_CFLAGS)
============================================================
--- packages/python/python-pygobject/python-path.patch 456c80476d80369857a7d37278a32421de5f4674
+++ packages/python/python-pygobject/python-path.patch 3d76576cef503c3fdc33b910140a9b6cbbb6be0a
@@ -1,23 +1,46 @@
-Index: pygobject-2.12.3/m4/python.m4
+Index: pygobject-2.14.2/m4/python.m4
===================================================================
---- pygobject-2.12.3.orig/m4/python.m4 2007-03-02 15:00:20.945635455 +0100
-+++ pygobject-2.12.3/m4/python.m4 2007-03-02 15:00:43.532189734 +0100
-@@ -43,12 +43,18 @@
+--- pygobject-2.14.2.orig/m4/python.m4
++++ pygobject-2.14.2/m4/python.m4
+@@ -43,6 +43,11 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
[AC_REQUIRE([AM_PATH_PYTHON])
AC_MSG_CHECKING(for headers required to compile python extensions)
dnl deduce PYTHON_INCLUDES
+AC_ARG_WITH(python-includes,
-+ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval)
++ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval)
+if test x$py_exec_prefix != x; then
+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+else
py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
- if test "$py_prefix" != "$py_exec_prefix"; then
+ if test -x "$PYTHON-config"; then
+@@ -53,6 +58,7 @@ if test "$py_prefix" != "$py_exec_prefix
PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
fi
+ fi
+fi
AC_SUBST(PYTHON_INCLUDES)
dnl check if the headers exist:
save_CPPFLAGS="$CPPFLAGS"
+Index: pygobject-2.14.2/configure.ac
+===================================================================
+--- pygobject-2.14.2.orig/configure.ac
++++ pygobject-2.14.2/configure.ac
+@@ -71,9 +71,6 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(c
+
+ AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h])
+ py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+-old_CPPFLAGS=$CPPFLAGS
+-CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES"
+ AC_TRY_COMPILE([#include <Python.h>],
+ [PySignal_SetWakeupFd(0);],
+ setwakeupfd_ok=yes,
+@@ -83,7 +80,6 @@ if test "x$setwakeupfd_ok" != xno; then
+ AC_DEFINE(HAVE_PYSIGNAL_SETWAKEUPFD, 1,
+ [Define to 1 if PySignal_SetWakeupFd is available])
+ fi
+-CPPFLAGS=$old_CPPFLAGS
+
+ PLATFORM=`$PYTHON -c "from distutils import util; print util.get_platform()"`
+ AC_SUBST(PLATFORM)
============================================================
--- packages/python/python-pygobject-native_2.12.3.bb a71881af165074dfb63c5cc7e67732e824b04644
+++ packages/python/python-pygobject-native_2.14.2.bb 2c5a99049d9b09d3da49735baee00883f198ddd5
@@ -2,7 +2,9 @@ DEPENDS = "python-native glib-2.0-native
DEPENDS = "python-native glib-2.0-native"
-MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 "
+inherit native
+do_stage_append() {
+ install -d ${STAGING_BINDIR}
+ install -m 0755 gobject/generate-constants ${STAGING_BINDIR}/gobject-generate-constants
+}
-inherit native
============================================================
--- packages/python/python-pygobject_2.12.3.bb e837d955710df4cd8216f94c3eedfba7d8a1a0c5
+++ packages/python/python-pygobject_2.14.2.bb 7ac8453a5f164b5387345d2d84d82158b4a62738
@@ -2,16 +2,22 @@ DEPENDS = "python-pygobject-native"
SECTION = "devel/python"
LICENSE = "LGPL"
DEPENDS = "python-pygobject-native"
-PR = "r3"
+PR = "r0"
MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
- file://python-path.patch;patch=1"
+
+SRC_URI = "\
+ ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
+ file://python-path.patch;patch=1 \
+ file://generate-constants.patch;patch=1 \
+"
S = "${WORKDIR}/pygobject-${PV}"
+FILESPATH = "${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files"
+
inherit autotools distutils-base pkgconfig
-EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+EXTRA_OECONF += '--with-python-includes="${STAGING_INCDIR}/.."'
do_stage() {
autotools_stage_all
More information about the Openembedded-commits
mailing list