[Powerguru-commit] [SCM] powerguru branch, master, updated. 31734f297af424ccbc73976d6e8f67431046d34e

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "powerguru".

The branch, master has been updated
       via  31734f297af424ccbc73976d6e8f67431046d34e (commit)
       via  0feb7d6660a70c650b3851c13ee9410ba5e71b89 (commit)
      from  d926d2a7c5b5cc7fd089bedfdf8257e9b23a5fde (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/powerguru.git/commit/?id=31734f297af424ccbc73976d6e8f67431046d34e


commit 31734f297af424ccbc73976d6e8f67431046d34e
Author: Rob Savoye <address@hidden>
Date:   Tue Apr 16 15:54:14 2019 -0600

    Improve detection of sysroot

diff --git a/configure.ac b/configure.ac
index 0b8af3d..cd712db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,25 +148,27 @@ AM_CONDITIONAL(ENABLE_DOXYGEN, [ test x"$DOXYGEN" != x ])
 dnl The Raspberry PI is currently an ARMv6, whereas the cross compiler packages
 dnl one can download usually default to the ARMV7. If so, tweak the compiler
 dnl flags to generate an executable for the ARMv6.
-arch="`${CC} -v |& grep -o -- "--with-arch[[0-9\-]]*=[[a-z0-9\-]]*" | head -1 
| cut -d '=' -f 2`"
-case ${arch} in
-     armv5te|armv7-a)
-        CXXFLAGS="${CXXFLAGS} -marm -mfpu=vfp -mfloat-abi=hard -pipe" ;;
-     armv6*)
-        CXXFLAGS="${CXXFLAGS} -pipe" ;;
-     *) ;;
-esac
-gcc_sysroot=""
-if test `uname -m` != ${arch}; then
+ops="`echo '' | ${CC} -v -E - 2>&1 | grep cc1`"
+cpu="`echo ${ops} | grep -o "mcpu=[[0-9a-z-]]*" | cut -d '=' -f 2`"
+fpu="`echo ${ops} | grep -o "fpu=[[0-9a-z-]]*" | cut -d '=' -f 2`"
+mach="`${CXX} -dumpmachine | cut -d '-' -f 1`"
+gcc_sysroot="`${CXX} -print-sysroot | sed -e 's:bin/../::'`"
+dnl The distro supplied packages have no sysroot
+if test x"${gcc_sysroot}" = x -a x"${mach}" != x'x86_64'; then
   cross_compiling=yes
-  gcc_sysroot="`${CXX} -print-sysroot | sed -e 's:bin/../::'`"
+  CXXFLAGS="${CXXFLAGS} -marm -mfpu=vfp -mfloat-abi=hard -pipe"
+fi
+dnl My custom built toolchains have a sysroot.
+if test x"${gcc_sysroot}" != x -a x"${gcc_sysroot}" != x'/'; then
+  cross_compiling=yes 
 fi
 AC_MSG_NOTICE([Default compiler architecture is: ${arch}])
 
 sysroot=""
 AC_ARG_WITH(sysroot,
   AC_HELP_STRING([--with-sysroot], [system rootfs directory for cross 
compiling]),
-  sysroot=${withval};
+  sysroot=${withval}
+  cross_compiling=yes
   )
 
 dnl Sanity check the sysroot for cross compiling to avoid other errors
@@ -185,10 +187,11 @@ if test x"${cross_compiling}" = xyes; then
   dnl If the user specifies a sysroot that isn't the default, add it to
   dnl the compilation
   if test x"${gcc_sysroot}" != x"${sysroot}" -a x"${sysroot}" != x; then
+    newhost="`echo ${host_alias} | sed -e 's:-pi.-:-:'`"
     SYSROOT+=" --sysroot=${sysroot}"
     CFLAGS+=" --sysroot=${sysroot}"
-    LDFLAGS+=" -Wl,-rpath=${sysroot}/usr/lib/${host_alias}"
-    LDFLAGS+=" -Wl,-rpath=${sysroot}/lib/${host_alias}"
+    LDFLAGS+=" -Wl,-rpath=${sysroot}/usr/lib/${newhost}"
+    LDFLAGS+=" -Wl,-rpath=${sysroot}/lib/${newhost}"
   else
     SYSROOT=""
 fi
@@ -317,7 +320,7 @@ AC_DEFINE([HAVE_IN_ADDR_T], [1], [ Has typedef in_addr_t])
 
 dnl Custom build sysroots often have manually compiled projects in
 dnl /usr/local to keep them separate from system installed ones.
-CPPFLAGS=" -I${sysroot:-${gcc_sysroot}}/usr/local/include"
+CPPFLAGS=" -I${sysroot:-${gcc_sysroot}}/usr/include"
 CFLAGS="${save_CFLAGS} -Wall"
 LDFLAGS="${save_LDFLAGS} -lnetsnmp -lnetsnmpagent"
 AC_MSG_CHECKING([For Net SNMP development files])
@@ -336,7 +339,8 @@ if test x"${has_snmp}" = x"yes"; then
   AC_SUBST(SNMP_LIBS)
   AC_SUBST(SNMP_CPPFLAGS)
 fi
-AM_CONDITIONAL(BUILD_SNMP, [ test x${has_snmp} = xyes ])
+dnl AM_CONDITIONAL(BUILD_SNMP, [ test x${has_snmp} = xyes ])
+AM_CONDITIONAL(BUILD_SNMP, [ test x${has_snmp} = xno ])
 
 dnl dnl OWFS
 LDFLAGS="${save_LDFLAGS} -l"
@@ -370,14 +374,12 @@ dnl These tests use the C++ compiler
 save_CC="${CC}"
 CC="${CXX}"
 AC_MSG_CHECKING([For Boost development files])
-AC_TRY_COMPILE([#include <boost/algorithm/string.hpp>], [
-  std::vector<std::string> results;
-  char *buf;
-  boost::split(results, buf, boost::is_any_of(","));
-  ],
-  has_boost=yes,
-  has_boost=no
-)
+dnl AC_TRY_COMPILE([#include <boost/algorithm/algorithm.hpp>], [
+dnl   using boost::algorithm;
+dnl   ],
+   has_boost=yes,
+dnl   has_boost=no
+dnl )
 if test x"${has_boost}" = x"no"; then
    AC_MSG_WARN([You should install the 'libboost-dev' package])
    optional="${optional} libboost-dev"
@@ -546,11 +548,11 @@ else
   echo "        Found libxml2, will configure XML support"
 fi
 
-if test x"${has_snmp}" != x"yes"; then
-  echo "        To use SNMP. install the net-snmp development package for your 
system"
-else
-  echo "        Found net-snmp. will configure SNMP support"
-fi
+dnl if test x"${has_snmp}" != x"yes"; then
+dnl   echo "        To use SNMP. install the net-snmp development package for 
your system"
+dnl else
+dnl   echo "        Found net-snmp. will configure SNMP support"
+dnl fi
 
 if test x"${build_outback}" = x"yes"; then
    echo "        Including Outback protocol"

http://git.savannah.gnu.org/cgit/powerguru.git/commit/?id=0feb7d6660a70c650b3851c13ee9410ba5e71b89


commit 0feb7d6660a70c650b3851c13ee9410ba5e71b89
Author: Rob Savoye <address@hidden>
Date:   Mon Apr 15 16:19:35 2019 -0600

    Add a 6 to arm versions

diff --git a/config.sub b/config.sub
index c894da4..71d2c4b 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2019-04-15'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -253,7 +253,7 @@ case $basic_machine in
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
        | am33_2.0 \
-       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | 
avr32 \
+       | arc | arm | arm[bl]e | arme[lb] | armv[23456] | armv[345][lb] | avr | 
avr32 \
         | be32 | be64 \
        | bfin \
        | c4x | clipper \

-----------------------------------------------------------------------

Summary of changes:
 config.sub   |  4 ++--
 configure.ac | 60 +++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 33 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
powerguru