Sat Apr 9 06:11:15 2016 UTC ()
Fix ABI check on SunOS, which defaults to i386 in absence of being set.
Fixes build on i386 with bootstrap not stipulating ABI=


(richard)
diff -r1.228 -r1.229 pkgsrc/devel/glib2/Makefile
cvs diff -r1.228 -r1.229 pkgsrc/devel/glib2/Makefile (switch to unified diff)

--- pkgsrc/devel/glib2/Makefile 2016/04/07 18:33:05 1.228
+++ pkgsrc/devel/glib2/Makefile 2016/04/09 06:11:15 1.229
@@ -1,62 +1,62 @@ @@ -1,62 +1,62 @@
1# $NetBSD: Makefile,v 1.228 2016/04/07 18:33:05 prlw1 Exp $ 1# $NetBSD: Makefile,v 1.229 2016/04/09 06:11:15 richard 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
15PKGCONFIG_OVERRIDE+= gobject-2.0.pc.in 15PKGCONFIG_OVERRIDE+= gobject-2.0.pc.in
16PKGCONFIG_OVERRIDE+= gthread-2.0.pc.in 16PKGCONFIG_OVERRIDE+= gthread-2.0.pc.in
17PKGCONFIG_OVERRIDE+= gio-2.0.pc.in 17PKGCONFIG_OVERRIDE+= gio-2.0.pc.in
18PKGCONFIG_OVERRIDE+= gio-unix-2.0.pc.in 18PKGCONFIG_OVERRIDE+= gio-unix-2.0.pc.in
19PKGCONFIG_OVERRIDE+= gio-windows-2.0.pc.in 19PKGCONFIG_OVERRIDE+= gio-windows-2.0.pc.in
20 20
21FILES_SUBST+= GIO_MODULES_DIR=${PREFIX}/lib/gio/modules 21FILES_SUBST+= GIO_MODULES_DIR=${PREFIX}/lib/gio/modules
22FILES_SUBST+= GIO_QUERYMODULES=${PREFIX}/bin/gio-querymodules 22FILES_SUBST+= GIO_QUERYMODULES=${PREFIX}/bin/gio-querymodules
23FILES_SUBST+= GLIB_COMPILE_SCHEMAS=${PREFIX}/bin/glib-compile-schemas 23FILES_SUBST+= GLIB_COMPILE_SCHEMAS=${PREFIX}/bin/glib-compile-schemas
24FILES_SUBST+= GLIB_SCHEMAS_DIR=${PREFIX}/share/glib-2.0/schemas 24FILES_SUBST+= GLIB_SCHEMAS_DIR=${PREFIX}/share/glib-2.0/schemas
25 25
26# gtester is the glib unit testing and reporting framework 26# gtester is the glib unit testing and reporting framework
27# agc doesn't want glib2 to depend on python so we install it 27# agc doesn't want glib2 to depend on python so we install it
28# in a broken and useless state. 28# in a broken and useless state.
29CHECK_INTERPRETER_SKIP+= bin/gtester-report 29CHECK_INTERPRETER_SKIP+= bin/gtester-report
30CHECK_INTERPRETER_SKIP+= bin/gdbus-codegen 30CHECK_INTERPRETER_SKIP+= bin/gdbus-codegen
31 31
32# need pcre utf8 + unicode-properties 32# need pcre utf8 + unicode-properties
33BUILDLINK_API_DEPENDS.pcre+= pcre>=8.31 33BUILDLINK_API_DEPENDS.pcre+= pcre>=8.31
34# to avoid pkg-config dependency, explicitly specify pcre location 34# to avoid pkg-config dependency, explicitly specify pcre location
35CONFIGURE_ARGS+= PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include 35CONFIGURE_ARGS+= PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include
36CONFIGURE_ARGS+= PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -L${BUILDLINK_PREFIX.pcre}/lib -lpcre" 36CONFIGURE_ARGS+= PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -L${BUILDLINK_PREFIX.pcre}/lib -lpcre"
37 37
38# needs gz_header structure 38# needs gz_header structure
39BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.2.1 39BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.2.1
40 40
41LIBS.SunOS+= -lnsl -lsocket 41LIBS.SunOS+= -lnsl -lsocket
42CPPFLAGS.SunOS+= -DBSD_COMP 42CPPFLAGS.SunOS+= -DBSD_COMP
43 43
44.if ${OBJECT_FMT} == "ELF" 44.if ${OBJECT_FMT} == "ELF"
45. if ${OPSYS} == "SunOS" 45. if ${OPSYS} == "SunOS"
46. if ${ABI} == 32 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.include "../../converters/libiconv/buildlink3.mk" 57.include "../../converters/libiconv/buildlink3.mk"
58.include "../../devel/gettext-lib/buildlink3.mk" 58.include "../../devel/gettext-lib/buildlink3.mk"
59.include "../../devel/pcre/buildlink3.mk" 59.include "../../devel/pcre/buildlink3.mk"
60.include "../../devel/zlib/buildlink3.mk" 60.include "../../devel/zlib/buildlink3.mk"
61.include "../../devel/libffi/buildlink3.mk" 61.include "../../devel/libffi/buildlink3.mk"
62.include "../../mk/bsd.pkg.mk" 62.include "../../mk/bsd.pkg.mk"