From: Ralf Jung <post@ralfj.de>
Date: Sat, 11 May 2013 12:25:49 +0000 (+0200)
Subject: Add -pthread compiler and linker flag
X-Git-Tag: debian/1.3.2-3~2
X-Git-Url: https://git.ralfj.de/osspd.git/commitdiff_plain/6aa43f6595ef8bf4d361362ae1e1e3953d9c3149

Add -pthread compiler and linker flag
---

diff --git a/debian/changelog b/debian/changelog
index d32608f..64085c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ osspd (1.3.2-3) UNRELEASED; urgency=low
   * Provide oss-compat, as we provide OSS, and conflict with it
     since it takes the OSS major/minor numbers.
   * Update Standards-Version to 3.9.4. No changes needed.
+  * Add "-pthreads" compiler and linker flag. Patch based on Ubuntu
+    patch by Logan Rosen <logan@ubuntu.com>.
 
  -- Ralf Jung <post@ralfj.de>  Wed, 08 May 2013 13:08:08 +0200
 
diff --git a/debian/patches/0005-Add-pthread-compiler-and-linker-flag.patch b/debian/patches/0005-Add-pthread-compiler-and-linker-flag.patch
new file mode 100644
index 0000000..f2e4424
--- /dev/null
+++ b/debian/patches/0005-Add-pthread-compiler-and-linker-flag.patch
@@ -0,0 +1,25 @@
+From: Ralf Jung <post@ralfj.de>
+Date: Sat, 11 May 2013 14:24:17 +0200
+Subject: Add -pthread compiler and linker flag
+
+(based on patch in Ubuntu by Logan Rosen <logan@ubuntu.com>)
+---
+ Makefile |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 236176e..11f2836 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,9 +2,9 @@
+ # DESTDIR is completely respected
+ CC := gcc
+ AR := ar
+-CFLAGS := -Wall $(CFLAGS) $(CPPFLAGS)
++CFLAGS := -Wall -pthread $(CFLAGS) $(CPPFLAGS)
+ XLDFLAGS := $(LDFLAGS)
+-LDFLAGS := -L. -lossp $(LDFLAGS)
++LDFLAGS := -L. -lossp -pthread $(LDFLAGS)
+ prefix := /usr/local
+ DESTDIR :=
+ UDEVDIR := /etc/udev/rules.d
diff --git a/debian/patches/series b/debian/patches/series
index 80e712c..fca6f92 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-honor-CPPFLAGS.patch
 0003-PA-recommends-users-not-to-be-in-the-audio-group-so-.patch
 0004-Allow-to-set-slave-installation-path-during-compilat.patch
+0005-Add-pthread-compiler-and-linker-flag.patch