diff -Nru libdispatch-0~svn197/debian/changelog libdispatch-0~svn197/debian/changelog --- libdispatch-0~svn197/debian/changelog 2012-08-10 14:08:42.000000000 +0000 +++ libdispatch-0~svn197/debian/changelog 2014-11-24 17:10:55.000000000 +0000 @@ -1,3 +1,37 @@ +libdispatch (0~svn197-3.3ubuntu2) vivid; urgency=medium + + * Strip -fstack-protector-strong from CFLAGS too. + + -- Colin Watson Mon, 24 Nov 2014 17:10:34 +0000 + +libdispatch (0~svn197-3.3ubuntu1) vivid; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - 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'. + + -- Colin Watson Mon, 24 Nov 2014 16:54:38 +0000 + +libdispatch (0~svn197-3.3) unstable; urgency=medium + + * Non-maintainer upload. + * Build successfully on mips/mipesl + Add -fPIC flag for mips/mipsel + Patch by Dejan Latinovic + Closes: #741943 + + -- Anibal Monsalve Salazar Mon, 17 Mar 2014 15:36:52 +0000 + +libdispatch (0~svn197-3.2) unstable; urgency=low + + * Non-maintainer upload. + * Detect GNU linker on host_os-es other than linux-gnu (Closes: #660671) + + -- Balint Reczey Tue, 12 Nov 2013 17:47:45 +0100 + libdispatch (0~svn197-3.1ubuntu1) quantal; urgency=low * Resynchronise with Debian. Remaining changes: diff -Nru libdispatch-0~svn197/debian/patches/libdispatch-r197_v2.patch libdispatch-0~svn197/debian/patches/libdispatch-r197_v2.patch --- libdispatch-0~svn197/debian/patches/libdispatch-r197_v2.patch 2011-06-29 02:07:22.000000000 +0000 +++ libdispatch-0~svn197/debian/patches/libdispatch-r197_v2.patch 2013-11-12 16:44:00.000000000 +0000 @@ -22,12 +22,12 @@ =================================================================== --- libdispatch-0~svn197.orig/m4/private-extern.m4 2011-06-28 22:06:52.000000000 -0400 +++ libdispatch-0~svn197/m4/private-extern.m4 2011-06-28 22:07:19.000000000 -0400 -@@ -19,7 +19,15 @@ +@@ -19,6 +19,17 @@ [dispatch_cv_private_extern=yes], [dispatch_cv_private_extern=no])]) --if test $dispatch_cv_private_extern = yes; then -+if test $host_os = "linux-gnu" ; then ++case $host_os in ++*gnu*) + # + # WORKAROUND: Building with clang and the GNU linker causes this error: + # @@ -35,10 +35,19 @@ + # + AC_DEFINE([__private_extern__], [extern], + [Define to a replacement for __private_extern]) -+elif test $dispatch_cv_private_extern = yes; then ++ ;; ++*) + if test $dispatch_cv_private_extern = yes; then AC_DEFINE(HAVE_PRIVATE_EXTERN, 1, Define if __private_extern__ present) elif test $dispatch_cv_hidden_visibility_attribute = yes; then - AC_DEFINE(HAVE_PRIVATE_EXTERN, 1, Define if __private_extern__ present) +@@ -29,5 +40,6 @@ + AC_DEFINE([__private_extern__], [extern], + [Define to a replacement for __private_extern]) + fi +- ++;; ++esac + ]) Index: libdispatch-0~svn197/src/queue.c =================================================================== --- libdispatch-0~svn197.orig/src/queue.c 2011-06-28 22:07:04.000000000 -0400 diff -Nru libdispatch-0~svn197/debian/rules libdispatch-0~svn197/debian/rules --- libdispatch-0~svn197/debian/rules 2012-08-10 14:07:54.000000000 +0000 +++ libdispatch-0~svn197/debian/rules 2014-11-24 17:10:09.000000000 +0000 @@ -1,6 +1,12 @@ #!/usr/bin/make -f -export CFLAGS := $(shell DEB_CFLAGS_MAINT_STRIP='-fstack-protector --param=ssp-buffer-size=4' dpkg-buildflags --get CFLAGS) +export CFLAGS := $(shell DEB_CFLAGS_MAINT_STRIP='-fstack-protector --param=ssp-buffer-size=4 -fstack-protector-strong' dpkg-buildflags --get CFLAGS) + +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +ifneq (,$(filter $(DEB_BUILD_ARCH), mips mipsel)) + CFLAGS+=-fPIC + export CFLAGS +endif #override_dh_auto_configure: # CC=clang ./configure --prefix=/usr