pkgsrc-Changes archive

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

CVS commit: pkgsrc/sysutils/cdrtools



Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jan 31 10:20:27 UTC 2018

Modified Files:
        pkgsrc/sysutils/cdrtools: Makefile

Log Message:
cdrtools: Support clang and handle PKGSRC_COMPILER correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/sysutils/cdrtools/Makefile

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

Modified files:

Index: pkgsrc/sysutils/cdrtools/Makefile
diff -u pkgsrc/sysutils/cdrtools/Makefile:1.114 pkgsrc/sysutils/cdrtools/Makefile:1.115
--- pkgsrc/sysutils/cdrtools/Makefile:1.114     Tue Sep 29 08:45:29 2015
+++ pkgsrc/sysutils/cdrtools/Makefile   Wed Jan 31 10:20:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2015/09/29 08:45:29 wiz Exp $
+# $NetBSD: Makefile,v 1.115 2018/01/31 10:20:26 jperkin Exp $
 
 DISTNAME=      cdrtools-3.01
 PKGNAME=       ${DISTNAME:S/a/alpha/:S/-pre/pre/}
@@ -51,8 +51,13 @@ MAKE_FLAGS+= GMAKE_NOWARN=true
 #MAKE_ENV+=    LINKMODE=dynamic
 
 # Map PKGSRC_COMPILER to CCOM used by cdrtools build system.
-ccmap.gcc=     gcc
-MAKE_FLAGS+=   CCOM=${ccmap.${PKGSRC_COMPILER}:Ucc}
+.if !empty(PKGSRC_COMPILER:Mclang)
+MAKE_FLAGS+=   CCOM=clang
+.elif !empty(PKGSRC_COMPILER:Mgcc)
+MAKE_FLAGS+=   CCOM=gcc
+.else
+MAKE_FLAGS+=   CCOM=cc
+.endif
 
 # allow us to override the default /etc/default/cdrecord by patching
 # the documentation appropriately. Additionally, we also provide a



Home | Main Index | Thread Index | Old Index