From 8533fc92eca62aeaa9d069bd069b9602e337ebe2 Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Tue, 19 Jun 2018 19:07:49 +0200 Subject: [PATCH] Add x11.pc pseudo-package for macOS The x11.pc file is missing on macOS (at least on Brew), and it was getting annoying to add ad-hoc rules in every makefile that required it. The hack here is to add one directly from make-it-quick. Putting the make-it-quick directory last should ensure this solution still works correclty if you have an actual x11.pc on your macOS system. --- config.macosx-clang.mk | 3 +++ x11.pc | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 x11.pc diff --git a/config.macosx-clang.mk b/config.macosx-clang.mk index 5d6f131..a1135eb 100644 --- a/config.macosx-clang.mk +++ b/config.macosx-clang.mk @@ -37,3 +37,6 @@ MIQ_SONAME_OPT= $(PRODUCTS_VERSION:%=-Wl,-install_name -Wl,$(MIQ_SONAME)) # On MacOSX, we will use basic frameworks e.g. for string and filesystem functions LDFLAGS_BUILDENV_macosx-clang= -framework CoreFoundation \ -framework CoreServices + +# Special case x11 package, missing on macOS, and unusual location - A bit yucky +export PKG_CONFIG_PATH:=$(PKG_CONFIG_PATH):$(MIQ) diff --git a/x11.pc b/x11.pc new file mode 100644 index 0000000..060fe3c --- /dev/null +++ b/x11.pc @@ -0,0 +1,5 @@ +Name: x11 +Description: Hacked x11 .pc file for make-it-quick on macOS +Libs: -L/usr/X11/lib +Cflags: -I/usr/X11/include +Version: 0.1