From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ptx.hi.pengutronix.de ([2001:6f8:1178:2:5054:ff:fec0:8e10] ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1W1C5q-00028L-GN for ptxdist@pengutronix.de; Thu, 09 Jan 2014 10:40:02 +0100 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1W1C5q-0005QO-Et for ptxdist@pengutronix.de; Thu, 09 Jan 2014 10:40:02 +0100 Date: Thu, 9 Jan 2014 10:40:02 +0100 From: Michael Olbrich Message-ID: <20140109094002.GB1619@pengutronix.de> References: <201401061000.20461.jbe@pengutronix.de> <201401071043.09684.jbe@pengutronix.de> <201401071108.29687.jbe@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201401071108.29687.jbe@pengutronix.de> Subject: Re: [ptxdist] [PATCHv3] lowpan-tools: Ensure correct '-Werror' and Python handling Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de On Tue, Jan 07, 2014 at 11:08:29AM +0100, J=FCrgen 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 > = > diff --git a/patches/lowpan-tools-0.3/0008-Be-more-precise-what-happens-w= ith-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 > +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 > +--- > + 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" !=3D "xno" ; then > ++AC_ARG_ENABLE([werror], > ++ [AC_HELP_STRING([--enable-werror], [compile with -Werror @<:@default= =3Dno@:>@])]) > ++if test "x$enable_werror" =3D=3D "xyes" ; then > + CFLAGS=3D"-Werror $CFLAGS" > + fi > + = > diff --git a/patches/lowpan-tools-0.3/0009-Python-is-required-only-for-th= e-serial-tests.patch b/patches/lowpan-tools-0.3/0009-Python-is-required-onl= y-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-seria= l-tests.patch > @@ -0,0 +1,63 @@ > +From: Juergen Beisert > +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 > +--- > + 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 @<:@defau= lt=3Dyes@:>@])], > ++ [], > ++ [enable_tests=3Dyes]) > ++ > + AC_ARG_WITH(zbtestdir, [AC_HELP_STRING([--with-zbtestdir], > + [directory where all test programs will be installed])], > + [zbtestdir=3D$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" =3D=3D "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" =3D=3D "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 =3D test_DQ.py > + tests =3D test_packets.py test_edscan.py test_recv.py test_trx.py > + zbtest_SCRIPTS =3D $(tests) > + EXTRA_DIST =3D $(tests) > ++endif > diff --git a/patches/lowpan-tools-0.3/series b/patches/lowpan-tools-0.3/s= eries > 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 :=3D GPLv2 > LOWPAN_TOOLS_CONF_ENV =3D \ > $(CROSS_ENV) > = > -ifdef PTXCONF_LOWPAN_TOOLS_TESTS > -LOWPAN_TOOLS_CONF_ENV +=3D ac_cv_path_PYTHON=3D$(CROSS_PYTHON) This is needed to make sure the correct python is used. > -else > -LOWPAN_TOOLS_CONF_ENV +=3D ac_cv_path_PYTHON=3D: This can be removed. mol > -endif > - > # > # autoconf > # > LOWPAN_TOOLS_CONF_TOOL :=3D autoconf > LOWPAN_TOOLS_CONF_OPT :=3D \ > $(CROSS_AUTOCONF_USR) \ > + --$(call ptx/endis, PTXCONF_LOWPAN_TOOLS_TESTS)-tests \ > --disable-manpages \ > --enable-shared \ > --disable-static \ > = > -- = > Pengutronix e.K. =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0| Juergen Beisert =A0 =A0 =A0 =A0 =A0 =A0 | > Linux Solutions for Science and Industry =A0 =A0 =A0| http://www.pengutro= nix.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