Source: imv
Version: 4.1.0-1
Tags: patch upstream
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

imv fails to cross build from source, because the upstream Makefile hard
codes the build architecture pkg-config. After making it substitutable,
imv cross builds successfully. Please consider applying the attached
patch.

Helmut
--- imv-4.1.0.orig/Makefile
+++ imv-4.1.0/Makefile
@@ -12,10 +12,11 @@
 INSTALL_MAN ?= install -m 0644
 INSTALL_PROGRAM ?= install -m 0755
 INSTALL_SCRIPT ?= install -m 0755
+PKG_CONFIG ?= pkg-config
 
-override CFLAGS += -std=c99 -W -Wall -Wpedantic -Wextra $(shell pkg-config --cflags pangocairo)
+override CFLAGS += -std=c99 -W -Wall -Wpedantic -Wextra $(shell $(PKG_CONFIG) --cflags pangocairo)
 override CPPFLAGS += -D_XOPEN_SOURCE=700
-override LIBS := -lGL -lpthread -lxkbcommon $(shell pkg-config --libs pangocairo) $(shell pkg-config --libs icu-io)
+override LIBS := -lGL -lpthread -lxkbcommon $(shell $(PKG_CONFIG) --libs pangocairo) $(shell $(PKG_CONFIG) --libs icu-io)
 override LIBS += -linih
 
 BUILDDIR ?= build
@@ -85,14 +86,14 @@
 
 ifeq ($(BACKEND_LIBRSVG),yes)
 	SOURCES += src/backend_librsvg.c
-	override CPPFLAGS += -DIMV_BACKEND_LIBRSVG $(shell pkg-config --cflags librsvg-2.0)
-	override LIBS += $(shell pkg-config --libs librsvg-2.0)
+	override CPPFLAGS += -DIMV_BACKEND_LIBRSVG $(shell $(PKG_CONFIG) --cflags librsvg-2.0)
+	override LIBS += $(shell $(PKG_CONFIG) --libs librsvg-2.0)
 endif
 
 ifeq ($(BACKEND_LIBNSGIF),yes)
 	SOURCES += src/backend_libnsgif.c
-	override CPPFLAGS += -DIMV_BACKEND_LIBNSGIF $(shell pkg-config --cflags libnsgif)
-	override LIBS += $(shell pkg-config --libs libnsgif)
+	override CPPFLAGS += -DIMV_BACKEND_LIBNSGIF $(shell $(PKG_CONFIG) --cflags libnsgif)
+	override LIBS += $(shell $(PKG_CONFIG) --libs libnsgif)
 endif
 
 
@@ -109,8 +110,8 @@
 
 override CPPFLAGS += -DIMV_VERSION=\""$(VERSION)"\"
 
-TFLAGS ?= -g $(CFLAGS) $(CPPFLAGS) $(shell pkg-config --cflags cmocka)
-TLIBS := $(LIBS) $(shell pkg-config --libs cmocka)
+TFLAGS ?= -g $(CFLAGS) $(CPPFLAGS) $(shell $(PKG_CONFIG) --cflags cmocka)
+TLIBS := $(LIBS) $(shell $(PKG_CONFIG) --libs cmocka)
 
 all: imv doc
 

Reply via email to