[boinc] 02/02: Trying to dynamically link boinc

[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 ceb0b09971fc4faf2b5fd52bce89ef742c2dae02
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed May 7 10:03:54 2014 +0200

    Trying to dynamically link boinc
---
 debian/changelog                                   |  3 ++
 debian/patches/Missing_libSched.patch              |  6 ++--
 debian/patches/correctly-set-OBJCXX.patch          | 34 ++++++++++++++++++++++
 .../patches/gui_urls_xml_added_to_Makefile.patch   |  2 +-
 debian/patches/series                              |  1 +
 5 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f1b8e06..2789275 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ boinc (7.2.47+dfsg-3) UNRELEASED; urgency=medium
   * Add return values to envargs function (Closes: #747964)
     Note: upstream didn't apply this patch because it seems to be
     unreachable code.
+  * Fix gcc-4.9 build failure (Closes: #746830)
+    - debian/patches/Missing_libSched.patch
+    - patches/correctly-set-OBJCXX.patch
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sun, 18 May 2014 20:58:51 +0200
 
diff --git a/debian/patches/Missing_libSched.patch b/debian/patches/Missing_libSched.patch
index 3609d09..4f6c0a4 100644
--- a/debian/patches/Missing_libSched.patch
+++ b/debian/patches/Missing_libSched.patch
@@ -7,7 +7,7 @@ Index: boinc/tools/Makefile.am
  
  AM_CXXFLAGS += $(MYSQL_CFLAGS)
 -AM_LDFLAGS += -static
-+AM_LDFLAGS += -static -L../sched -L../lib/.libs
++AM_LDFLAGS += -L../sched -L../lib/.libs
  
  cancel_jobs_SOURCES = cancel_jobs.cpp
  cancel_jobs_LDADD = $(SERVERLIBS)
@@ -20,7 +20,7 @@ Index: boinc/vda/Makefile.am
  
  AM_CXXFLAGS += $(MYSQL_CFLAGS)
 -AM_LDFLAGS += -static
-+AM_LDFLAGS += -static -L../lib/.libs -L../sched
++AM_LDFLAGS += -L../lib/.libs -L../sched
  
  vda_SOURCES = vda.cpp vda_lib.cpp vda_lib2.cpp vda_policy.cpp stats.cpp
  vda_LDADD = $(SERVERLIBS)
@@ -33,7 +33,7 @@ Index: boinc/sched/Makefile.am
  
  AM_CPPFLAGS += $(MYSQL_CFLAGS) $(PTHREAD_CFLAGS)
 -AM_LDFLAGS += -static
-+AM_LDFLAGS += -static -L../lib/.libs/
++AM_LDFLAGS += -L../lib/.libs/
  
  if ENABLE_LIBRARIES
  
diff --git a/debian/patches/correctly-set-OBJCXX.patch b/debian/patches/correctly-set-OBJCXX.patch
new file mode 100644
index 0000000..841c436
--- /dev/null
+++ b/debian/patches/correctly-set-OBJCXX.patch
@@ -0,0 +1,34 @@
+From: Eric J Korpela <korpela at ssl.berkeley.edu>
+Date: Sat, 10 May 2014 05:24:47 +0000 (-0700)
+Subject: Forced definition of OBJC and OBJCXX to prevent libtool error in configuration.
+X-Git-Url: http://boinc.berkeley.edu/gitweb/?p=boinc-v2.git;a=commitdiff_plain;h=0e94586e7eeceffac0d6ca57b9ca543d79c898a0
+
+Forced definition of OBJC and OBJCXX to prevent libtool error in configuration.
+Author: Eric J Korpela <korpela at ssl.berkeley.edu>
+Bug-Debian: http://bugs.debian.org/746830
+
+---
+Origin: upstream
+Forwarded: not-needed
+Reviewed-By: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Last-Update: <2014-05-10>
+
+--- boinc-7.2.47+dfsg.orig/configure.ac
++++ boinc-7.2.47+dfsg/configure.ac
+@@ -323,9 +323,15 @@ dnl GUI
+ BOINC_CHECK_CYGWIN
+ 
+ dnl enable objective-C 
++if test x$OBJC = x ; then
++  OBJC="$CC"
++fi
++if test x$OBJCXX = x ; then
++  OBJCXX="$CXX"
++fi
+ _AM_DEPENDENCIES([OBJC])
+-OBJC="$CC"
+ AC_SUBST(OBJC)
++AC_SUBST(OBJCXX)
+ OBJCFLAGS="-ObjC"
+ AC_SUBST(OBJCFLAGS)
+ 
diff --git a/debian/patches/gui_urls_xml_added_to_Makefile.patch b/debian/patches/gui_urls_xml_added_to_Makefile.patch
index bfd1e5d..bc6cce5 100644
--- a/debian/patches/gui_urls_xml_added_to_Makefile.patch
+++ b/debian/patches/gui_urls_xml_added_to_Makefile.patch
@@ -11,4 +11,4 @@ Index: boinc/tools/Makefile.am
 +    gui_urls.xml
  
  AM_CXXFLAGS += $(MYSQL_CFLAGS)
- AM_LDFLAGS += -static -L../sched -L../lib/.libs
+ AM_LDFLAGS += -L../sched -L../lib/.libs
diff --git a/debian/patches/series b/debian/patches/series
index 7cdfefa..0d03521 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -78,3 +78,4 @@ server_status_php.patch
 fix-lp-1274456.patch
 0001-Client-Unix-attempt-to-fix-freebsd-build-error.patch
 fix-747964.patch
+correctly-set-OBJCXX.patch

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