pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/sysutils/cdrtools cdrtools: fix build w/ clang



details:   https://anonhg.NetBSD.org/pkgsrc/rev/77e4c181a202
branches:  trunk
changeset: 312197:77e4c181a202
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue Aug 28 11:32:33 2018 +0000

description:
cdrtools: fix build w/ clang

diffstat:

 sysutils/cdrtools/Makefile |  15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r 0b3a506e4d1a -r 77e4c181a202 sysutils/cdrtools/Makefile
--- a/sysutils/cdrtools/Makefile        Tue Aug 28 11:06:18 2018 +0000
+++ b/sysutils/cdrtools/Makefile        Tue Aug 28 11:32:33 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2018/07/04 13:40:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.118 2018/08/28 11:32:33 tnn Exp $
 
 DISTNAME=      cdrtools-3.01
 PKGNAME=       ${DISTNAME:S/a/alpha/:S/-pre/pre/}
@@ -102,12 +102,17 @@
 
 do-configure:
        cd ${WRKSRC}/RULES;                                             \
-       for suffix in netbsd-cc.rul netbsd-gcc.rul; do                  \
-               if [ ! -f ${MACHINE}-$$suffix ]; then                   \
-                       ln -sf i386-$$suffix ${MACHINE}-$$suffix;       \
+       if [ ! -e i386-netbsd-clang.rul ]; then                         \
+               ln -s i386-netbsd-gcc.rul i386-netbsd-clang.rul;        \
+       fi;                                                             \
+       for suffix in netbsd-cc.rul netbsd-gcc.rul netbsd-clang.rul; do \
+               if [ ! -e ${MACHINE}-$$suffix ]; then                   \
+                       ln -s i386-$$suffix ${MACHINE}-$$suffix;        \
                fi;                                                     \
        done;                                                           \
-       $(CP) -fp i386-darwin-clang.rul x86_64-darwin-clang.rul
+       if [ ! -e x86_64-darwin-clang.rul ]; then                       \
+               ln -s i386-darwin-clang.rul x86_64-darwin-clang.rul;    \
+       fi
        cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} config
 
 post-build:



Home | Main Index | Thread Index | Old Index