#2189 Can't build for GTK when different pkg-config needed

[Neil Hodgson]

From Andreas Rönnquist:

Andreas Ronnquist has requested to merge changes from ssh://@hg.code.sf.net/u/gusnan/scintilla-scite at commit [297b14] into the branch default

Fixes failing to cross build by using the build architecture toolchain.

(See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=900016 )

It makes it possible to customize pkg-config by a PKG_CONFIG variable, defaulting to pkg-config.
(I will also prepare a merge request for the coresponding change in scintilla).

--- a/gtk/makefile  Tue Jul 21 19:53:02 2020 +1000
+++ b/gtk/makefile  Tue Jul 21 16:19:16 2020 +0200
@@ -26,15 +26,16 @@
 else
 WARNINGS += -Wno-misleading-indentation
 endif
+PKG_CONFIG ?= pkg-config

 GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0)

 PYTHON = $(if $(windir),pyw,python3)

 # For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
-CONFIGFLAGS:=$(shell pkg-config --cflags $(GTK_VERSION))
-CONFIGLIB:=$(shell pkg-config --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0)
-gnomeprefix:=$(shell pkg-config --variable=prefix $(GTK_VERSION) 2>/dev/null)
+CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION))
+CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0)
+gnomeprefix:=$(shell $(PKG_CONFIG) --variable=prefix $(GTK_VERSION) 2>/dev/null)
 ifndef prefix
 ifdef gnomeprefix
   prefix=$(gnomeprefix)

Andreas Ronnquist has requested to merge changes from ssh://@hg.code.sf.net/u/gusnan/scintilla at commit [1fc61c] into the branch default

Fixes failing to cross build by using the build architecture toolchain.

(See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=900016 )

It makes it possible to customize pkg-config by a PKG_CONFIG variable, defaulting to pkg-config.
(Merge request already place for the SciTE repo).

--- a/gtk/makefile  Tue Jul 21 19:52:00 2020 +1000
+++ b/gtk/makefile  Tue Jul 21 16:09:56 2020 +0200
@@ -39,6 +39,7 @@
 endif
 ARFLAGS = rc
 RANLIB ?= ranlib
+PKG_CONFIG ?= pkg-config

 GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0)

@@ -88,8 +89,8 @@
 CXX_BASE_FLAGS =--std=c++17 $(BASE_FLAGS)
 CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS) $(CONFIG_FLAGS)

-CONFIG_FLAGS:=$(shell pkg-config --cflags $(GTK_VERSION))
-CONFIGLIB:=$(shell pkg-config --libs $(GTK_VERSION) gmodule-no-export-2.0)
+CONFIG_FLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION))
+CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gmodule-no-export-2.0)
 MARSHALLER=scintilla-marshal.o

 all: $(COMPLIB) $(COMPONENT) $(LEXILLA)

[Neil Hodgson]

Fixed with [714e73], [4cf572].

[Neil Hodgson]

Fixed with [714e73], [4cf572].