Wed Nov 8 14:03:42 2017 UTC ()
glib2: make sure gtk-doc is not found

Use same hack as libidn2.


(wiz)
diff -r1.237 -r1.238 pkgsrc/devel/glib2/Makefile
cvs diff -r1.237 -r1.238 pkgsrc/devel/glib2/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/glib2/Makefile 2017/10/16 00:40:08 1.237
+++ pkgsrc/devel/glib2/Makefile 2017/11/08 14:03:42 1.238
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.237 2017/10/16 00:40:08 prlw1 Exp $ 1# $NetBSD: Makefile,v 1.238 2017/11/08 14:03:42 wiz Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5CATEGORIES= devel gnome 5CATEGORIES= devel gnome
6 6
7COMMENT= Some useful routines for C programming (glib2) 7COMMENT= Some useful routines for C programming (glib2)
8 8
9USE_TOOLS+= msgfmt perl:run readlink 9USE_TOOLS+= msgfmt perl:run readlink
10 10
11PKGCONFIG_OVERRIDE+= glib-2.0.pc.in 11PKGCONFIG_OVERRIDE+= glib-2.0.pc.in
12PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in 12PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in
13PKGCONFIG_OVERRIDE+= gmodule-export-2.0.pc.in 13PKGCONFIG_OVERRIDE+= gmodule-export-2.0.pc.in
14PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0.pc.in 14PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0.pc.in
@@ -44,24 +44,31 @@ CPPFLAGS.SunOS+= -DBSD_COMP @@ -44,24 +44,31 @@ CPPFLAGS.SunOS+= -DBSD_COMP
44.if ${OBJECT_FMT} == "ELF" 44.if ${OBJECT_FMT} == "ELF"
45. if ${OPSYS} == "SunOS" 45. if ${OPSYS} == "SunOS"
46. if empty(ABI:U:M64) 46. if empty(ABI:U:M64)
47# Solaris libelf in 32-bit mode does not support largefile. We patch files 47# Solaris libelf in 32-bit mode does not support largefile. We patch files
48# individually to force _FILE_OFFSET_BITS=32 but need to turn back on -lelf 48# individually to force _FILE_OFFSET_BITS=32 but need to turn back on -lelf
49# after configure disabled it. 49# after configure disabled it.
50CONFIGURE_ENV+= LIBELF_LIBS='-lelf' 50CONFIGURE_ENV+= LIBELF_LIBS='-lelf'
51. endif 51. endif
52. else 52. else
53. include "../../devel/libelf/buildlink3.mk" 53. include "../../devel/libelf/buildlink3.mk"
54. endif 54. endif
55.endif 55.endif
56 56
 57# XXX: Kludge to avoid uncoditionally pick up some gtkdoc-* tools if gtk-doc
 58# XXX: package is installed and then fails in the installation phase.
 59CONFIGURE_ENV+= ac_cv_prog_GTKDOC_CHECK= \
 60 ac_cv_path_GTKDOC_CHECK_PATH= \
 61 ac_cv_path_GTKDOC_REBASE= \
 62 ac_cv_path_GTKDOC_MKPDF=
 63
57# to run gdbus-codegen to generate gdbus-daemon-generated.{h,c} 64# to run gdbus-codegen to generate gdbus-daemon-generated.{h,c}
58TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 65TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
59PYTHON_FOR_BUILD_ONLY?= yes 66PYTHON_FOR_BUILD_ONLY?= yes
60.include "../../lang/python/pyversion.mk" 67.include "../../lang/python/pyversion.mk"
61 68
62.include "../../converters/libiconv/buildlink3.mk" 69.include "../../converters/libiconv/buildlink3.mk"
63.include "../../devel/gettext-lib/buildlink3.mk" 70.include "../../devel/gettext-lib/buildlink3.mk"
64.include "../../devel/pcre/buildlink3.mk" 71.include "../../devel/pcre/buildlink3.mk"
65.include "../../devel/zlib/buildlink3.mk" 72.include "../../devel/zlib/buildlink3.mk"
66.include "../../devel/libffi/buildlink3.mk" 73.include "../../devel/libffi/buildlink3.mk"
67.include "../../mk/bsd.pkg.mk" 74.include "../../mk/bsd.pkg.mk"