From: Ralf Jung <post@ralfj.de>
Date: Sun, 3 Dec 2017 18:01:18 +0000 (+0100)
Subject: fix using target-architecture pkg-config
X-Git-Tag: debian/1.3.2-9~3
X-Git-Url: https://git.ralfj.de/osspd.git/commitdiff_plain/1391bb23599f1be06ee33561459ac766bb2f2381?ds=sidebyside

fix using target-architecture pkg-config

Patch by Helmut Grohne <helmut@subdivi.de>.  Thanks a lot!
---

diff --git a/debian/changelog b/debian/changelog
index 8c6d610..623b7d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 osspd (1.3.2-9) UNRELEASED; urgency=medium
 
   * WIP.
+  * Fix using target-architecture pkg-config. Patch by
+    Helmut Grohne <helmut@subdivi.de>.  (Closes: #882365)
 
  -- Ralf Jung <post@ralfj.de>  Sun, 03 Dec 2017 18:56:55 +0100
 
diff --git a/debian/patches/0006-cross.patch b/debian/patches/0006-cross.patch
new file mode 100644
index 0000000..f30844e
--- /dev/null
+++ b/debian/patches/0006-cross.patch
@@ -0,0 +1,50 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Tue, 21 Nov 2017 21:20:20 +0100
+Subject: fix using target-architecture pkg-config
+
+Index: osspd-1.3.2/Makefile
+===================================================================
+--- osspd-1.3.2.orig/Makefile
++++ osspd-1.3.2/Makefile
+@@ -2,6 +2,7 @@
+ # DESTDIR is completely respected
+ CC := gcc
+ AR := ar
++PKG_CONFIG ?= pkg-config
+ CFLAGS := -Wall -pthread $(CFLAGS) $(CPPFLAGS)
+ XLDFLAGS := $(LDFLAGS)
+ LDFLAGS := -L. -lossp -pthread $(LDFLAGS)
+@@ -11,27 +12,27 @@
+ SLAVESDIR := $(prefix)/sbin
+ 
+ ifeq "$(origin OSSPD_CFLAGS)" "undefined"
+-OSSPD_CFLAGS := $(shell pkg-config --cflags fuse)
++OSSPD_CFLAGS := $(shell $(PKG_CONFIG) --cflags fuse)
+ endif
+ 
+ ifeq "$(origin OSSPD_LDFLAGS)" "undefined"
+-OSSPD_LDFLAGS := $(shell pkg-config --libs fuse)
++OSSPD_LDFLAGS := $(shell $(PKG_CONFIG) --libs fuse)
+ endif
+ 
+ ifeq "$(origin OSSP_PADSP_CFLAGS)" "undefined"
+-OSSP_PADSP_CFLAGS := $(shell pkg-config --cflags libpulse)
++OSSP_PADSP_CFLAGS := $(shell $(PKG_CONFIG) --cflags libpulse)
+ endif
+ 
+ ifeq "$(origin OSSP_PADSP_LDFLAGS)" "undefined"
+-OSSP_PADSP_LDFLAGS := $(shell pkg-config --libs libpulse)
++OSSP_PADSP_LDFLAGS := $(shell $(PKG_CONFIG) --libs libpulse)
+ endif
+ 
+ ifeq "$(origin OSSP_ALSAP_CFLAGS)" "undefined"
+-OSSP_ALSAP_CFLAGS := $(shell pkg-config --libs alsa)
++OSSP_ALSAP_CFLAGS := $(shell $(PKG_CONFIG) --libs alsa)
+ endif
+ 
+ ifeq "$(origin OSSP_ALSAP_LDFLAGS)" "undefined"
+-OSSP_ALSAP_LDFLAGS := $(shell pkg-config --libs alsa)
++OSSP_ALSAP_LDFLAGS := $(shell $(PKG_CONFIG) --libs alsa)
+ endif
+ 
+ headers := ossp.h ossp-util.h ossp-slave.h
diff --git a/debian/patches/series b/debian/patches/series
index fca6f92..b6c45ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 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
+0006-cross.patch