[oe-commits] org.oe.dev merge of '3c6cac2f7866c98f3be3988d689e3137cf037175'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:28:12 UTC 2007
merge of '3c6cac2f7866c98f3be3988d689e3137cf037175'
and '767f227d69ff905c612a340e4fa0bcc993f00158'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: d583b83b9659b4a2ce57f16c9a02e0d6ddcb01c8
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d583b83b9659b4a2ce57f16c9a02e0d6ddcb01c8
Files:
1
packages/altboot/files/fic-gta01/altboot-menu/Advanced/30-bootUSB-Stick
packages/puppy/files
packages/python/python-gst
packages/python/python-pygobject
packages/altboot/altboot_1.1.1+wip-20061123.bb
packages/linux/linux-handhelds-2.6_2.6.20-hh3.bb
packages/openmoko-apps/openmoko-rssreader_svn.bb
packages/puppy/files/usb-header.patch
packages/python/python-gst/python-path.patch
packages/python/python-gst_0.10.7.bb
packages/python/python-pygobject/python-path.patch
packages/python/python-pygobject-native_2.12.3.bb
packages/python/python-pygobject_2.12.3.bb
conf/distro/angstrom-2007.1.conf
conf/distro/include/openmoko.inc
packages/altboot/altboot_1.0.5.bb
packages/altboot/altboot_1.0.8.bb
packages/altboot/altboot_wip.bb
packages/librsvg/librsvg_2.16.0.bb
packages/linux/ixp4xx-kernel/2.6.20/defconfig
packages/linux/ixp4xx-kernel_2.6.20.bb
packages/linux/linux-handhelds-2.6_cvs.bb
packages/linux/linux-omap1-2.6.18-omap1/defconfig
packages/linux/linux-rp-2.6.20/defconfig-akita
packages/linux/linux-rp-2.6.20/defconfig-c7x0
packages/linux/linux-rp-2.6.20/defconfig-collie
packages/linux/linux-rp-2.6.20/defconfig-hx2000
packages/linux/linux-rp-2.6.20/defconfig-ipaq-pxa270
packages/linux/linux-rp-2.6.20/defconfig-poodle
packages/linux/linux-rp-2.6.20/defconfig-qemuarm
packages/linux/linux-rp-2.6.20/defconfig-qemux86
packages/linux/linux-rp-2.6.20/defconfig-spitz
packages/linux/linux-rp-2.6.20/defconfig-tosa
packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
packages/meta/slugos-packages.bb
packages/openmoko-apps/openmoko-messages_svn.bb
packages/openmoko-base/files/session
packages/openmoko-base/openmoko-session_svn.bb
packages/puppy/puppy_1.11.bb
packages/python/python-2.4.4-manifest.inc
packages/python/python-pygtk2/acinclude.m4
packages/python/python-pygtk2_2.10.3.bb
packages/python/python-pygtk2_2.6.3.bb
packages/python/python-pygtk2_2.8.6.bb
packages/yeaphone/yeaphone_0.1.bb
site/arm-linux
site/arm-linux-uclibc
site/armeb-linux
site/armeb-linux-uclibc
site/common
site/powerpc-linux
site/powerpc-linux-uclibc
site/sh-common
site/sparc-linux
site/x86_64-linux
site/x86_64-linux-uclibc
Diffs:
#
# mt diff -r3c6cac2f7866c98f3be3988d689e3137cf037175 -rd583b83b9659b4a2ce57f16c9a02e0d6ddcb01c8
#
#
# no changes
#
#
# mt diff -r767f227d69ff905c612a340e4fa0bcc993f00158 -rd583b83b9659b4a2ce57f16c9a02e0d6ddcb01c8
#
#
#
# delete "packages/altboot/files/fic-gta01/altboot-menu/Advanced/30-bootUSB-Stick"
#
# add_dir "packages/puppy/files"
#
# add_dir "packages/python/python-gst"
#
# add_dir "packages/python/python-pygobject"
#
# add_file "packages/altboot/altboot_1.1.1+wip-20061123.bb"
# content [c36337ca0ab35a92514eee08dca6d035bae424c4]
#
# add_file "packages/linux/linux-handhelds-2.6_2.6.20-hh3.bb"
# content [252b9c26ddd2fda4271f4352999ce0facbfece99]
#
# add_file "packages/openmoko-apps/openmoko-rssreader_svn.bb"
# content [736dfe6d0a5b884fde1f56de6ecd17d4eea793d2]
#
# add_file "packages/puppy/files/usb-header.patch"
# content [1b411842b3a18cb8e9bc36a6a219ff652ccbd707]
#
# add_file "packages/python/python-gst/python-path.patch"
# content [1afa10d102a359899e1de8322aa0ddd1ad3dd12d]
#
# add_file "packages/python/python-gst_0.10.7.bb"
# content [76b263d53f52575128191f4cecf75716c3132314]
#
# add_file "packages/python/python-pygobject/python-path.patch"
# content [456c80476d80369857a7d37278a32421de5f4674]
#
# add_file "packages/python/python-pygobject-native_2.12.3.bb"
# content [b12c35aa95676b05bbac981e68101d677cf0edcf]
#
# add_file "packages/python/python-pygobject_2.12.3.bb"
# content [69b36019c8f35804ff9296dea57d7589ecb481ae]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [40ec0f16389a409c3592f71f501c78eba4f62dfa]
# to [994228233caf6444ec1c5c7c87e73a881c2dd863]
#
# patch "conf/distro/include/openmoko.inc"
# from [a6419f5b8f64ec6c30c700fb6f6ffa40f2142322]
# to [9d18e3f593f66db023a3c71daa1d1625b17f23fb]
#
# patch "packages/altboot/altboot_1.0.5.bb"
# from [2ae8be80dbf7c4a4f10bf5d02a4e2eb6701ac185]
# to [0656d14e89b9287392a8d7c9c4e32c3e882aa93a]
#
# patch "packages/altboot/altboot_1.0.8.bb"
# from [5776412bae9404ba15c515da079d09f87d3e088c]
# to [6ed20be054c01a88c7058fc01a7884ebbb675c3c]
#
# patch "packages/altboot/altboot_wip.bb"
# from [90cdbba65133edbaf3d83c6fb908e4e8c8aa7bb6]
# to [7bb09e09bed02e42bf8d6d47dca9761caba2adfa]
#
# patch "packages/librsvg/librsvg_2.16.0.bb"
# from [f2e709f06952a68bbc509c87682dba94013ab8cf]
# to [f1bddbad421eb5f73d82f7d640bd92108a227a8e]
#
# patch "packages/linux/ixp4xx-kernel/2.6.20/defconfig"
# from [c206e8275cd8247424908fa95025901b3cc4bcc9]
# to [d9deebc942c5950daead1cba30fbf9686ad1d9d3]
#
# patch "packages/linux/ixp4xx-kernel_2.6.20.bb"
# from [0e1136ef89ea48af71def7308ceb4f0863294eb4]
# to [2bc89115188c6157b0e466f45de6f17a7c03d2b2]
#
# patch "packages/linux/linux-handhelds-2.6_cvs.bb"
# from [244fa0f7a781c0cb2f0d70ba345422b8b16c65e9]
# to [6a13093680d73d28c3bb997e4b5b36ca8fcc0ec7]
#
# patch "packages/linux/linux-omap1-2.6.18-omap1/defconfig"
# from [68fd2941c7d47259256a8f6048dcfa373bac796b]
# to [6e18f2c2c03bd4ec080e9b2929b36b7d265a686c]
#
# patch "packages/linux/linux-rp-2.6.20/defconfig-akita"
# from [2d3dc2229807da1743d6f6b32c0515165f91b402]
# to [ae46b5f2a281bedf3a7635d2989548e3bce1d731]
#
# patch "packages/linux/linux-rp-2.6.20/defconfig-c7x0"
# from [ce3d3b238c2de251a2d4b5105eff6c67ed4ca237]
# to [43aba01333e10bae54a9980b9743805a5101dcaf]
#
# patch "packages/linux/linux-rp-2.6.20/defconfig-collie"
# from [695962ed33e6f8793fa4f1e871f8c26c6e2fb3dd]
# to [dc93f071a2a95c6187a1792b45b18faeb047490e]
#
# patch "packages/linux/linux-rp-2.6.20/defconfig-hx2000"
# from [1bfa46350efb8ff8253f860f473eed50a5d1b98c]
# to [d15cdd0dabdd5f40ce13a6a1a3b419d6025bcc1d]
#
# patch "packages/linux/linux-rp-2.6.20/defconfig-ipaq-pxa270"
# from [808b136675ea5525a60b9c1a5ca77b5aece8e792]
# to [c0069f7ecf8572a1cf9d0c01977fc6040af0237a]
#
# patch "packages/linux/linux-rp-2.6.20/defconfig-poodle"
# from [5d6186a17b2c15c9070351226f211611de9ed3bd]
# to [0bbb961acdd82875f18796111996ec22c773d16a]
#
# patch "packages/linux/linux-rp-2.6.20/defconfig-qemuarm"
# from [6b1bcde8c59d611c10508b0a9a91276ff7ff25b3]
# to [46f8da094f6a79630a36e26817d187d690332936]
#
# patch "packages/linux/linux-rp-2.6.20/defconfig-qemux86"
# from [e02ed1f8e86ad48145d9b3f41819f9f8f10d7f38]
# to [94c41871517c2b51614ce075857fc62dad9c40d0]
#
# patch "packages/linux/linux-rp-2.6.20/defconfig-spitz"
# from [ca242dbc657859a509d98d7bde9eb538312bcd7e]
# to [eeb2ea15534a6c3c4d441095dd15ad2ec2df559a]
#
# patch "packages/linux/linux-rp-2.6.20/defconfig-tosa"
# from [0aa1318a218e839777423d9d5ed68c4f981da094]
# to [47d21abd55054f1cd5eea884f7462b2a8c8f693d]
#
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.18.bb"
# from [aa21fd6708a6750cb850e5a0f3c2e92796384468]
# to [30f0fb68a585d378c56c1ea86bb12655e639feba]
#
# patch "packages/meta/slugos-packages.bb"
# from [8be9a5527336a622644c46eedc527a7d0e209971]
# to [3208ff840b765fa595e18b0871213e5383c7013b]
#
# patch "packages/openmoko-apps/openmoko-messages_svn.bb"
# from [aed7dc523849ff416897598584ebec6f172d98dd]
# to [412418073e48e5858d875804f454c83c5fb38b98]
#
# patch "packages/openmoko-base/files/session"
# from [cc5681530b76831db1e699be65f61dd90fd5a360]
# to [64279020945c686bee8b822767ab8f2fa2a077ff]
#
# patch "packages/openmoko-base/openmoko-session_svn.bb"
# from [ab090ee4338fa1a740abaef260d59a0365453506]
# to [d495903bb4086806bbd311e136eec7e36de43090]
#
# patch "packages/puppy/puppy_1.11.bb"
# from [dab0819e8dae88cff7bb45c87b39efe63bb6fc7b]
# to [319f2e2f762716010d45967ba000e58a2c3e3066]
#
# patch "packages/python/python-2.4.4-manifest.inc"
# from [30334b8d9efa0018f222f591ee94c7e87acd7b0e]
# to [c54ba74a5b81534fb7e314d4133157b7ef8a7add]
#
# patch "packages/python/python-pygtk2/acinclude.m4"
# from [661a5030384fa69c238d6afa16e62ca085e973ea]
# to [a88d00bee840b475039af1207dad53ea6337f513]
#
# patch "packages/python/python-pygtk2_2.10.3.bb"
# from [deb37f376d219c8eadc8f93bad3033f18498a080]
# to [e9359304521f2017fa738bc1d6f870fb4ebe7ee0]
#
# patch "packages/python/python-pygtk2_2.6.3.bb"
# from [88dcbc0fe9d552f335cea90fbffbda03c63fdbf9]
# to [1be92e01552c02565be9ae9cf68447f137a323db]
#
# patch "packages/python/python-pygtk2_2.8.6.bb"
# from [452343d5c6bfd36b28c93d94774324ac7f8cbc9f]
# to [7400b30d2711bd9e8aab24ac7d3d77d3725f8438]
#
# patch "packages/yeaphone/yeaphone_0.1.bb"
# from [7e547b45c6a22059a56b49ed72c00a0d7556b804]
# to [5906a68ebb12886b1dbc674ad9398248f9ec8351]
#
# patch "site/arm-linux"
# from [46d2ad65b8c182f4bee222e81cd35c853c0e4145]
# to [d9a9fd42f5dcf99fb67e3e26e264e1a79084c3a8]
#
# patch "site/arm-linux-uclibc"
# from [68aec4a4e37020b1a2989b60e59db91c99c1e390]
# to [94f267f4c0c4331759de49a8fee575984350b930]
#
# patch "site/armeb-linux"
# from [e09639a90dfee500b5dffa9c36d71d0a45246d45]
# to [d6e3d4958bd1e6d8d4bcdcf5d16e746faf7522b6]
#
# patch "site/armeb-linux-uclibc"
# from [a2671f1bfb9de3c39495e9ded8079649b8c49374]
# to [c905d3e2f5339eddc7d88ed252c8ec893f957789]
#
# patch "site/common"
# from [da39a3ee5e6b4b0d3255bfef95601890afd80709]
# to [6eae0417ff3edc787217f2ff632bbb0ab574d681]
#
# patch "site/powerpc-linux"
# from [d725e08698309f7ef038e4907a4c9a4bf8f2cb0f]
# to [97614636c05a9d80d3dc1801feaffc0fba7c61a0]
#
# patch "site/powerpc-linux-uclibc"
# from [6d6563f76c12248dc6e7110f5ee939076366b502]
# to [49ab4ef3d79b32a9b799ffed7fb8d36f4c49c358]
#
# patch "site/sh-common"
# from [81161b43f79a19db3f934a51336fa7c2f18a1d77]
# to [1de5b7566c1c791a94153848613b8835d8b55b63]
#
# patch "site/sparc-linux"
# from [c099d68c223bc48cb5581f7824227ac7c5808524]
# to [d84ca41395f924a03d8d8a0c9d5894abe1b4064a]
#
# patch "site/x86_64-linux"
# from [e2ff2f890656fa8c40048228061bb4db2cadf4c9]
# to [ec6c56d14c47218791c06a2ab7c5d4423c8cb5c8]
#
# patch "site/x86_64-linux-uclibc"
# from [360e5a740ecd0aa1275640e584220a1808f1fea8]
# to [c884acc8a9ec2e10ec7df673cb381a6e1830f0b1]
#
============================================================
--- packages/altboot/altboot_1.1.1+wip-20061123.bb c36337ca0ab35a92514eee08dca6d035bae424c4
+++ packages/altboot/altboot_1.1.1+wip-20061123.bb c36337ca0ab35a92514eee08dca6d035bae424c4
@@ -0,0 +1,99 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: altboot_1.0.5-rc2.bb
+# Date: 21-Feb-06
+
+DESCRIPTION = "The altboot bootmanager"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe at hentges.net>"
+HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
+LICENSE = "GPL"
+
+######################################################################################
+
+RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools"
+RRECOMMENDS_${PN}_append_akita = " kexec-tools"
+RRECOMMENDS_${PN}_append_spitz = " kexec-tools"
+RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools"
+
+RDEPENDS_${PN} = "${PN}-conf"
+RDEPENDS_${PN}-conf = "${PN}"
+
+######################################################################################
+
+WIP_DATE = "20061123"
+
+PV = "1.1.1+wip-${WIP_DATE}"
+PR = "r0"
+
+######################################################################################
+
+PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
+
+PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_${PN}-doc = "all"
+PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}"
+
+SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2"
+
+S = "${WORKDIR}/${TAG}/"
+
+######################################################################################
+
+FILES_${PN}-conf = "/etc/altboot*cfg"
+
+######################################################################################
+
+do_install() {
+ install -d ${D}/sbin
+ install -d ${D}/etc/altboot-menu
+ install -d ${D}/etc/altboot-menu/Advanced
+ install -d ${D}/etc/altboot.rc
+ install -d ${D}/usr/share/doc/altboot
+ install -d ${D}/usr/share/sounds
+ install -d ${D}/etc/skel/altboot
+
+ if test -d ${S}/${MACHINE}
+ then
+ install -m 0644 ${S}/${MACHINE}/altboot*.cfg ${D}/etc/
+ else
+ install -m 0644 ${S}/altboot*.cfg ${D}/etc/
+ fi
+
+ install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds
+ install -m 0644 ${S}/altboot.func ${D}/etc
+ install -m 0644 ${S}/altbootctl.conf ${D}/etc
+ install -m 0755 ${S}/init.altboot ${D}/sbin
+ install -m 0755 ${S}/altbootctl ${D}/sbin
+
+ install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
+
+ install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+
+ install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
+ install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
+}
+
+######################################################################################
+
+do_configure() {
+ cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_
+ mv ${S}/init.altboot_ ${S}/init.altboot
+}
+
+######################################################################################
+
+pkg_postinst_${PN}() {
+ update-alternatives --install /sbin/init init /sbin/init.altboot 55
+}
+
+######################################################################################
+
+pkg_postrm_${PN}() {
+ update-alternatives --remove init /sbin/init.altboot
+}
+
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.20-hh3.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.20-hh3.bb 252b9c26ddd2fda4271f4352999ce0facbfece99
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+ file://defconfig"
+
+require linux-handhelds-2.6.inc
============================================================
--- packages/openmoko-apps/openmoko-rssreader_svn.bb 736dfe6d0a5b884fde1f56de6ecd17d4eea793d2
+++ packages/openmoko-apps/openmoko-rssreader_svn.bb 736dfe6d0a5b884fde1f56de6ecd17d4eea793d2
@@ -0,0 +1,9 @@
+DESCRIPTION = "The OpenMoko RSS Reader"
+SECTION = "openmoko/applications"
+DEPENDS += "libmrss"
+
+PV = "0.0.1+svn${SRCDATE}"
+PR = "r1"
+
+inherit openmoko
+
============================================================
--- packages/puppy/files/usb-header.patch 1b411842b3a18cb8e9bc36a6a219ff652ccbd707
+++ packages/puppy/files/usb-header.patch 1b411842b3a18cb8e9bc36a6a219ff652ccbd707
@@ -0,0 +1,20 @@
+--- puppy/usb_io.h.~1.14.~ 2007-02-01 16:39:20.000000000 +1030
++++ puppy/usb_io.h 2007-03-23 11:47:21.000000000 +1030
+@@ -30,12 +30,13 @@
+ #include <linux/types.h>
+ #include <linux/version.h>
+
+-#include <linux/usb.h>
+-#include <linux/usbdevice_fs.h>
+-
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++/* linux/usb_ch9.h wasn't separated out until 2.4.23 */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23)
+ #include "usb_ch9.h"
++#else
++#include "usb.h"
+ #endif
++#include <linux/usbdevice_fs.h>
+
+ #include "mjd.h"
+ #include "tf_bytes.h"
============================================================
--- packages/python/python-gst/python-path.patch 1afa10d102a359899e1de8322aa0ddd1ad3dd12d
+++ packages/python/python-gst/python-path.patch 1afa10d102a359899e1de8322aa0ddd1ad3dd12d
@@ -0,0 +1,24 @@
+Index: gst-python-0.10.7/acinclude.m4
+===================================================================
+--- gst-python-0.10.7.orig/acinclude.m4 2007-03-02 14:10:28.652128590 +0100
++++ gst-python-0.10.7/acinclude.m4 2007-03-02 14:41:00.106728708 +0100
+@@ -43,12 +43,19 @@
+ [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)
++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
+ PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+ fi
++fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+ save_CPPFLAGS="$CPPFLAGS"
============================================================
--- packages/python/python-gst_0.10.7.bb 76b263d53f52575128191f4cecf75716c3132314
+++ packages/python/python-gst_0.10.7.bb 76b263d53f52575128191f4cecf75716c3132314
@@ -0,0 +1,22 @@
+DESCRIPTION = "Python Gstreamer bindings"
+SECTION = "devel/python"
+LICENSE = "LGPL"
+DEPENDS = "gstreamer"
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
+ file://python-path.patch;patch=1"
+
+S = "${WORKDIR}/gst-python-${PV}"
+
+inherit autotools distutils-base pkgconfig
+
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
+do_configure_prepend() {
+ install -d ${S}/m4
+ install -m 0644 ${S}/common/m4/*.m4 ${S}/m4/
+}
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/python/python-pygobject/python-path.patch 456c80476d80369857a7d37278a32421de5f4674
+++ packages/python/python-pygobject/python-path.patch 456c80476d80369857a7d37278a32421de5f4674
@@ -0,0 +1,23 @@
+Index: pygobject-2.12.3/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 @@
+ [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)
++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
+ PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+ fi
++fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+ save_CP%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list