From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com ([192.55.52.88]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Rg38v-0006IP-Mz for openembedded-core@lists.openembedded.org; Thu, 29 Dec 2011 00:42:45 +0100 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 28 Dec 2011 15:35:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="101133483" Received: from unknown (HELO [10.255.13.80]) ([10.255.13.80]) by fmsmga001.fm.intel.com with ESMTP; 28 Dec 2011 15:35:29 -0800 Message-ID: <4EFBA7C1.6060405@linux.intel.com> Date: Wed, 28 Dec 2011 15:35:29 -0800 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0) Gecko/20110927 Thunderbird/7.0 MIME-Version: 1.0 To: Patches and discussions about the oe-core layer References: In-Reply-To: Subject: Re: [PATCH 3/6] python: add md5module support X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Dec 2011 23:42:46 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 12/28/2011 11:12 AM, Saul Wold wrote: > The internal md5 module is needed for using "waf" to install > other python packages such as pycairo. > I grabbed the wrong patch here, I need to add a patch here, v2 out soon! Sau! > Signed-off-by: Saul Wold > --- > .../recipes-devtools/python/python-native_2.7.2.bb | 6 ++++-- > .../python/python/add-md5module-support.patch | 13 +++++++++++++ > meta/recipes-devtools/python/python_2.7.2.bb | 3 ++- > 3 files changed, 19 insertions(+), 3 deletions(-) > create mode 100644 meta/recipes-devtools/python/python/add-md5module-support.patch > > diff --git a/meta/recipes-devtools/python/python-native_2.7.2.bb b/meta/recipes-devtools/python/python-native_2.7.2.bb > index d036eca..7d8c597 100644 > --- a/meta/recipes-devtools/python/python-native_2.7.2.bb > +++ b/meta/recipes-devtools/python/python-native_2.7.2.bb > @@ -1,6 +1,6 @@ > require python.inc > DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native" > -PR = "${INC_PR}.1" > +PR = "${INC_PR}.2" > > SRC_URI += "file://04-default-is-optimized.patch \ > file://05-enable-ctypes-cross-build.patch \ > @@ -11,7 +11,9 @@ SRC_URI += "file://04-default-is-optimized.patch \ > file://debug.patch \ > file://unixccompiler.patch \ > file://nohostlibs.patch \ > - file://multilib.patch " > + file://multilib.patch \ > + file://add-md5module-support.patch \ > + " > S = "${WORKDIR}/Python-${PV}" > > inherit native > diff --git a/meta/recipes-devtools/python/python/add-md5module-support.patch b/meta/recipes-devtools/python/python/add-md5module-support.patch > new file mode 100644 > index 0000000..f715f40 > --- /dev/null > +++ b/meta/recipes-devtools/python/python/add-md5module-support.patch > @@ -0,0 +1,13 @@ > +Index: Python-2.7.2/Modules/Setup.dist > +=================================================================== > +--- Python-2.7.2.orig/Modules/Setup.dist 2011-06-11 08:46:26.000000000 -0700 > ++++ Python-2.7.2/Modules/Setup.dist 2011-12-27 15:51:41.244623219 -0800 > +@@ -248,7 +248,7 @@ > + # Message-Digest Algorithm, described in RFC 1321. The necessary files > + # md5.c and md5.h are included here. > + > +-#_md5 md5module.c md5.c > ++_md5 md5module.c md5.c > + > + > + # The _sha module implements the SHA checksum algorithms. > diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb > index 5e8e0d7..654c850 100644 > --- a/meta/recipes-devtools/python/python_2.7.2.bb > +++ b/meta/recipes-devtools/python/python_2.7.2.bb > @@ -1,7 +1,7 @@ > require python.inc > DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" > DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" > -PR = "${INC_PR}.4" > +PR = "${INC_PR}.5" > > DISTRO_SRC_URI ?= "file://sitecustomize.py" > DISTRO_SRC_URI_linuxstdbase = "" > @@ -19,6 +19,7 @@ SRC_URI += "\ > file://cgi_py.patch \ > file://remove_sqlite_rpath.patch \ > file://setup_py_skip_cross_import_check.patch \ > + file://add-md5module-support.patch \ > " > > S = "${WORKDIR}/Python-${PV}"