[Powerguru-commit] [SCM] powerguru branch, master, updated. 7b3cc6ff635345c5cd42109de3750376c37500de

[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  7b3cc6ff635345c5cd42109de3750376c37500de (commit)
      from  ec0bbec83c1e6ffa99d347521490eb09d48e13e0 (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=7b3cc6ff635345c5cd42109de3750376c37500de


commit 7b3cc6ff635345c5cd42109de3750376c37500de
Author: Rob Savoye <address@hidden>
Date:   Wed Jan 2 12:25:17 2019 -0700

    Fix handling of the sysroot, so CXXFLAGS can be redefined

diff --git a/client/Makefile.am b/client/Makefile.am
index aa261b7..054521a 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -23,6 +23,7 @@ AUTOMAKE_OPTIONS =
 bin_PROGRAMS = pguru 
 
 pguru_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/devices
+pguru_CXXFLAGS = $(SYSROOT)
 
 pguru_SOURCES = cmd.cc threads.cc
 pguru_LDADD = ../lib/libpguru.la -lpthread -ldl
diff --git a/configure.ac b/configure.ac
index 623a916..a45c66e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,12 +178,14 @@ 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
-    CXXFLAGS+=" --sysroot=${sysroot}"
+    SYSROOT+=" --sysroot=${sysroot}"
     CFLAGS+=" --sysroot=${sysroot}"
     LDFLAGS+=" -Wl,-rpath=${sysroot}/usr/lib/${host_alias}"
     LDFLAGS+=" -Wl,-rpath=${sysroot}/lib/${host_alias}"
-  fi
-  AC_SUBST(sysroot)
+  else
+    SYSROOT=""
+fi
+  AC_SUBST(SYSROOT)
 fi
 AM_CONDITIONAL(BUILD_CROSS, [ test x"${cross_compiling}" == xyes ])
 
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 671a655..5e09aad 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -22,6 +22,7 @@
 AUTOMAKE_OPTIONS = # dejagnu
 
 pgd_CPPFLAGS = -Wall -I$(top_srcdir)/lib -I$(top_srcdir)/devices
+pgd_CXXFLAGS = $(SYSROOT)
 pgd_LDADD = ../devices/libpdev.la ../lib/libpguru.la -lboost_filesystem \
         -lboost_regex -lboost_system -lboost_log -lboost_log_setup \
        -lpthread -lresolv -ldl
diff --git a/devices/Makefile.am b/devices/Makefile.am
index 3fcdaa7..1553520 100644
--- a/devices/Makefile.am
+++ b/devices/Makefile.am
@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 #DL_LIB = @DL_LIB@
 #LIBLTDL = @LIBLTDL@
 # __USLC__ makes MySQL++ use the std namespace
-AM_CXXFLAGS = -g -D__USLC__
+AM_CXXFLAGS = -g -D__USLC__ $(SYSROOT)
 
 noinst_LTLIBRARIES = libpdev.la
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 75d994e..bd97626 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -33,9 +33,8 @@ address@hidden@
 # include_HEADERS = log.h err.h proc.h serial.h xantrex.h outback.h
 
 libpguru_la_CPPFLAGS = -I$(top_srcdir)/devices
+libpguru_la_CXXFLAGS = $(SYSROOT)
 libpguru_la_LIBDADD =
-
-#      err.cc err.h
 libpguru_la_SOURCES = \
        proc.cc proc.h \
        rc.cc rc.h \

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

Summary of changes:
 client/Makefile.am  | 1 +
 configure.ac        | 8 +++++---
 daemon/Makefile.am  | 1 +
 devices/Makefile.am | 2 +-
 lib/Makefile.am     | 3 +--
 5 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
powerguru