Date: Fri, 24 Jul 2020 17:33:31 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543271 - head/devel/valgrind-devel Message-ID: <202007241733.06OHXVnl080359@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Fri Jul 24 17:33:31 2020 New Revision: 543271 URL: https://svnweb.freebsd.org/changeset/ports/543271 Log: devel/valgrind-devel: finish Makefile reordering, no functional change Mea culpa, the rest of this re-ordering is due to having missed this line in a bunch of portlint noise about the patches that will soon be disappearing: WARN: Makefile: "USES" has to appear earlier. Move conflicts/bb/options definitions further down, as is also done in the conflated diff of D25452. Approved by: zeising (maintainer, implicit) Modified: head/devel/valgrind-devel/Makefile Modified: head/devel/valgrind-devel/Makefile ============================================================================== --- head/devel/valgrind-devel/Makefile Fri Jul 24 17:31:27 2020 (r543270) +++ head/devel/valgrind-devel/Makefile Fri Jul 24 17:33:31 2020 (r543271) @@ -18,36 +18,22 @@ LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 i386 -CONFLICTS= valgrind-[0-9]* - -BB_COMMIT= ce1acb28953f -BB_ACCOUNT= stass -BB_PROJECT= valgrind-freebsd - -LIB32_PATH?= ${DESTDIR}/usr/lib32/libc.so - -OPTIONS_DEFINE= DOCS MANPAGES MPI -OPTIONS_DEFINE_amd64= 32BIT -OPTIONS_DEFAULT= MANPAGES -.if exists(${LIB32_PATH}) -OPTIONS_DEFAULT_amd64= 32BIT -.endif -32BIT_DESC= Enable debugging of 32-bit programs (requires lib32) -MPI_DESC= Enable build of MPI wrappers - DOCS_BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \ xsltproc:textproc/libxslt MANPAGES_BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \ xsltproc:textproc/libxslt MPI_LIB_DEPENDS= libmpich.so:net/mpich -OPTIONS_SUB= yes USES= pathfix pkgconfig gmake perl5 shebangfix autoreconf USE_PERL5= build GNU_CONFIGURE= yes USE_LDCONFIG= yes +OPTIONS_SUB= yes SHEBANG_FILES= callgrind/callgrind_annotate.in callgrind/callgrind_control.in +LIB32_PATH?= ${DESTDIR}/usr/lib32/libc.so +CONFLICTS= valgrind-[0-9]* + EXTRA_PATCHES= \ ${FILESDIR}/accept4_syscall.patch:-p1 \ ${FILESDIR}/jail_syscalls.patch:-p1 \ @@ -56,7 +42,20 @@ EXTRA_PATCHES= \ PORTDOCS= html +BB_COMMIT= ce1acb28953f +BB_ACCOUNT= stass +BB_PROJECT= valgrind-freebsd + WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} + +OPTIONS_DEFINE= DOCS MANPAGES MPI +OPTIONS_DEFINE_amd64= 32BIT +OPTIONS_DEFAULT= MANPAGES +.if exists(${LIB32_PATH}) +OPTIONS_DEFAULT_amd64= 32BIT +.endif +32BIT_DESC= Enable debugging of 32-bit programs (requires lib32) +MPI_DESC= Enable build of MPI wrappers CONFIGURE_ENV+= ac_cv_path_PERL=${PERL}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007241733.06OHXVnl080359>