From b18c532e6ecd247c16c309db2b6ebfb2d9d9b929 Mon Sep 17 00:00:00 2001 From: rillig Date: Mon, 1 Jan 2018 18:16:35 +0000 Subject: Replaced $(ROUND) with ${CURLY} variable references. This has been a pkglint warning for several years now, and pkglint can even fix it automatically. And it did for this commit. Only in lang/mercury, two passes of autofixing were necessary because there were nested variables. --- parallel/gridscheduler/Makefile | 4 ++-- parallel/openmpi/Makefile | 6 +++--- parallel/slurm/Makefile | 12 ++++++------ parallel/threadingbuildingblocks/Makefile | 18 +++++++++--------- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'parallel') diff --git a/parallel/gridscheduler/Makefile b/parallel/gridscheduler/Makefile index 63996520451..763d8a6c9c5 100644 --- a/parallel/gridscheduler/Makefile +++ b/parallel/gridscheduler/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2016/07/09 06:38:47 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2018/01/01 18:16:38 rillig Exp $ PKGNAME= gridscheduler-2011.11.1 PKGREVISION= 2 @@ -87,7 +87,7 @@ PKG_FAIL_REASON+= "SGE_ARCH and SGE_BUILDARCH need to be configured for your OS" SGE_BUILDARCH?= ${SGE_BUILDARCH_cmd:sh} # Some hacks to get it properly linked: -MAKE_ENV+= SGE_ARCH=$(SGE_ARCH) SGE_ROOT=$(SGE_ROOT) +MAKE_ENV+= SGE_ARCH=${SGE_ARCH} SGE_ROOT=${SGE_ROOT} LDFLAGS+= -R${SGE_ROOT}/lib/${SGE_ARCH} BUILDLINK_PASSTHRU_RPATHDIRS+= ${SGE_ROOT}/lib/${SGE_ARCH} diff --git a/parallel/openmpi/Makefile b/parallel/openmpi/Makefile index e0f6c3dfc4d..7b34d015844 100644 --- a/parallel/openmpi/Makefile +++ b/parallel/openmpi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2016/10/23 14:02:28 asau Exp $ +# $NetBSD: Makefile,v 1.37 2018/01/01 18:16:38 rillig Exp $ DISTNAME= openmpi-1.10.4 CATEGORIES= parallel @@ -20,8 +20,8 @@ SHLIBTOOL_OVERRIDE= ${WRKSRC}/config/libtool.m4 CONFIGURE_ARGS+= --without-slurm CONFIGURE_ARGS+= --enable-contrib-no-build=vt # in separate package -CONFIGURE_ARGS+= --with-libltdl=$(BUILDLINK_PREFIX.libltdl:Q) # use our libltdl -CONFIGURE_ARGS+= --with-hwloc=$(BUILDLINK_PREFIX.hwloc:Q) #external +CONFIGURE_ARGS+= --with-libltdl=${BUILDLINK_PREFIX.libltdl:Q} # use our libltdl +CONFIGURE_ARGS+= --with-hwloc=${BUILDLINK_PREFIX.hwloc:Q} #external CONFIGURE_ARGS+= --with-wrapper-ldflags="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" CONFIGURE_ENV+= ompi_cv_f77_have_INTEGERp8=no # no "INTEGER*8"?? CONFIGURE_ARGS+= OPAL_HAVE_LTDL_ADVISE=0 diff --git a/parallel/slurm/Makefile b/parallel/slurm/Makefile index 0fa1116e3ae..fdddbae689f 100644 --- a/parallel/slurm/Makefile +++ b/parallel/slurm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2017/01/19 18:52:21 agc Exp $ +# $NetBSD: Makefile,v 1.23 2018/01/01 18:16:38 rillig Exp $ DISTNAME= slurm-2.6.4 PKGREVISION= 9 @@ -20,7 +20,7 @@ USE_LIBTOOL= yes CONFIGURE_ARGS+= --with-hdf5=no # Fix installation: -CONFIGURE_ARGS+= --htmldir=$(PREFIX)/share/doc/$(PKGNAME_NOREV)/html +CONFIGURE_ARGS+= --htmldir=${PREFIX}/share/doc/${PKGNAME_NOREV}/html REPLACE_PYTHON= doc/html/shtml2html.py @@ -28,18 +28,18 @@ PKG_GROUPS= slurm PKG_USERS= slurm:slurm PKG_GECOS.slurm= SLURM user -PKG_SHELL.slurm= $(NOLOGIN) +PKG_SHELL.slurm= ${NOLOGIN} RCD_SCRIPTS+= slurmd slurmctld post-install: - $(INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/examples/$(PKGBASE) - $(INSTALL_DATA) $(WRKSRC)/etc/* $(DESTDIR)$(PREFIX)/share/examples/$(PKGBASE)/ + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/${PKGBASE} + ${INSTALL_DATA} ${WRKSRC}/etc/* ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}/ PYTHON_FOR_BUILD_ONLY= yes .include "../../lang/python/tool.mk" -CONFIGURE_ARGS+= --with-munge=$(BUILDLINK_PREFIX.munge:Q) +CONFIGURE_ARGS+= --with-munge=${BUILDLINK_PREFIX.munge:Q} .include "../../security/munge/buildlink3.mk" # optional .include "../../security/openssl/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" diff --git a/parallel/threadingbuildingblocks/Makefile b/parallel/threadingbuildingblocks/Makefile index 6555bcb4aef..ee12eb68f42 100644 --- a/parallel/threadingbuildingblocks/Makefile +++ b/parallel/threadingbuildingblocks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2017/09/06 09:03:04 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2018/01/01 18:16:38 rillig Exp $ DISTNAME= tbb30_20110325oss_src PKGNAME= threadingbuildingblocks-3.0.6 # for "3.0 update 6" @@ -10,7 +10,7 @@ MAINTAINER= asau@inbox.ru HOMEPAGE= https://www.threadingbuildingblocks.org/ COMMENT= Threading Buildling Blocks -WRKSRC= $(WRKDIR)/$(DISTNAME:_src=) #tbb30_20101215oss +WRKSRC= ${WRKDIR}/${DISTNAME:_src=} #tbb30_20101215oss USE_LANGUAGES= c c++ USE_TOOLS= gmake pax @@ -19,16 +19,16 @@ BUILD_TARGET= default TEST_TARGET= test pre-configure: - cd $(WRKSRC)/build/ && cp FreeBSD.gcc.inc NetBSD.gcc.inc && cp FreeBSD.inc NetBSD.inc + cd ${WRKSRC}/build/ && cp FreeBSD.gcc.inc NetBSD.gcc.inc && cp FreeBSD.inc NetBSD.inc -INSTALLATION_DIRS= include lib share/doc/$(PKGBASE) +INSTALLATION_DIRS= include lib share/doc/${PKGBASE} do-install: - $(INSTALL_LIB) $(WRKSRC)/build/build_release/libtbb.so $(DESTDIR)$(PREFIX)/lib/ - $(INSTALL_LIB) $(WRKSRC)/build/build_release/libtbbmalloc.so $(DESTDIR)$(PREFIX)/lib/ - $(INSTALL_LIB) $(WRKSRC)/build/build_debug/libtbb_debug.so $(DESTDIR)$(PREFIX)/lib/ - $(INSTALL_LIB) $(WRKSRC)/build/build_debug/libtbbmalloc_debug.so $(DESTDIR)$(PREFIX)/lib/ - (cd $(WRKSRC)/include && pax -rw tbb $(DESTDIR)$(PREFIX)/include/) + ${INSTALL_LIB} ${WRKSRC}/build/build_release/libtbb.so ${DESTDIR}${PREFIX}/lib/ + ${INSTALL_LIB} ${WRKSRC}/build/build_release/libtbbmalloc.so ${DESTDIR}${PREFIX}/lib/ + ${INSTALL_LIB} ${WRKSRC}/build/build_debug/libtbb_debug.so ${DESTDIR}${PREFIX}/lib/ + ${INSTALL_LIB} ${WRKSRC}/build/build_debug/libtbbmalloc_debug.so ${DESTDIR}${PREFIX}/lib/ + (cd ${WRKSRC}/include && pax -rw tbb ${DESTDIR}${PREFIX}/include/) # documentation: # (cd $(WRKSRC)/doc/html && pax -rw . $(DESTDIR)$(PREFIX)/share/doc/html/$(PKGBASE)/) # $(INSTALL_DATA) $(WRKSRC)/doc/Release_Notes.txt $(DESTDIR)$(PREFIX)/share/doc/$(PKGBASE)/ -- cgit v1.2.3