[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#968424: Makefile.flext hard codes the build architecture pkg-config



Package: pd-flext-dev
Version: 0.6.1-1
Tags: patch
User: debian-cross@lists.debian.org
Usertags: ftcbfs
Control: affects -1 + src:pd-xsample

pd-xsample fails to cross build from source, because it uses the build
architecture pkg-config. It does so via using Makefile.flext, where it
is hard coded. Please make pkg-config substitutable. I'm attaching a
patch for your convenience.

Helmut
diff --minimal -Nru pd-flext-0.6.1/debian/Makefile.flext pd-flext-0.6.1/debian/Makefile.flext
--- pd-flext-0.6.1/debian/Makefile.flext	2020-03-25 10:11:51.000000000 +0100
+++ pd-flext-0.6.1/debian/Makefile.flext	2020-08-15 06:52:02.000000000 +0200
@@ -32,14 +32,15 @@
 endif
 
 SRCDIR ?= .
+PKG_CONFIG ?= pkg-config
 
 lib.name = $(NAME)
 
 $(NAME).class.sources = $(addprefix $(SRCDIR)/, $(SRCS))
 
-cflags += $(INCPATH) $(DEFS) $(shell pkg-config --cflags pd-flext) $(UFLAGS)
+cflags += $(INCPATH) $(DEFS) $(shell $(PKG_CONFIG) --cflags pd-flext) $(UFLAGS)
 ldflags += $(LIBPATH)
-ldlibs += $(shell pkg-config --libs pd-flext) $(LIBS)
+ldlibs += $(shell $(PKG_CONFIG) --libs pd-flext) $(LIBS)
 
 ifeq (,$(findstring debug,$(MAKECMDGOALS)))
 cflags += $(OFLAGS)
diff --minimal -Nru pd-flext-0.6.1/debian/README.Debian pd-flext-0.6.1/debian/README.Debian
--- pd-flext-0.6.1/debian/README.Debian	2020-03-25 10:11:51.000000000 +0100
+++ pd-flext-0.6.1/debian/README.Debian	2020-08-15 06:52:02.000000000 +0200
@@ -14,4 +14,8 @@
 
 This requires the pd-lib-builder package to be installed.
 
+In a Debian package build, you should invoke make via dh_auto_build:
+
+    dh_auto_build --buildsystem=makefile -- -f /usr/share/pd-flext/dev/Makefile.flext
+
  -- IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>  Tue, 01 Nov 2016 23:49:16 +0100
diff --minimal -Nru pd-flext-0.6.1/debian/changelog pd-flext-0.6.1/debian/changelog
--- pd-flext-0.6.1/debian/changelog	2020-03-25 10:11:51.000000000 +0100
+++ pd-flext-0.6.1/debian/changelog	2020-08-15 06:52:02.000000000 +0200
@@ -1,3 +1,10 @@
+pd-flext (0.6.1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Make pkg-config substitutable in Makefile.flext. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sat, 15 Aug 2020 06:52:02 +0200
+
 pd-flext (0.6.1-1) unstable; urgency=medium
 
   * New upstream version 0.6.1

Reply to: