mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] lowpan-tools: always force Python
@ 2014-01-06  9:00 Jürgen Beisert
  2014-01-07  9:43 ` [ptxdist] [PATCHv2] lowpan-tools: Ensure correct '-Werror' and Python handling Jürgen Beisert
  0 siblings, 1 reply; 4+ messages in thread
From: Jürgen Beisert @ 2014-01-06  9:00 UTC (permalink / raw)
  To: ptxdist

Until we add a new parameter to the configure script to disable this dependency
on demand (when the test tools are not required), Python is always required.

Acked-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>

diff --git a/rules/lowpan-tools.in b/rules/lowpan-tools.in
index e23c626..0dd5dcc 100644
--- a/rules/lowpan-tools.in
+++ b/rules/lowpan-tools.in
@@ -4,7 +4,7 @@ menuconfig LOWPAN_TOOLS
 	tristate
 	prompt "lowpan-tools                  "
 	select LIBNL3
-	select PYTHON if LOWPAN_TOOLS_TESTS
+	select PYTHON
 	help
 	  This is a set of utils to manage the Linux LoWPAN stack.
 	  The LoWPAN stack aims for IEEE 802.15.4-2003 (and for

-- 
Pengutronix e.K.                              | Juergen Beisert             |
Linux Solutions for Science and Industry      | http://www.pengutronix.de/  |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [ptxdist] [PATCHv2] lowpan-tools: Ensure correct '-Werror' and Python handling
  2014-01-06  9:00 [ptxdist] [PATCH] lowpan-tools: always force Python Jürgen Beisert
@ 2014-01-07  9:43 ` Jürgen Beisert
  2014-01-07 10:08   ` [ptxdist] [PATCHv3] " Jürgen Beisert
  0 siblings, 1 reply; 4+ messages in thread
From: Jürgen Beisert @ 2014-01-07  9:43 UTC (permalink / raw)
  To: ptxdist

A dependency (build and run time) to Python only exists if the serial test
program gets installed. If all tests programs are disabled, we can omit
Python at all.
If the test tools should be built, the configure script finds the project
Phython (CROSS_PYTHON) without the help of the cached variable.
    
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>

diff --git a/patches/lowpan-tools-0.3/0008-Be-more-precise-what-happens-with-the-werror-switch.patch b/patches/lowpan-tools-0.3/0008-Be-more-precise-what-happens-with-the-werror-switch.patch
new file mode 100644
index 0000000..765f596
--- /dev/null
+++ b/patches/lowpan-tools-0.3/0008-Be-more-precise-what-happens-with-the-werror-switch.patch
@@ -0,0 +1,29 @@
+From: Juergen Beisert <jbe@pengutronix.de>
+Date: Tue, 7 Jan 2014 10:23:33 +0100
+Subject: [PATCH] Be more precise what happens with the 'werror' switch
+
+Using the -werror parameter is always a source of pain. Be sure it is not
+used when PTXdist runs
+
+Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
+---
+ configure.ac |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 89c2651..6aec4f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -123,9 +123,9 @@ AC_FUNC_FORK
+ AC_CHECK_FUNCS([malloc realloc memset socket getopt_long select strdup strtol])
+ 
+ # Handle this last so -Werror doesn't get in the way of compile tests
+-AC_ARG_ENABLE(werror, [AC_HELP_STRING([--disable-werror],
+-	      [do not compile with -Werror])])
+-if test "x$enable_werror" != "xno" ; then
++AC_ARG_ENABLE([werror],
++		[AC_HELP_STRING([--enable-werror], [compile with -Werror @<:@default=no@:>@])])
++if test "x$enable_werror" == "xyes" ; then
+ 	CFLAGS="-Werror $CFLAGS"
+ fi
+ 
diff --git a/patches/lowpan-tools-0.3/0009-Python-is-required-only-for-the-serial-tests.patch b/patches/lowpan-tools-0.3/0009-Python-is-required-only-for-the-serial-tests.patch
new file mode 100644
index 0000000..1d416b6
--- /dev/null
+++ b/patches/lowpan-tools-0.3/0009-Python-is-required-only-for-the-serial-tests.patch
@@ -0,0 +1,63 @@
+From: Juergen Beisert <jbe@pengutronix.de>
+Date: Tue, 7 Jan 2014 10:25:05 +0100
+Subject: [PATCH] Python is required only for the serial tests
+
+Only the serial tests require host and target python.
+
+Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
+---
+ configure.ac            |   20 +++++++++++++++-----
+ test-serial/Makefile.am |    2 ++
+ 2 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6aec4f7..99080d1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,11 @@ AC_CONFIG_HEADER([config.h])
+ # Test for new silent rules and enable only if they are available
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
++AC_ARG_ENABLE([tests],
++	[AC_HELP_STRING([--disable-tests], [do not install the tests @<:@default=yes@:>@])],
++	[],
++	[enable_tests=yes])
++
+ AC_ARG_WITH(zbtestdir, [AC_HELP_STRING([--with-zbtestdir],
+ 	    [directory where all test programs will be installed])],
+ 	    [zbtestdir=$withval],
+@@ -77,11 +82,16 @@ AC_PROG_LIBTOOL
+ AM_PROG_LEX
+ AC_PROG_YACC
+ AC_SUBST(LIBTOOL_DEPS)
+-# Currently the scripts works with python2.x only
+-# Check for this at first
+-AC_PATH_PROG(PYTHON, python2 python2.7 python2.6 python2.5 python)
+-AM_PATH_PYTHON(,, [:])
+-py_CHECK_MAJOR_VERSION([PYTHON_VERSION], [2])
++
++if test "x$enable_tests" == "xyes" ; then
++	# Currently the scripts works with python2.x only
++	# Check for this at first
++	AC_PATH_PROG(PYTHON, python2 python2.7 python2.6 python2.5 python)
++	AM_PATH_PYTHON(,, [:])
++	py_CHECK_MAJOR_VERSION([PYTHON_VERSION], [2])
++fi
++AM_CONDITIONAL([PYTHON_AVAILABLE], [test "x$enable_tests" == "xyes"])
++
+ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
+ 
+ # Checks for libraries.
+diff --git a/test-serial/Makefile.am b/test-serial/Makefile.am
+index 5553ded..733d472 100644
+--- a/test-serial/Makefile.am
++++ b/test-serial/Makefile.am
+@@ -1,6 +1,8 @@
++if PYTHON_AVAILABLE
+ include $(top_srcdir)/Makefile.common
+ 
+ python_PYTHON = test_DQ.py
+ tests = test_packets.py test_edscan.py test_recv.py test_trx.py
+ zbtest_SCRIPTS = $(tests)
+ EXTRA_DIST = $(tests)
++endif
diff --git a/patches/lowpan-tools-0.3/series b/patches/lowpan-tools-0.3/series
index 1652508..5a27c2d 100644
--- a/patches/lowpan-tools-0.3/series
+++ b/patches/lowpan-tools-0.3/series
@@ -1,3 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
 0001-izoordinator-Fixes-to-error-handling.patch
 0002-addrdb-fix-include-dependency-and-remove-redefined.patch
 0003-configure.ac-check-for-python2.x.patch
@@ -5,3 +7,6 @@
 0005-configure.ac-Check-that-the-python-version-is-indeed.patch
 0006-Allow-to-set-PAN-ID-short-address-and-channel-manual.patch
 0007-iz-mac-Handle-return-code-from-set-command.patch
+0008-Be-more-precise-what-happens-with-the-werror-switch.patch
+0009-Python-is-required-only-for-the-serial-tests.patch
+# 51d1b183c0f5cedfa556e1f007a70585  - git-ptx-patches magic
diff --git a/rules/lowpan-tools.make b/rules/lowpan-tools.make
index a4919bd..362fa45 100644
--- a/rules/lowpan-tools.make
+++ b/rules/lowpan-tools.make
@@ -32,18 +32,13 @@ LOWPAN_TOOLS_LICENSE	:= GPLv2
 LOWPAN_TOOLS_CONF_ENV = \
 	$(CROSS_ENV)
 
-ifdef PTXCONF_LOWPAN_TOOLS_TESTS
-LOWPAN_TOOLS_CONF_ENV += ac_cv_path_PYTHON=$(CROSS_PYTHON)
-else
-LOWPAN_TOOLS_CONF_ENV += ac_cv_path_PYTHON=:
-endif
-
 #
 # autoconf
 #
 LOWPAN_TOOLS_CONF_TOOL	:= autoconf
 LOWPAN_TOOLS_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--$(call ptx/endis, PTXCONF_LOWPAN_TOOLS_TESTS)-tests
 	--disable-manpages \
 	--enable-shared \
 	--disable-static \

-- 
Pengutronix e.K.                              | Juergen Beisert             |
Linux Solutions for Science and Industry      | http://www.pengutronix.de/  |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [ptxdist] [PATCHv3] lowpan-tools: Ensure correct '-Werror' and Python handling
  2014-01-07  9:43 ` [ptxdist] [PATCHv2] lowpan-tools: Ensure correct '-Werror' and Python handling Jürgen Beisert
