From c02ccbc6fc0ad4fff7996ae36d2b3b64214c19c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 17 Aug 2017 10:59:49 +0200 Subject: [PATCH] Merge link patch from Ubuntu --- debian/changelog | 7 +++++++ debian/patches/link-pthread.diff | 32 ++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 40 insertions(+) create mode 100644 debian/patches/link-pthread.diff diff --git a/debian/changelog b/debian/changelog index 24e31f0..a9116b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +protobuf (2.5.0-9.1) unstable; urgency=medium + + * Non-maintainer upload. + * Merge link patch from Debian/Ubuntu + + -- František Dvořák Thu, 17 Aug 2017 10:57:50 +0200 + protobuf (2.5.0-9) unstable; urgency=medium * Upload to unstable. diff --git a/debian/patches/link-pthread.diff b/debian/patches/link-pthread.diff new file mode 100644 index 0000000..aae10d4 --- /dev/null +++ b/debian/patches/link-pthread.diff @@ -0,0 +1,32 @@ +Fixing as-needed issue + +http://bugs.gentoo.org/show_bug.cgi?id=271509 + +Index: debian/m4/acx_pthread.m4 +=================================================================== +--- debian.orig/m4/acx_pthread.m4 ++++ debian/m4/acx_pthread.m4 +@@ -278,7 +278,8 @@ + fi + fi + +- if test x"$done" = xno; then ++ if test x"$done" = xyes; then ++ done="no" + AC_MSG_CHECKING([whether -pthread is sufficient with -shared]) + AC_TRY_LINK([#include ], + [pthread_t th; pthread_join(th, 0); +Index: debian/gtest/m4/acx_pthread.m4 +=================================================================== +--- debian.orig/gtest/m4/acx_pthread.m4 ++++ debian/gtest/m4/acx_pthread.m4 +@@ -278,7 +278,8 @@ + fi + fi + +- if test x"$done" = xno; then ++ if test x"$done" = xyes; then ++ done="no" + AC_MSG_CHECKING([whether -pthread is sufficient with -shared]) + AC_TRY_LINK([#include ], + [pthread_t th; pthread_join(th, 0); diff --git a/debian/patches/series b/debian/patches/series index f0d4f77..3acda5d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,6 @@ # comment to keep empty file in the diff.gz disable-setuptools-download.diff arm_optimization.diff +link-pthread.diff revert_upstream_issue_388_about_rpath.diff fix-ftbfs-upstream-issue-488.patch -- 1.8.2.3