[boinc] 01/02: Restore stuff

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit f4c7e4ac14176ab140252789e18470c6ad8913a0
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu May 5 12:14:52 2016 +0200

    Restore stuff
---
 debian/patches/static_scientific_apps.patch | 8 ++++----
 debian/rules                                | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/patches/static_scientific_apps.patch b/debian/patches/static_scientific_apps.patch
index 6deca55..a3fc0f9 100644
--- a/debian/patches/static_scientific_apps.patch
+++ b/debian/patches/static_scientific_apps.patch
@@ -76,7 +76,7 @@
  
  vboxmonitor: vboxmonitor.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
 -	g++ $(CXXFLAGS) -o vboxmonitor vboxmonitor.o libstdc++.a -pthread -lboinc_api -lboinc
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -static -pthread -o vboxmonitor vboxmonitor.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -static -pthread -o vboxmonitor vboxmonitor.o libstdc++.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
 --- boinc-7.6.31+dfsg.orig/samples/vboxwrapper/Makefile
 +++ boinc-7.6.31+dfsg/samples/vboxwrapper/Makefile
 @@ -5,7 +5,7 @@ BOINC_DIR = ../..
@@ -122,7 +122,7 @@
  vboxwrapper: vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlogging.o floppyio.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
 -	g++ $(CXXFLAGS) -o vboxwrapper vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlogging.o floppyio.o libstdc++.a -pthread -lboinc_api -lboinc
 +	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -static -pthread -o vboxwrapper vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlogging.o floppyio.o \
-+	libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
++	libstdc++.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
 --- boinc-7.6.31+dfsg.orig/samples/worker/Makefile
 +++ boinc-7.6.31+dfsg/samples/worker/Makefile
 @@ -10,4 +10,4 @@ distclean:
@@ -140,7 +140,7 @@
 -wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS)
 -	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a $(PTHREAD) -lboinc_api -lboinc -lboinc_zip $(LDFLAGS)
 +wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_ZIP_DIR)/libboinc_zip.a $(REGEXP_OBJS)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(PTHREAD) -static -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_ZIP_DIR)/libboinc_zip.a
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(PTHREAD) -static -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_ZIP_DIR)/libboinc_zip.a $(BOINC_LIB_DIR)/libboinc.a
 --- boinc-7.6.31+dfsg.orig/samples/wrappture/Makefile
 +++ boinc-7.6.31+dfsg/samples/wrappture/Makefile
 @@ -6,7 +6,7 @@ BOINC_API_DIR = $(BOINC_DIR)/api
@@ -161,7 +161,7 @@
  
  wrappture_example: wrappture.o wrappture_example.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(RAPPTURE_DIR)/librappture.a
 -	g++ $(CXXFLAGS) -o wrappture_example wrappture_example.o wrappture.o $(RAPPTURE_DIR)/librappture.a libstdc++.a -pthread -lboinc_api -lboinc -lexpat -lz
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -static -pthread -o wrappture_example wrappture_example.o wrappture.o $(RAPPTURE_DIR)/librappture.a libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -static -pthread -o wrappture_example wrappture_example.o wrappture.o $(RAPPTURE_DIR)/librappture.a libstdc++.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
  
  fermi: fermi.cpp
 -	g++ $(CSSFLAGS) -o fermi fermi.cpp
diff --git a/debian/rules b/debian/rules
index 7e4219b..994caab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -128,12 +128,16 @@ endif
 CFLAGS += $(DEB_OPT_FLAGS)
 CXXFLAGS += $(DEB_OPT_FLAGS)
 
+CFLAGS_boinc-client := $(CFLAGS)
+CXXFLAGS_boinc-client := $(CXXFLAGS)
+
 # Link-time optimisation demands knowledge about all CFLAGS both at
 # compile time (as represented by CFLAGS and CXXFLAGS) but also at
 # at link time.
 ifeq (,$(findstring nolto,$(DEB_BUILD_OPTIONS)))
  $(info I: Activating LinkTimeOptimisation)
  CFLAGS += -flto
+ CXXFLAGS += -flto
  LDFLAGS += -flto
 endif
 
@@ -181,7 +185,9 @@ CFGFLAGS_boinc-client = \
   --enable-shared \
   --enable-dynamic-client-linkage \
   --with-ssl \
-  --with-x
+  --with-x \
+  CFLAGS="$(CFLAGS_boinc-client)" \
+  CXXFLAGS="$(CXXFLAGS_boinc-client)"
 
 %:
 	dh $@ --with python2,autoreconf,systemd # --parallel

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git