@ 2014-01-07 10:08   ` Jürgen Beisert
  2014-01-09  9:40     ` Michael Olbrich
  0 siblings, 1 reply; 4+ messages in thread
From: Jürgen Beisert @ 2014-01-07 10:08 UTC (permalink / raw)
  To: ptxdist; +Cc: Alexander Aring

A dependency (build and run time) to Python only exists if the serial test
program gets installed. If all tests programs are disabled, we can omit
Python completely.
If the test tools should be built, the configure script finds the project
Phython (CROSS_PYTHON) without the help of the cached variable.

Changes since V2:
 - add the missed trailing back slash in the rule file :(

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>

diff --git a/patches/lowpan-tools-0.3/0008-Be-more-precise-what-happens-with-the-werror-switch.patch b/patches/lowpan-tools-0.3/0008-Be-more-precise-what-happens-with-the-werror-switch.patch
new file mode 100644
index 0000000..765f596
--- /dev/null
+++ b/patches/lowpan-tools-0.3/0008-Be-more-precise-what-happens-with-the-werror-switch.patch
@@ -0,0 +1,29 @@
+From: Juergen Beisert <jbe@pengutronix.de>
+Date: Tue, 7 Jan 2014 10:23:33 +0100
+Subject: [PATCH] Be more precise what happens with the 'werror' switch
+
+Using the -werror parameter is always a source of pain. Be sure it is not
+used when PTXdist runs
+
+Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
+---
+ configure.ac |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 89c2651..6aec4f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -123,9 +123,9 @@ AC_FUNC_FORK
+ AC_CHECK_FUNCS([malloc realloc memset socket getopt_long select strdup strtol])
+ 
+ # Handle this last so -Werror doesn't get in the way of compile tests
+-AC_ARG_ENABLE(werror, [AC_HELP_STRING([--disable-werror],
+-	      [do not compile with -Werror])])
+-if test "x$enable_werror" != "xno" ; then
++AC_ARG_ENABLE([werror],
++		[AC_HELP_STRING([--enable-werror], [compile with -Werror @<:@default=no@:>@])])
++if test "x$enable_werror" == "xyes" ; then
+ 	CFLAGS="-Werror $CFLAGS"
+ fi
+ 
diff --git a/patches/lowpan-tools-0.3/0009-Python-is-required-only-for-the-serial-tests.patch b/patches/lowpan-tools-0.3/0009-Python-is-required-only-for-the-serial-tests.patch
new file mode 100644
index 0000000..1d416b6
--- /dev/null
+++ b/patches/lowpan-tools-0.3/0009-Python-is-required-only-for-the-serial-tests.patch
@@ -0,0 +1,63 @@
+From: Juergen Beisert <jbe@pengutronix.de>
+Date: Tue, 7 Jan 2014 10:25:05 +0100
+Subject: [PATCH] Python is required only for the serial tests
+
+Only the serial tests require host and target python.
+
+Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
+---
+ configure.ac            |   20 +++++++++++++++-----
+ test-serial/Makefile.am |    2 ++
+ 2 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6aec4f7..99080d1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,11 @@ AC_CONFIG_HEADER([config.h])
+ # Test for new silent rules and enable only if they are available
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
++AC_ARG_ENABLE([tests],
++	[AC_HELP_STRING([--disable-tests], [do not install the tests @<:@default=yes@:>@])],
++	[],
++	[enable_tests=yes])
++
+ AC_ARG_WITH(zbtestdir, [AC_HELP_STRING([--with-zbtestdir],
+ 	    [directory where all test programs will be installed])],
+ 	    [zbtestdir=$withval],
+@@ -77,11 +82,16 @@ AC_PROG_LIBTOOL
+ AM_PROG_LEX
+ AC_PROG_YACC
+ AC_SUBST(LIBTOOL_DEPS)
+-# Currently the scripts works with python2.x only
+-# Check for this at first
+-AC_PATH_PROG(PYTHON, python2 python2.7 python2.6 python2.5 python)
+-AM_PATH_PYTHON(,, [:])
+-py_CHECK_MAJOR_VERSION([PYTHON_VERSION], [2])
++
++if test "x$enable_tests" == "xyes" ; then
++	# Currently the scripts works with python2.x only
++	# Check for this at first
++	AC_PATH_PROG(PYTHON, python2 python2.7 python2.6 python2.5 python)
++	AM_PATH_PYTHON(,, [:])
++	py_CHECK_MAJOR_VERSION([PYTHON_VERSION], [2])
++fi
++AM_CONDITIONAL([PYTHON_AVAILABLE], [test "x$enable_tests" == "xyes"])
++
+ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
+ 
+ # Checks for libraries.
+diff --git a/test-serial/Makefile.am b/test-serial/Makefile.am
+index 5553ded..733d472 100644
+--- a/test-serial/Makefile.am
++++ b/test-serial/Makefile.am
+@@ -1,6 +1,8 @@
++if PYTHON_AVAILABLE
+ include $(top_srcdir)/Makefile.common
+ 
+ python_PYTHON = test_DQ.py
+ tests = test_packets.py test_edscan.py test_recv.py test_trx.py
+ zbtest_SCRIPTS = $(tests)
+ EXTRA_DIST = $(tests)
++endif
diff --git a/patches/lowpan-tools-0.3/series b/patches/lowpan-tools-0.3/series
index 1652508..5a27c2d 100644
--- a/patches/lowpan-tools-0.3/series
+++ b/patches/lowpan-tools-0.3/series
@@ -1,3 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
 0001-izoordinator-Fixes-to-error-handling.patch
 0002-addrdb-fix-include-dependency-and-remove-redefined.patch
 0003-configure.ac-check-for-python2.x.patch
@@ -5,3 +7,6 @@
 0005-configure.ac-Check-that-the-python-version-is-indeed.patch
 0006-Allow-to-set-PAN-ID-short-address-and-channel-manual.patch
 0007-iz-mac-Handle-return-code-from-set-command.patch
+0008-Be-more-precise-what-happens-with-the-werror-switch.patch
+0009-Python-is-required-only-for-the-serial-tests.patch
+# 51d1b183c0f5cedfa556e1f007a70585  - git-ptx-patches magic
diff --git a/rules/lowpan-tools.make b/rules/lowpan-tools.make
index a4919bd..711bf8b 100644
--- a/rules/lowpan-tools.make
+++ b/rules/lowpan-tools.make
@@ -32,18 +32,13 @@ LOWPAN_TOOLS_LICENSE	:= GPLv2
 LOWPAN_TOOLS_CONF_ENV = \
 	$(CROSS_ENV)
 
-ifdef PTXCONF_LOWPAN_TOOLS_TESTS
-LOWPAN_TOOLS_CONF_ENV += ac_cv_path_PYTHON=$(CROSS_PYTHON)
-else
-LOWPAN_TOOLS_CONF_ENV += ac_cv_path_PYTHON=:
-endif
-
 #
 # autoconf
 #
 LOWPAN_TOOLS_CONF_TOOL	:= autoconf
 LOWPAN_TOOLS_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--$(call ptx/endis, PTXCONF_LOWPAN_TOOLS_TESTS)-tests \
 	--disable-manpages \
 	--enable-shared \
 	--disable-static \

-- 
Pengutronix e.K.                              | Juergen Beisert             |
Linux Solutions for Science and Industry      | http://www.pengutronix.de/  |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [ptxdist] [PATCHv3] lowpan-tools: Ensure correct '-Werror' and Python handling
  2014-01-07 10:08   ` [ptxdist] [PATCHv3] " Jürgen Beisert
@ 2014-01-09  9:40     ` Michael Olbrich
  0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2014-01-09  9:40 UTC (permalink / raw)
  To: ptxdist

On Tue, Jan 07, 2014 at 11:08:29AM +0100, Jürgen Beisert wrote:
> A dependency (build and run time) to Python only exists if the serial test
> program gets installed. If all tests programs are disabled, we can omit
> Python completely.
> If the test tools should be built, the configure script finds the project
> Phython (CROSS_PYTHON) without the help of the cached variable.
> 
> Changes since V2:
>  - add the missed trailing back slash in the rule file :(
> 
> Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
> 
> diff --git a/patches/lowpan-tools-0.3/0008-Be-more-precise-what-happens-with-the-werror-switch.patch b/patches/lowpan-tools-0.3/0008-Be-more-precise-what-happens-with-the-werror-switch.patch
> new file mode 100644
> index 0000000..765f596
> --- /dev/null
> +++ b/patches/lowpan-tools-0.3/0008-Be-more-precise-what-happens-with-the-werror-switch.patch
> @@ -0,0 +1,29 @@
> +From: Juergen Beisert <jbe@pengutronix.de>
> +Date: Tue, 7 Jan 2014 10:23:33 +0100
> +Subject: [PATCH] Be more precise what happens with the 'werror' switch
> +
> +Using the -werror parameter is always a source of pain. Be sure it is not
> +used when PTXdist runs
> +
> +Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
> +---
> + configure.ac |    6 +++---
> + 1 file changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 89c2651..6aec4f7 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -123,9 +123,9 @@ AC_FUNC_FORK
> + AC_CHECK_FUNCS([malloc realloc memset socket getopt_long select strdup strtol])
> + 
> + # Handle this last so -Werror doesn't get in the way of compile tests
> +-AC_ARG_ENABLE(werror, [AC_HELP_STRING([--disable-werror],
> +-	      [do not compile with -Werror])])
> +-if test "x$enable_werror" != "xno" ; then
> ++AC_ARG_ENABLE([werror],
> ++		[AC_HELP_STRING([--enable-werror], [compile with -Werror @<:@default=no@:>@])])
> ++if test "x$enable_werror" == "xyes" ; then
> + 	CFLAGS="-Werror $CFLAGS"
> + fi
> + 
> diff --git a/patches/lowpan-tools-0.3/0009-Python-is-required-only-for-the-serial-tests.patch b/patches/lowpan-tools-0.3/0009-Python-is-required-only-for-the-serial-tests.patch
> new file mode 100644
> index 0000000..1d416b6
> --- /dev/null
> +++ b/patches/lowpan-tools-0.3/0009-Python-is-required-only-for-the-serial-tests.patch
> @@ -0,0 +1,63 @@
> +From: Juergen Beisert <jbe@pengutronix.de>
> +Date: Tue, 7 Jan 2014 10:25:05 +0100
> +Subject: [PATCH] Python is required only for the serial tests
> +
> +Only the serial tests require host and target python.
> +
> +Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
> +---
> + configure.ac            |   20 +++++++++++++++-----
> + test-serial/Makefile.am |    2 ++
> + 2 files changed, 17 insertions(+), 5 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 6aec4f7..99080d1 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -19,6 +19,11 @@ AC_CONFIG_HEADER([config.h])
> + # Test for new silent rules and enable only if they are available
> + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
> + 
> ++AC_ARG_ENABLE([tests],
> ++	[AC_HELP_STRING([--disable-tests], [do not install the tests @<:@default=yes@:>@])],
> ++	[],
> ++	[enable_tests=yes])
> ++
> + AC_ARG_WITH(zbtestdir, [AC_HELP_STRING([--with-zbtestdir],
> + 	    [directory where all test programs will be installed])],
> + 	    [zbtestdir=$withval],
> +@@ -77,11 +82,16 @@ AC_PROG_LIBTOOL
> + AM_PROG_LEX
> + AC_PROG_YACC
> + AC_SUBST(LIBTOOL_DEPS)
> +-# Currently the scripts works with python2.x only
> +-# Check for this at first
> +-AC_PATH_PROG(PYTHON, python2 python2.7 python2.6 python2.5 python)
> +-AM_PATH_PYTHON(,, [:])
> +-py_CHECK_MAJOR_VERSION([PYTHON_VERSION], [2])
> ++
> ++if test "x$enable_tests" == "xyes" ; then
> ++	# Currently the scripts works with python2.x only
> ++	# Check for this at first
> ++	AC_PATH_PROG(PYTHON, python2 python2.7 python2.6 python2.5 python)
> ++	AM_PATH_PYTHON(,, [:])
> ++	py_CHECK_MAJOR_VERSION([PYTHON_VERSION], [2])
> ++fi
> ++AM_CONDITIONAL([PYTHON_AVAILABLE], [test "x$enable_tests" == "xyes"])
> ++
> + AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
> + 
> + # Checks for libraries.
> +diff --git a/test-serial/Makefile.am b/test-serial/Makefile.am
> +index 5553ded..733d472 100644
> +--- a/test-serial/Makefile.am
> ++++ b/test-serial/Makefile.am
> +@@ -1,6 +1,8 @@
> ++if PYTHON_AVAILABLE
> + include $(top_srcdir)/Makefile.common
> + 
> + python_PYTHON = test_DQ.py
> + tests = test_packets.py test_edscan.py test_recv.py test_trx.py
> + zbtest_SCRIPTS = $(tests)
> + EXTRA_DIST = $(tests)
> ++endif
> diff --git a/patches/lowpan-tools-0.3/series b/patches/lowpan-tools-0.3/series
> index 1652508..5a27c2d 100644
> --- a/patches/lowpan-tools-0.3/series
> +++ b/patches/lowpan-tools-0.3/series
> @@ -1,3 +1,5 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
>  0001-izoordinator-Fixes-to-error-handling.patch
>  0002-addrdb-fix-include-dependency-and-remove-redefined.patch
>  0003-configure.ac-check-for-python2.x.patch
> @@ -5,3 +7,6 @@
>  0005-configure.ac-Check-that-the-python-version-is-indeed.patch
>  0006-Allow-to-set-PAN-ID-short-address-and-channel-manual.patch
>  0007-iz-mac-Handle-return-code-from-set-command.patch
> +0008-Be-more-precise-what-happens-with-the-werror-switch.patch
> +0009-Python-is-required-only-for-the-serial-tests.patch
> +# 51d1b183c0f5cedfa556e1f007a70585  - git-ptx-patches magic
> diff --git a/rules/lowpan-tools.make b/rules/lowpan-tools.make
> index a4919bd..711bf8b 100644
> --- a/rules/lowpan-tools.make
> +++ b/rules/lowpan-tools.make
> @@ -32,18 +32,13 @@ LOWPAN_TOOLS_LICENSE	:= GPLv2
>  LOWPAN_TOOLS_CONF_ENV = \
>  	$(CROSS_ENV)
>  
> -ifdef PTXCONF_LOWPAN_TOOLS_TESTS
> -LOWPAN_TOOLS_CONF_ENV += ac_cv_path_PYTHON=$(CROSS_PYTHON)

This is needed to make sure the correct python is used.

> -else
> -LOWPAN_TOOLS_CONF_ENV += ac_cv_path_PYTHON=:

This can be removed.

mol

> -endif
> -
>  #
>  # autoconf
>  #
>  LOWPAN_TOOLS_CONF_TOOL	:= autoconf
>  LOWPAN_TOOLS_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
> +	--$(call ptx/endis, PTXCONF_LOWPAN_TOOLS_TESTS)-tests \
>  	--disable-manpages \
>  	--enable-shared \
>  	--disable-static \
> 
> -- 
> Pengutronix e.K.                              | Juergen Beisert             |
> Linux Solutions for Science and Industry      | http://www.pengutronix.de/  |
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-01-09  9:40 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-06  9:00 [ptxdist] [PATCH] lowpan-tools: always force Python Jürgen Beisert
2014-01-07  9:43 ` [ptxdist] [PATCHv2] lowpan-tools: Ensure correct '-Werror' and Python handling Jürgen Beisert
2014-01-07 10:08   ` [ptxdist] [PATCHv3] " Jürgen Beisert
2014-01-09  9:40     ` Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox