pkgsrc-Changes archive

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

CVS commit: pkgsrc/print/poppler-glib



Module Name:    pkgsrc
Committed By:   brook
Date:           Mon Feb 24 17:29:26 UTC 2020

Modified Files:
        pkgsrc/print/poppler-glib: Makefile

Log Message:
Fix breakage on Darwin.

MacOS does not provide /usr/include, but it sneaks into some command lines
and causes errors.  Be explicit about the path to glib2 to avoid this.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/print/poppler-glib/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/poppler-glib/Makefile
diff -u pkgsrc/print/poppler-glib/Makefile:1.81 pkgsrc/print/poppler-glib/Makefile:1.82
--- pkgsrc/print/poppler-glib/Makefile:1.81     Fri Jan 10 13:24:19 2020
+++ pkgsrc/print/poppler-glib/Makefile  Mon Feb 24 17:29:25 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2020/01/10 13:24:19 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2020/02/24 17:29:25 brook Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -10,6 +10,13 @@ CONFLICTS+=  poppler<0.4.5nb1
 
 PKGCONFIG_OVERRIDE+=   ${WRKSRC}/poppler-glib.pc.cmake
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+# MacOS Xcode does not provide /usr/include, so be explicit
+CMAKE_ARGS+=   -DGLIB2_INCLUDE_DIRS=${PREFIX}/include
+.endif
+
 # Don't build the splash graphics backend.
 CMAKE_ARGS+=   -DENABLE_SPLASH=OFF
 # Don't compile GTK+ test program.



Home | Main Index | Thread Index | Old Index