Control: tag -1 + patch

On Mon, 20 Feb 2012 19:44:44 +0000, Stanley Pinchak wrote:

>      I have been attempting to build the libdispatch source package on the
> armel platform and have encountered a failure during the build process. 

There's a patch in Ubuntu that addresses this Debian bug.

Raw bug:
http://patches.ubuntu.com/libd/libdispatch/libdispatch_0~svn197-3.1ubuntu1.patch

Attached as a debdiff.


I'd like to test it before offering an NMU; I've asked DSA to install
the build-deps on an armel box now but if someone can test it that
would also be fine.

Cheers,
gregor

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Rolling Stones: Outlaws
diff -Nru libdispatch-0~svn197/debian/changelog libdispatch-0~svn197/debian/changelog
--- libdispatch-0~svn197/debian/changelog	2012-07-09 19:06:11.000000000 +0200
+++ libdispatch-0~svn197/debian/changelog	2012-08-12 16:10:57.000000000 +0200
@@ -1,3 +1,17 @@
+libdispatch (0~svn197-3.2) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "Fails to build (link dispatch_starfish) on armel":
+    merge changes from Ubuntu / Colin Watson:
+    - Strip --param=ssp-buffer-size=4 from CFLAGS; clang doesn't support it
+      and so we end up omitting Blocks support.
+    - Strip -fstack-protector from CFLAGS; this causes a link failure with
+      clang on at least some architectures.
+    - Fix build with 'ld --no-add-needed'.
+    (Closes: #660671)
+
+ -- gregor herrmann <gre...@debian.org>  Sun, 12 Aug 2012 15:57:16 +0200
+
 libdispatch (0~svn197-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru libdispatch-0~svn197/debian/patches/series libdispatch-0~svn197/debian/patches/series
--- libdispatch-0~svn197/debian/patches/series	2012-07-09 19:10:58.000000000 +0200
+++ libdispatch-0~svn197/debian/patches/series	2012-08-12 15:56:59.000000000 +0200
@@ -1,3 +1,4 @@
 libdispatch-r197_v2.patch
 disable_dispatch_read.patch
 avoid-mfence-on-i386.patch
+testing-linkage.patch
diff -Nru libdispatch-0~svn197/debian/patches/testing-linkage.patch libdispatch-0~svn197/debian/patches/testing-linkage.patch
--- libdispatch-0~svn197/debian/patches/testing-linkage.patch	1970-01-01 01:00:00.000000000 +0100
+++ libdispatch-0~svn197/debian/patches/testing-linkage.patch	2012-08-12 15:56:59.000000000 +0200
@@ -0,0 +1,19 @@
+Description: Fix build with 'ld --no-add-needed'
+Author: Colin Watson <cjwat...@ubuntu.com>
+Bug-Debian: http://bugs.debian.org/660671
+Forwarded: no
+Last-Update: 2012-04-23
+
+Index: b/testing/Makefile.am
+===================================================================
+--- a/testing/Makefile.am
++++ b/testing/Makefile.am
+@@ -81,7 +81,7 @@
+ noinst_PROGRAMS+=$(TOOLS)
+ 
+ INCLUDES=-I$(top_builddir) -I$(top_srcdir)
+-LDADD=libtest.la ../src/libdispatch.la
++LDADD=libtest.la ../src/libdispatch.la ../src/libshims.la
+ CFLAGS=-Wall $(MARCH_FLAGS) $(CBLOCKS_FLAGS)
+ CXXFLAGS=-Wall $(MARCH_FLAGS) $(CXXBLOCKS_FLAGS)
+ 
diff -Nru libdispatch-0~svn197/debian/rules libdispatch-0~svn197/debian/rules
--- libdispatch-0~svn197/debian/rules	2011-06-29 04:08:06.000000000 +0200
+++ libdispatch-0~svn197/debian/rules	2012-08-12 15:56:59.000000000 +0200
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export CFLAGS := $(shell DEB_CFLAGS_MAINT_STRIP='-fstack-protector --param=ssp-buffer-size=4' dpkg-buildflags --get CFLAGS)
+
 #override_dh_auto_configure:
 #	CC=clang ./configure --prefix=/usr
 

Attachment: signature.asc
Description: Digital signature

Reply via email to