libdmtx: explicitly use CROSS_PYTHON

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 69 insertions, 4 deletions

diff --git a/patches/libdmtx-0.7.2/0001-fix-search-paths-when-building-python-bindings.patch b/patches/libdmtx-0.7.2/0001-fix-search-paths-when-building-python-bindings.patch
index 01955ee2e..d12660843 100644
--- a/patches/libdmtx-0.7.2/0001-fix-search-paths-when-building-python-bindings.patch
+++ b/patches/libdmtx-0.7.2/0001-fix-search-paths-when-building-python-bindings.patch
@@ -41,6 +41,3 @@ index 2cb10d4..7d9404b 100755
                   libraries = ['dmtx'],
                   sources = ['pydmtxmodule.c'] )
  
--- 
-1.7.5.1
-
diff --git a/patches/libdmtx-0.7.2/0002-use-python-from-AM_PATH_PYTHON.patch b/patches/libdmtx-0.7.2/0002-use-python-from-AM_PATH_PYTHON.patch
new file mode 100644
index 000000000..fa8fcb09d
--- /dev/null
+++ b/patches/libdmtx-0.7.2/0002-use-python-from-AM_PATH_PYTHON.patch
@@ -0,0 +1,61 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 27 Nov 2012 11:37:29 +0100
+Subject: [PATCH] use python from AM_PATH_PYTHON
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.ac               |    1 +
+ wrapper/python/Makefile    |   11 -----------
+ wrapper/python/Makefile.in |   13 +++++++++++++
+ 3 files changed, 14 insertions(+), 11 deletions(-)
+ delete mode 100755 wrapper/python/Makefile
+ create mode 100755 wrapper/python/Makefile.in
+
+diff --git a/configure.ac b/configure.ac
+index f457730..c9667cc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,6 +12,7 @@ AC_CONFIG_FILES([
+    test/simple_test/Makefile
+    test/unit_test/Makefile
+    wrapper/Makefile
++   wrapper/python/Makefile
+ ])
+ 
+ AC_PROG_CC
+diff --git a/wrapper/python/Makefile b/wrapper/python/Makefile
+deleted file mode 100755
+index 4f4d9d2..0000000
+--- a/wrapper/python/Makefile
++++ /dev/null
+@@ -1,11 +0,0 @@
+-all:
+-	python setup.py build
+-
+-install:
+-	python setup.py install --prefix=$$DESTDIR/usr
+-
+-clean:
+-	rm -Rf build
+-	rm -f *.pyc hello.png
+-
+-.PHONY: all install clean
+diff --git a/wrapper/python/Makefile.in b/wrapper/python/Makefile.in
+new file mode 100755
+index 0000000..64d46ba
+--- /dev/null
++++ b/wrapper/python/Makefile.in
+@@ -0,0 +1,13 @@
++PYTHON = @PYTHON@
++
++all:
++	$(PYTHON) setup.py build
++
++install:
++	$(PYTHON) setup.py install --prefix=$$DESTDIR/usr
++
++clean:
++	rm -Rf build
++	rm -f *.pyc hello.png
++
++.PHONY: all install clean
diff --git a/patches/libdmtx-0.7.2/autogen.sh b/patches/libdmtx-0.7.2/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/libdmtx-0.7.2/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/libdmtx-0.7.2/series b/patches/libdmtx-0.7.2/series
index 1fa5d4132..05d367e1c 100644
--- a/patches/libdmtx-0.7.2/series
+++ b/patches/libdmtx-0.7.2/series
@@ -1,3 +1,5 @@
 # generated by git-ptx-patches
+#tag:base --start-number 1
 0001-fix-search-paths-when-building-python-bindings.patch
-# 42544cab371a9d84158e91aec4838242  - git-ptx-patches magic
+0002-use-python-from-AM_PATH_PYTHON.patch
+# 3d0f1c7c09fc0b04d768257fc83e675d  - git-ptx-patches magic
diff --git a/rules/libdmtx.make b/rules/libdmtx.make
index 44131f0ce..91e7880a1 100644
--- a/rules/libdmtx.make
+++ b/rules/libdmtx.make
@@ -29,6 +29,10 @@ LIBDMTX_LICENSE	:= unknown
 # Prepare
 # ----------------------------------------------------------------------------
 
+LIBDMTX_CONF_ENV = \
+	$(CROSS_ENV) \
+	PYTHON=$(CROSS_PYTHON)
+
 #
 # autoconf
 #