← Back to branch summary

~ubuntu-branches/ubuntu/raring/zthreads/raring

« back to all changes in this revision

Viewing changes to debian/patches/build_on_kFreeBSD.diff

  • Committer: Bazaar Package Importer
  • Author(s): Cleto Martin Angelina
  • Date: 2011-04-11 07:44:00 UTC
  • Revision ID: james.westby@ubuntu.com-20110411074400-q1bhy2ruyoj4n3zt
Tags: 2.3.2-3
http://bugs.debian.org/622173
http://bugs.debian.org/622174
* Bug fix: "FTFBS on kFreeBSD*", thanks to Andreas Metzler for the patch
  (Closes: #622173). Also removed '--with=quilt' option in debian/rules.
* Bug fix: "unversioned .so symlink shipped in runtime instead of devel
  package", thanks to Andreas Metzler (Closes: #622174).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/build_on_kFreeBSD.diff
 
1
Description: Fix build failure on kfreebsd*
 
2
 Originally found in hugin https://bugs.launchpad.net/hugin/+bug/684357
 
3
Author: Andreas Metzler <ametzler@debian.org>
 
4
 
 
5
--- zthreads-2.3.2.orig/include/zthread/Config.h
 
6
+++ zthreads-2.3.2/include/zthread/Config.h
 
7
@@ -107,11 +107,13 @@
 
8
 #  define ZT_POSIX
 
9
 
 
10
 // Check for well known platforms
 
11
+// __GLIBC__ matches GNU/kFreeBSD.
 
12
 #elif defined(__linux__) || \
 
13
       defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
 
14
       defined(__hpux) || \
 
15
       defined(__sgi) || \
 
16
-      defined(__sun)
 
17
+      defined(__sun) || \
 
18
+      defined(__GLIBC__)
 
19
 
 
20
 #  define ZT_POSIX
 
21