Date: Thu, 4 Jul 2013 16:57:40 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322282 - in head/devel: valgrind valgrind-snapshot Message-ID: <201307041657.r64GveOM070057@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Jul 4 16:57:39 2013 New Revision: 322282 URL: http://svnweb.freebsd.org/changeset/ports/322282 Log: - Add 32BIT option to enable/disable 32bit compat - Add LIB32_PATH to allow overriding where 32bit libs are installed, default to DESTDIR/usr/lib32/libc.so PR: ports/179643 Reported by: Garrett Cooper <yaneurabeya@gmail.com> Submitted by: r4721@tormail.org (based on) Modified: head/devel/valgrind-snapshot/Makefile head/devel/valgrind/Makefile Modified: head/devel/valgrind-snapshot/Makefile ============================================================================== --- head/devel/valgrind-snapshot/Makefile Thu Jul 4 16:50:06 2013 (r322281) +++ head/devel/valgrind-snapshot/Makefile Thu Jul 4 16:57:39 2013 (r322282) @@ -9,7 +9,6 @@ MASTER_SITES= http://cdn.bitbucket.org/s http://mirror.shatow.net/freebsd/${PORTNAME}/ PKGNAMESUFFIX= -snapshot DISTNAME= ${PORTNAME}-freebsd-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= bdrewery@FreeBSD.org COMMENT= Memory debugging and profiling tool @@ -27,7 +26,14 @@ MAN1= callgrind_control.1 \ ms_print.1 \ cg_annotate.1 -OPTIONS_DEFINE= MPI +LIB32_PATH?= ${DESTDIR}/usr/lib32/libc.so + +OPTIONS_DEFINE= MPI +OPTIONS_DEFINE_amd64= 32BIT +.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 MPI_LIB_DEPENDS= mpich:${PORTSDIR}/net/mpich2 @@ -48,10 +54,14 @@ WRKSRC= ${WRKDIR}/${DISTNAME} .if ${ARCH} == "amd64" PLIST_SUB+= AMD64="" ARCH=amd64 -. if !exists(/usr/lib32/libc.so) +. if !${PORT_OPTIONS:M32BIT} CONFIGURE_ARGS+= --enable-only64bit PLIST_SUB+= X86="@comment " . else +. if !exists(${LIB32_PATH}) +IGNORE=The lib32 distribution was not found. Please install the lib32\ +distribution or run 'make config' and uncheck 32BIT option +. endif PLIST_SUB+= X86="" . endif .else Modified: head/devel/valgrind/Makefile ============================================================================== --- head/devel/valgrind/Makefile Thu Jul 4 16:50:06 2013 (r322281) +++ head/devel/valgrind/Makefile Thu Jul 4 16:57:39 2013 (r322282) @@ -8,7 +8,6 @@ CATEGORIES= devel MASTER_SITES= http://cdn.bitbucket.org/stass/valgrind-freebsd/downloads/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ DISTNAME= ${PORTNAME}-freebsd-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= bdrewery@FreeBSD.org COMMENT= Memory debugging and profiling tool @@ -25,7 +24,14 @@ MAN1= callgrind_control.1 \ ms_print.1 \ cg_annotate.1 -OPTIONS_DEFINE= MPI +LIB32_PATH?= ${DESTDIR}/usr/lib32/libc.so + +OPTIONS_DEFINE= MPI +OPTIONS_DEFINE_amd64= 32BIT +.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 MPI_LIB_DEPENDS= mpich:${PORTSDIR}/net/mpich2 @@ -46,10 +52,14 @@ WRKSRC= ${WRKDIR}/${DISTNAME} .if ${ARCH} == "amd64" PLIST_SUB+= AMD64="" ARCH=amd64 -. if !exists(/usr/lib32/libc.so) +. if !${PORT_OPTIONS:M32BIT} CONFIGURE_ARGS+= --enable-only64bit PLIST_SUB+= X86="@comment " . else +. if !exists(${LIB32_PATH}) +IGNORE=The lib32 distribution was not found. Please install the lib32\ +distribution or run 'make config' and uncheck 32BIT option +. endif PLIST_SUB+= X86="" . endif .else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307041657.r64GveOM070057>