From 5cf486256cd4e1e7c54ed6c1ca3caf377d60b8c6 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 22 May 2006 13:33:57 +0000
Subject: python-pysqlite1: don't let it use host includes

---
 packages/python/python-pysqlite/.mtn2git_empty     |  0
 .../python/python-pysqlite/no-host-includes.patch  | 40 ++++++++++++++++++++++
 packages/python/python-pysqlite2_2.2.2.bb          |  2 --
 packages/python/python-pysqlite_1.0.bb             |  4 ++-
 4 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 packages/python/python-pysqlite/.mtn2git_empty
 create mode 100644 packages/python/python-pysqlite/no-host-includes.patch

(limited to 'packages/python')

diff --git a/packages/python/python-pysqlite/.mtn2git_empty b/packages/python/python-pysqlite/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/python/python-pysqlite/no-host-includes.patch b/packages/python/python-pysqlite/no-host-includes.patch
new file mode 100644
index 0000000000..20f5c98402
--- /dev/null
+++ b/packages/python/python-pysqlite/no-host-includes.patch
@@ -0,0 +1,40 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- pysqlite/setup.py~no-host-includes
++++ pysqlite/setup.py
+@@ -11,8 +11,8 @@
+ macros = []
+ 
+ if sys.platform in ("linux-i386", "linux2"): # most Linux
+-    include_dirs = ['/usr/include/sqlite']
+-    library_dirs = ['/usr/lib/']
++    include_dirs = []
++    library_dirs = []
+     libraries = [sqlite]
+     runtime_library_dirs = []
+     extra_objects = []
+@@ -21,8 +21,8 @@
+         LOCALBASE = os.environ.get("LOCALBASE", "/opt/local")
+     else:
+         LOCALBASE = os.environ.get("LOCALBASE", "/usr/local")
+-    include_dirs = ['%s/include' % LOCALBASE]
+-    library_dirs = ['%s/lib/' % LOCALBASE]
++    include_dirs = []
++    library_dirs = []
+     libraries = [sqlite]
+     runtime_library_dirs = []
+     extra_objects = []
+@@ -33,8 +33,8 @@
+     runtime_library_dirs = []
+     extra_objects = []
+ elif os.name == "posix": # most Unixish platforms
+-    include_dirs = ['/usr/local/include']
+-    library_dirs = ['/usr/local/lib']
++    include_dirs = []
++    library_dirs = []
+     libraries = [sqlite]
+     # On some platorms, this can be used to find the shared libraries
+     # at runtime, if they are in a non-standard location. Doesn't
diff --git a/packages/python/python-pysqlite2_2.2.2.bb b/packages/python/python-pysqlite2_2.2.2.bb
index 8f41342eec..72ffc39104 100644
--- a/packages/python/python-pysqlite2_2.2.2.bb
+++ b/packages/python/python-pysqlite2_2.2.2.bb
@@ -11,6 +11,4 @@ PR = "ml0"
 SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.2/${PV}/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-EXTRA_OEMAKE = "-e"
-
 inherit distutils
diff --git a/packages/python/python-pysqlite_1.0.bb b/packages/python/python-pysqlite_1.0.bb
index dcabdb18a1..46ad0239ce 100644
--- a/packages/python/python-pysqlite_1.0.bb
+++ b/packages/python/python-pysqlite_1.0.bb
@@ -6,8 +6,10 @@ LICENSE = "PSF"
 RDEPENDS = "python-core python-re python-lang"
 DEPENDS = "sqlite"
 SRCNAME = "pysqlite"
+PR = "ml0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
+           file://no-host-includes.patch;patch=1"
 S = "${WORKDIR}/${SRCNAME}"
 
 inherit distutils
-- 
cgit v1.2.3