Fri Dec 4 11:32:40 2015 UTC ()
The built-in GLib wants __sync_bool_compare_and_swap_4, so compile for
i486 on NetBSD < 6


(hauke)
diff -r1.33 -r1.34 pkgsrc/devel/pkg-config/Makefile
cvs diff -r1.33 -r1.34 pkgsrc/devel/pkg-config/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/pkg-config/Makefile 2015/10/19 17:26:44 1.33
+++ pkgsrc/devel/pkg-config/Makefile 2015/12/04 11:32:40 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.33 2015/10/19 17:26:44 jperkin Exp $ 1# $NetBSD: Makefile,v 1.34 2015/12/04 11:32:40 hauke Exp $
2 2
3DISTNAME= pkg-config-0.29 3DISTNAME= pkg-config-0.29
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= http://pkgconfig.freedesktop.org/releases/ 5MASTER_SITES= http://pkgconfig.freedesktop.org/releases/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://pkgconfig.freedesktop.org/ 8HOMEPAGE= http://pkgconfig.freedesktop.org/
9COMMENT= System for managing library compile/link flags 9COMMENT= System for managing library compile/link flags
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12USE_LIBTOOL= yes 12USE_LIBTOOL= yes
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14CONFIGURE_ARGS+= --with-internal-glib 14CONFIGURE_ARGS+= --with-internal-glib
@@ -16,26 +16,30 @@ CONFIGURE_ARGS+= --disable-host-tool @@ -16,26 +16,30 @@ CONFIGURE_ARGS+= --disable-host-tool
16CONFIGURE_ARGS+= --disable-maintainer-mode 16CONFIGURE_ARGS+= --disable-maintainer-mode
17 17
18# old name of the package 18# old name of the package
19CONFLICTS= pkgconfig-[0-9]* 19CONFLICTS= pkgconfig-[0-9]*
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23.if ${OPSYS} == "IRIX" 23.if ${OPSYS} == "IRIX"
24# configure bails out in subdir after re-parsing the cache 24# configure bails out in subdir after re-parsing the cache
25CONFIGURE_ARGS+= --cache-file=/dev/null 25CONFIGURE_ARGS+= --cache-file=/dev/null
26.endif 26.endif
27 27
28.if ${OPSYS} == "NetBSD" 28.if ${OPSYS} == "NetBSD"
 29.if ${MACHINE_ARCH} == "i386" && !empty(OS_VERSION:M[12345].*)
 30# Built-in GLib wants __sync_bool_compare_and_swap_4
 31CFLAGS+= -march=i486
 32.endif
29post-configure: 33post-configure:
30 cd ${WRKSRC}/glib; \ 34 cd ${WRKSRC}/glib; \
31 ${GREP} -v HAVE_DTRACE config.h >config.h.new; \ 35 ${GREP} -v HAVE_DTRACE config.h >config.h.new; \
32 ${MV} config.h.new config.h 36 ${MV} config.h.new config.h
33.endif 37.endif
34 38
35.if ${OS_VARIANT} == "SCOOSR5" 39.if ${OS_VARIANT} == "SCOOSR5"
36# SCO OpenServer 5.0.7/3.2 has no IPv6 support. 40# SCO OpenServer 5.0.7/3.2 has no IPv6 support.
37CONFIGURE_ENV+= glib_cv_value_AF_INET6=yes 41CONFIGURE_ENV+= glib_cv_value_AF_INET6=yes
38.endif 42.endif
39 43
40.if ${OPSYS} == "SunOS" 44.if ${OPSYS} == "SunOS"
41CONFIGURE_ARGS+= --disable-dtrace 45CONFIGURE_ARGS+= --disable-dtrace