diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-03-19 09:50:50 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-03-19 09:50:50 +0100 |
| commit | ab315125ae6c170fd57c2cc570f306f804cc01ac (patch) | |
| tree | 4d5c5e40d8898470ce0ec56f0aaea6bb9e118f0b | |
| parent | a405dc704f0987180615611236408470173e2fa3 (diff) | |
| download | ptxdist-ab315125ae6c170fd57c2cc570f306f804cc01ac.tar.gz ptxdist-ab315125ae6c170fd57c2cc570f306f804cc01ac.tar.xz | |
libdmtx: add patch for automake 1.14
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
4 files changed, 35 insertions, 6 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 d12660843..5eed2635d 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 @@ -9,8 +9,8 @@ not work if we cross compile or build distributions, with DESTDIR != /. Forwarded: no Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - wrapper/python/Makefile | 2 +- - wrapper/python/setup.py | 4 ++-- + wrapper/python/Makefile | 2 +- + wrapper/python/setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wrapper/python/Makefile b/wrapper/python/Makefile 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 index fa8fcb09d..a309db1f5 100644 --- 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 @@ -4,9 +4,9 @@ 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 +++++++++++++ + 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/patches/libdmtx-0.7.2/0003-configure.ac-fix-for-automake-1.14.patch b/patches/libdmtx-0.7.2/0003-configure.ac-fix-for-automake-1.14.patch new file mode 100644 index 000000000..f7ed6d8f9 --- /dev/null +++ b/patches/libdmtx-0.7.2/0003-configure.ac-fix-for-automake-1.14.patch @@ -0,0 +1,28 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Wed, 19 Mar 2014 09:47:07 +0100 +Subject: [PATCH] configure.ac: fix for automake 1.14 + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c9667cc..a50243c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + AC_INIT([libdmtx], [0.7.2], [mike@dragonflylogic.com]) +-AM_INIT_AUTOMAKE([-Wall -Werror gnu]) ++AM_INIT_AUTOMAKE([-Wall -Werror gnu subdir-objects]) + + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_HEADERS([config.h]) +@@ -15,6 +15,7 @@ AC_CONFIG_FILES([ + wrapper/python/Makefile + ]) + ++AM_PROG_AR + AC_PROG_CC + AC_PROG_LIBTOOL + AM_PROG_CC_C_O diff --git a/patches/libdmtx-0.7.2/series b/patches/libdmtx-0.7.2/series index 05d367e1c..e49af769a 100644 --- a/patches/libdmtx-0.7.2/series +++ b/patches/libdmtx-0.7.2/series @@ -2,4 +2,5 @@ #tag:base --start-number 1 0001-fix-search-paths-when-building-python-bindings.patch 0002-use-python-from-AM_PATH_PYTHON.patch -# 3d0f1c7c09fc0b04d768257fc83e675d - git-ptx-patches magic +0003-configure.ac-fix-for-automake-1.14.patch +# 099694234b469df449d4b39d0f8dd200 - git-ptx-patches magic |