[SCM] BOINC packaging branch, master, updated. debian/7.0.65+dfsg-3-18-gcdf9661

Steffen Moeller steffen_moeller at gmx.de
Fri May 31 16:47:55 UTC 2013 

The following commit has been merged in the master branch:
commit cdf966137ec48917592751c5ec6d363b01712e45
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Fri May 31 18:43:16 2013 +0200

    Compilation with clang++ is working.
    
    It is because of compilation options missing from the clang
    package that the -lfto had to be removed. This is likely to
    have already been addressed in Ubuntu.
    
    See https://bugs.launchpad.net/ubuntu/+source/llvm-3.0/+bug/1026359

diff --git a/debian/changelog b/debian/changelog
index 5adac34..fc36423 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+boinc (7.1.1+dfsg-2) UNRELEASED; urgency=low
+
+  * compiled with clang
+    - removed patches no longer required
+
+ -- Steffen Moeller <moeller at debian.org>  Thu, 16 May 2013 22:09:08 +0200
+
 boinc (7.1.1+dfsg-1) UNRELEASED; urgency=low
 
   [ Steffen Moeller ]
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index f8cb344..fb2c0d2 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -1,19 +1,21 @@
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
+Index: boinc_debian/lib/Makefile.am
+===================================================================
+--- boinc_debian.orig/lib/Makefile.am
++++ boinc_debian/lib/Makefile.am
 @@ -146,13 +146,13 @@
  libboinc_la_SOURCES = $(generic_sources) $(mac_sources)
  libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
  libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
 -libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
 +libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
- libboinc_la_LIBADD = -lm -lstdc++
+ libboinc_la_LIBADD =
  
  libboinc_crypt_la_SOURCES = crypt.cpp
  libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS)
  libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
 -libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
 +libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
- libboinc_crypt_la_LIBADD =  -lm -lstdc++
+ libboinc_crypt_la_LIBADD = 
  
  
 @@ -221,7 +221,7 @@
@@ -26,8 +28,10 @@
 +parse_test_SOURCES = parse_test.cpp
  parse_test_CXXFLAGS = $(PTHREAD_CFLAGS)
  parse_test_LDADD = $(LIBBOINC)
---- a/client/Makefile.am
-+++ b/client/Makefile.am
+Index: boinc_debian/client/Makefile.am
+===================================================================
+--- boinc_debian.orig/client/Makefile.am
++++ boinc_debian/client/Makefile.am
 @@ -91,7 +91,7 @@
  if OS_DARWIN
  boinc_client_LDFLAGS += -Wl,-flat_namespace,-undefined,dynamic_lookup
diff --git a/debian/patches/clang_incompatibilities.patch b/debian/patches/clang_incompatibilities.patch
deleted file mode 100644
index 037443c..0000000
--- a/debian/patches/clang_incompatibilities.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Author: Steffen Moeller <steffen.moeller at uk-sh.de>
-Description: Tested compatibility with clang.
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -147,13 +147,13 @@
- libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
- libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
- libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
--libboinc_la_LIBADD =
-+libboinc_la_LIBADD = -lm -lstdc++
- 
- libboinc_crypt_la_SOURCES = crypt.cpp
- libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS)
- libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
- libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
--libboinc_crypt_la_LIBADD = 
-+libboinc_crypt_la_LIBADD =  -lm -lstdc++
- 
- 
- if ENABLE_FCGI
---- a/sched/make_work.cpp
-+++ b/sched/make_work.cpp
-@@ -176,9 +176,6 @@
-     char keypath[MAXPATHLEN];
-     char buf[BLOB_SIZE];
-     R_RSA_PRIVATE_KEY key;
--    int nwu_names = wu_names.size();
--    DB_WORKUNIT wus[nwu_names];
--    int i;
-     static int index=0;
- 
-     retval = config.parse_file();
-@@ -193,8 +190,11 @@
-         exit(1);
-     }
- 
--    for (i=0; i<nwu_names; i++) {
--        DB_WORKUNIT& wu = wus[i];
-+    const int nwu_names = wu_names.size();
-+    DB_WORKUNIT *wus = new DB_WORKUNIT[nwu_names]();
-+
-+    for (int i=0; i<nwu_names; i++) {
-+	DB_WORKUNIT& wu=wus[i];
-         sprintf(buf, "where name='%s'", wu_names[i].c_str());
-         retval = wu.lookup(buf);
-         if (retval) {
-@@ -265,6 +265,8 @@
- 
-         wait_for_results(new_wu_id);
-     }
-+
-+    delete [] wus;
- }
- 
- void usage(char *name) {
diff --git a/debian/patches/series b/debian/patches/series
index ebd6dac..cd008b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,7 +26,6 @@ parse_issues.patch
 #convinceDavid# client_path_char_array_length.patch
 # --- Z --- Currently not applicable
 #Z#no_std_string.patch
-clang_incompatibilities.patch
 #either these 3
 #convinceDavid# nvidia_detect_buffers.patch
 #convinceDavid# nvidia_detect_bugs.patch
@@ -67,3 +66,4 @@ fopen_closing.patch
 rrsim_iterator_cppcheck.patch
 filesys_error_message.patch
 de.po.patch
+more_clang_warnings.patch
diff --git a/debian/rules b/debian/rules
index 1e2ecb4..0d829dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,11 +8,14 @@
 #export CXX=/usr/lib/gcc-snapshot/bin/g++
 #export CPP=/usr/lib/gcc-snapshot/bin/cpp
 
+
 # Set default flags with dpkg-buildflags
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
+export CXX=clang++
+
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -103,20 +106,24 @@ ifeq ($(DEB_HOST_GNU_TYPE), i486-gnu)
   #TYPE_FLAGS += --with-boinc-platform=i686-pc-hurd-gnu
 endif
 
+ifneq (clang++,$(CXX))
+
 GCCVERSION=$(shell gcc --version | tr " " "\n" | egrep '^[0-9]+\.[0-9]+\.[0-9]+$$' | cut -f1,2 -d.)
 # gcc 4.6 on precise has issues while gcc 4.7 on sid is just fine
 ifneq (4.6,$(GCCVERSION))
 ifneq (4.5,$(GCCVERSION))
 ifneq (4.4,$(GCCVERSION))
-  CFLAGS += -flto
-  LDFLAGS += -flto
+ CFLAGS += -flto
+ LDFLAGS += -flto
 endif
 endif
 endif
 
+endif
+
 CFLAGS += -Wall
 CXXFLAGS += -Wall
-LDFLAGS += -Wl,--as-needed
+#LDFLAGS += -Wl,--as-needed
 # hurd needs the following
 LDFLAGS += -Wl,--no-add-needed
 
@@ -236,9 +243,11 @@ CXXFLAGS_plain = $(CFLAGS_plain)
 
 override_dh_auto_build: update-boinc-applinks.1
 	@echo
-	@echo "****        *****"
-	@echo "**** Making ****"
-	@echo "****        *****"
+	@echo "****            *****"
+	@echo "**** Making     *****"
+	@echo "****            *****"
+	@echo "**** CC=$(CC)   *****"
+	@echo "**** CXX=$(CXX) *****"
 	@echo
 	# disable optimization in api/, for SETI to work
 	$(MAKE) -C api CFLAGS="$(CFLAGS_noopt)" CXXFLAGS="$(CXXFLAGS_noopt)"

-- 
BOINC packaging

More information about the pkg-boinc-commits mailing list