From abologna at redhat.com Mon Sep 18 13:03:31 2017 From: abologna at redhat.com (Andrea Bolognani) Date: Mon, 18 Sep 2017 15:03:31 +0200 Subject: [Libosinfo] [osinfo-db-tools PATCH 0/2] syntax-check portability fixes Message-ID: <20170918130333.28672-1-abologna@redhat.com> With these patches, 'make syntax-check' passes on FreeBSD 11. Andrea Bolognani (2): configure: Look for Perl interpreter path bracket-spacing: Don't hardcode Perl interpreter path build-aux/bracket-spacing.pl | 2 +- configure.ac | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.13.5 From abologna at redhat.com Mon Sep 18 13:03:32 2017 From: abologna at redhat.com (Andrea Bolognani) Date: Mon, 18 Sep 2017 15:03:32 +0200 Subject: [Libosinfo] [osinfo-db-tools PATCH 1/2] configure: Look for Perl interpreter path In-Reply-To: <20170918130333.28672-1-abologna@redhat.com> References: <20170918130333.28672-1-abologna@redhat.com> Message-ID: <20170918130333.28672-2-abologna@redhat.com> The $(PERL) variable is used in cfg.mk, but configure is not actually looking for the Perl interpreter path, so it will always end up being empty. Signed-off-by: Andrea Bolognani --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 613afea..8170b2d 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,9 @@ AC_CONFIG_HEADERS([config.h]) AC_PROG_CC AC_PROG_LN_S +# Perl is needed for syntax-check +AC_PATH_PROG([PERL], [perl]) + LT_INIT([shared disable-static win32-dll]) LIBOSINFO_COMPILE_WARNINGS -- 2.13.5 From abologna at redhat.com Mon Sep 18 13:03:33 2017 From: abologna at redhat.com (Andrea Bolognani) Date: Mon, 18 Sep 2017 15:03:33 +0200 Subject: [Libosinfo] [osinfo-db-tools PATCH 2/2] bracket-spacing: Don't hardcode Perl interpreter path In-Reply-To: <20170918130333.28672-1-abologna@redhat.com> References: <20170918130333.28672-1-abologna@redhat.com> Message-ID: <20170918130333.28672-3-abologna@redhat.com> This is particularly useful on operating systems that don't ship Perl as part of the base system (eg. FreeBSD) while still working just as well as it did before on Linux. Signed-off-by: Andrea Bolognani --- build-aux/bracket-spacing.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-aux/bracket-spacing.pl b/build-aux/bracket-spacing.pl index e4ae8f0..655dac0 100755 --- a/build-aux/bracket-spacing.pl +++ b/build-aux/bracket-spacing.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # # bracket-spacing.pl: Report any usage of 'function (..args..)' # Also check for other syntax issues, such as correct use of ';' -- 2.13.5 From abologna at redhat.com Thu Sep 21 08:18:40 2017 From: abologna at redhat.com (Andrea Bolognani) Date: Thu, 21 Sep 2017 10:18:40 +0200 Subject: [Libosinfo] [osinfo-db-tools PATCH] maint: Drop autobuild.sh Message-ID: <20170921081840.9105-1-abologna@redhat.com> The Test-AutoBuild project, that this script is supposed to be used with, hasn't seen any activity in ~6 years; libvirt's own CI, which also performs periodic builds of osinfo-db-tools, is running on Jenkins with a completely independent setup that doesn't use the script at all. Signed-off-by: Andrea Bolognani --- autobuild.sh | 105 ----------------------------------------------------------- 1 file changed, 105 deletions(-) delete mode 100755 autobuild.sh diff --git a/autobuild.sh b/autobuild.sh deleted file mode 100755 index 0886329..0000000 --- a/autobuild.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh - -set -e -set -v - -test -n "$1" && RESULTS=$1 || RESULTS=results.log -: ${AUTOBUILD_INSTALL_ROOT=$HOME/builder} - -# Make things clean. -test -f Makefile && make -k distclean || : - -rm -rf build -mkdir build -cd build - -../autogen.sh --prefix=$AUTOBUILD_INSTALL_ROOT \ - --enable-werror --enable-gtk-doc - -# If the MAKEFLAGS envvar does not yet include a -j option, -# add -jN where N depends on the number of processors. -case $MAKEFLAGS in - *-j*) ;; - *) n=$(getconf _NPROCESSORS_ONLN 2> /dev/null) - test "$n" -gt 0 || n=1 - n=$(expr $n + 1) - MAKEFLAGS="$MAKEFLAGS -j$n" - export MAKEFLAGS - ;; -esac - -make -make install - -# set -o pipefail is a bashism; this use of exec is the POSIX alternative -exec 3>&1 -st=$( - exec 4>&1 >&3 - { make check syntax-check 2>&1 3>&- 4>&-; echo $? >&4; } | tee "$RESULTS" -) -exec 3>&- -test "$st" = 0 - -rm -f *.tar.gz -make dist - -if [ -n "$AUTOBUILD_COUNTER" ]; then - EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER" -else - NOW=`date +"%s"` - EXTRA_RELEASE=".$USER$NOW" -fi - -if [ -f /usr/bin/rpmbuild ]; then - rpmbuild --nodeps \ - --define "extra_release $EXTRA_RELEASE" \ - --define "_sourcedir `pwd`" \ - -ba --clean osinfo-db-tools.spec -fi - -# Test mingw32 cross-compile -if test -x /usr/bin/i686-w64-mingw32-gcc ; then - make distclean - - PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig" \ - CC="i686-w64-mingw32-gcc" \ - ../configure \ - --build=$(uname -m)-pc-linux \ - --host=i686-w64-mingw32 \ - --prefix="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \ - --enable-werror \ - --enable-introspection=no \ - --enable-tests=no - - make - make install - -fi - -# Test mingw64 cross-compile -if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then - make distclean - - PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig" \ - CC="x86_64-w64-mingw32-gcc" \ - ../configure \ - --build=$(uname -m)-pc-linux \ - --host=x86_64-w64-mingw32 \ - --prefix="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \ - --enable-werror \ - --enable-introspection=no \ - --enable-tests=no - - make - make install - -fi - -if test -x /usr/bin/i686-w64-mingw32-gcc && test -x /usr/bin/x86_64-w64-mingw32-gcc ; then - if test -f /usr/bin/rpmbuild ; then - rpmbuild --nodeps \ - --define "extra_release $EXTRA_RELEASE" \ - --define "_sourcedir `pwd`" \ - -ba --clean mingw-osinfo-db-tools.spec - fi -fi -- 2.13.5 From cfergeau at redhat.com Thu Sep 21 08:21:34 2017 From: cfergeau at redhat.com (Christophe Fergeau) Date: Thu, 21 Sep 2017 10:21:34 +0200 Subject: [Libosinfo] [osinfo-db-tools PATCH 0/2] syntax-check portability fixes In-Reply-To: <20170918130333.28672-1-abologna@redhat.com> References: <20170918130333.28672-1-abologna@redhat.com> Message-ID: <20170921082134.GF11717@natto.ory.fergeau.eu> For the series: Acked-by: Christophe Fergeau On Mon, Sep 18, 2017 at 03:03:31PM +0200, Andrea Bolognani wrote: > With these patches, 'make syntax-check' passes on FreeBSD 11. > > Andrea Bolognani (2): > configure: Look for Perl interpreter path > bracket-spacing: Don't hardcode Perl interpreter path > > build-aux/bracket-spacing.pl | 2 +- > configure.ac | 3 +++ > 2 files changed, 4 insertions(+), 1 deletion(-) > > -- > 2.13.5 > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo From berrange at redhat.com Thu Sep 21 08:53:16 2017 From: berrange at redhat.com (Daniel P. Berrange) Date: Thu, 21 Sep 2017 09:53:16 +0100 Subject: [Libosinfo] [osinfo-db-tools PATCH] maint: Drop autobuild.sh In-Reply-To: <20170921081840.9105-1-abologna@redhat.com> References: <20170921081840.9105-1-abologna@redhat.com> Message-ID: <20170921085316.GB26740@redhat.com> On Thu, Sep 21, 2017 at 10:18:40AM +0200, Andrea Bolognani wrote: > The Test-AutoBuild project, that this script is supposed to be used > with, hasn't seen any activity in ~6 years; libvirt's own CI, which > also performs periodic builds of osinfo-db-tools, is running on > Jenkins with a completely independent setup that doesn't use the > script at all. > > Signed-off-by: Andrea Bolognani > --- > autobuild.sh | 105 ----------------------------------------------------------- > 1 file changed, 105 deletions(-) > delete mode 100755 autobuild.sh Reviewed-by: Daniel P. Berrange Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| From berrange at redhat.com Thu Sep 21 09:00:47 2017 From: berrange at redhat.com (Daniel P. Berrange) Date: Thu, 21 Sep 2017 10:00:47 +0100 Subject: [Libosinfo] [osinfo-db-tools PATCH 0/2] syntax-check portability fixes In-Reply-To: <20170921082134.GF11717@natto.ory.fergeau.eu> References: <20170918130333.28672-1-abologna@redhat.com> <20170921082134.GF11717@natto.ory.fergeau.eu> Message-ID: <20170921090047.GC26740@redhat.com> Likewise Reviewed-by: Daniel P. Berrange and pushed to git master... On Thu, Sep 21, 2017 at 10:21:34AM +0200, Christophe Fergeau wrote: > For the series: > Acked-by: Christophe Fergeau > > On Mon, Sep 18, 2017 at 03:03:31PM +0200, Andrea Bolognani wrote: > > With these patches, 'make syntax-check' passes on FreeBSD 11. > > > > Andrea Bolognani (2): > > configure: Look for Perl interpreter path > > bracket-spacing: Don't hardcode Perl interpreter path > > > > build-aux/bracket-spacing.pl | 2 +- > > configure.ac | 3 +++ > > 2 files changed, 4 insertions(+), 1 deletion(-) > > > > -- > > 2.13.5 > > > > _______________________________________________ > > Libosinfo mailing list > > Libosinfo at redhat.com > > https://www.redhat.com/mailman/listinfo/libosinfo > > _______________________________________________ > Libosinfo mailing list > Libosinfo at redhat.com > https://www.redhat.com/mailman/listinfo/libosinfo Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|