Sun Nov 24 01:02:37 2019 UTC ()
devel/glib: Fix compiler check via pkglint

AUTOFIX: Makefile:35: Replacing "${PKGSRC_COMPILER} == \"clang\"" with "${PKGSRC_COMPILER:Mclang}".

        The PKGSRC_COMPILER can be a list of chained compilers, e.g. "ccache
        distcc clang". Therefore, comparing it using == or != leads to wrong
        results in these cases.


(gdt)
diff -r1.95 -r1.96 pkgsrc/devel/glib/Makefile
cvs diff -r1.95 -r1.96 pkgsrc/devel/glib/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/glib/Makefile 2019/05/23 19:22:58 1.95
+++ pkgsrc/devel/glib/Makefile 2019/11/24 01:02:37 1.96
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.95 2019/05/23 19:22:58 rillig Exp $ 1# $NetBSD: Makefile,v 1.96 2019/11/24 01:02:37 gdt Exp $
2 2
3DISTNAME= glib-1.2.10 3DISTNAME= glib-1.2.10
4PKGREVISION= 11 4PKGREVISION= 11
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/1.2/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/1.2/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://developer.gnome.org/glib/ 9HOMEPAGE= https://developer.gnome.org/glib/
10COMMENT= Some useful routines for C programming (glib1) 10COMMENT= Some useful routines for C programming (glib1)
11LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
12 12
13CONFLICTS= gtk+-1.0.* 13CONFLICTS= gtk+-1.0.*
14 14
@@ -22,27 +22,27 @@ INFO_FILES= yes @@ -22,27 +22,27 @@ INFO_FILES= yes
22MAKE_JOBS_SAFE= no 22MAKE_JOBS_SAFE= no
23 23
24TEST_TARGET= check 24TEST_TARGET= check
25 25
26PTHREAD_OPTS+= require 26PTHREAD_OPTS+= require
27 27
28.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
29 29
30# Force the result of this configure test, because the testing technique 30# Force the result of this configure test, because the testing technique
31# breaks with NetBSD's native libpthread.so. 31# breaks with NetBSD's native libpthread.so.
32CONFIGURE_ENV.NetBSD+= glib_cv_rtldglobal_broken=no 32CONFIGURE_ENV.NetBSD+= glib_cv_rtldglobal_broken=no
33 33
34# Tests are insufficient, override with correct values. 34# Tests are insufficient, override with correct values.
35.if ${OPSYS} == "Darwin" && ${PKGSRC_COMPILER} == "clang" 35.if ${OPSYS} == "Darwin" && ${PKGSRC_COMPILER:Mclang}
36CONFIGURE_ENV+= glib_cv_has__inline=yes 36CONFIGURE_ENV+= glib_cv_has__inline=yes
37CONFIGURE_ENV+= glib_cv_has__inline__=yes 37CONFIGURE_ENV+= glib_cv_has__inline__=yes
38CONFIGURE_ENV+= glib_cv_hasinline=yes 38CONFIGURE_ENV+= glib_cv_hasinline=yes
39.endif 39.endif
40 40
41GLIB_VERSION= ${DISTNAME:S/glib-//} 41GLIB_VERSION= ${DISTNAME:S/glib-//}
42GLIB_MAJOR_VERSION= ${GLIB_VERSION:C/\..*//} 42GLIB_MAJOR_VERSION= ${GLIB_VERSION:C/\..*//}
43GLIB_MINOR_VERSION= ${GLIB_VERSION:C/[^.]*\.//:C/\..*//} 43GLIB_MINOR_VERSION= ${GLIB_VERSION:C/[^.]*\.//:C/\..*//}
44GLIB_MICRO_VERSION= ${GLIB_VERSION:C/.*\.//} 44GLIB_MICRO_VERSION= ${GLIB_VERSION:C/.*\.//}
45 45
46SUBST_CLASSES+= shlib1 46SUBST_CLASSES+= shlib1
47SUBST_MESSAGE.shlib1= Fixing shared library versions (part 1) 47SUBST_MESSAGE.shlib1= Fixing shared library versions (part 1)
48SUBST_STAGE.shlib1= pre-configure 48SUBST_STAGE.shlib1= pre-configure