svn commit: r382021 - in head/devel: valgrind valgrind-devel

[Bryan Drewery]

Author: bdrewery
Date: Mon Mar 23 18:35:45 2015
New Revision: 382021
URL: https://svnweb.freebsd.org/changeset/ports/382021
QAT: https://qat.redports.org/buildarchive/r382021/

Log:
  - Fix 32BIT build
  - Fix plist under 32bit builds
  - Fix build on 84amd64 by using GCC. Stass has suggested to me that
    using clang may result in a broken runtime anyhow.
    The error encountered was the one logged in r350881 about missing 'rdtscp'
    instruction.
  - Fix build occuring during 'make stage' phase.

Modified:
  head/devel/valgrind-devel/Makefile
  head/devel/valgrind-devel/pkg-plist
  head/devel/valgrind/Makefile
  head/devel/valgrind/pkg-plist

Modified: head/devel/valgrind-devel/Makefile
==============================================================================
--- head/devel/valgrind-devel/Makefile	Mon Mar 23 18:20:36 2015	(r382020)
+++ head/devel/valgrind-devel/Makefile	Mon Mar 23 18:35:45 2015	(r382021)
@@ -4,6 +4,7 @@
 PORTNAME=	valgrind
 DISTVERSIONPREFIX=	freebsd-
 PORTVERSION=	3.10.0.20150126
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ \
@@ -30,9 +31,9 @@ BUILD_DEPENDS+=		docbook-xsl>=0:${PORTSD
 
 OPTIONS_DEFINE=		MPI DOCS
 OPTIONS_DEFINE_amd64=	32BIT
-#.if exists(${LIB32_PATH})
-#OPTIONS_DEFAULT_amd64=	32BIT
-#.endif
+.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
 
@@ -52,11 +53,9 @@ WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PR
 
 CONFIGURE_ENV+=	ac_cv_path_PERL=${PERL}
 
-.include <bsd.port.options.mk>
+USE_GCC=	yes
 
-.if ${PORT_OPTIONS:M32BIT}
-BROKEN=	Currently does not build with 32bit support
-.endif
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "amd64"
 PLIST_SUB+=	AMD64="" ARCH=amd64
@@ -80,9 +79,7 @@ post-patch:
 	@${RM} -rf ${WRKSRC}/docs/html
 .endif
 
-do-build: do-man-pages
-
-do-man-pages:
+post-build:
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages
 .if ${PORT_OPTIONS:MDOCS}
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html-docs

Modified: head/devel/valgrind-devel/pkg-plist
==============================================================================
--- head/devel/valgrind-devel/pkg-plist	Mon Mar 23 18:20:36 2015	(r382020)
+++ head/devel/valgrind-devel/pkg-plist	Mon Mar 23 18:35:45 2015	(r382021)
@@ -207,7 +207,8 @@ lib/valgrind/default.supp
 %%X86%%lib/valgrind/helgrind-x86-freebsd
 lib/valgrind/i386-coresse-valgrind.xml
 lib/valgrind/i386-linux-valgrind.xml
-lib/valgrind/getoff-%%ARCH%%-freebsd
+%%X86%%lib/valgrind/getoff-x86-freebsd
+%%AMD64%%lib/valgrind/getoff-amd64-freebsd
 %%AMD64%%lib/valgrind/lackey-amd64-freebsd
 %%X86%%lib/valgrind/lackey-x86-freebsd
 %%AMD64%%lib/valgrind/libcoregrind-amd64-freebsd.a

Modified: head/devel/valgrind/Makefile
==============================================================================
--- head/devel/valgrind/Makefile	Mon Mar 23 18:20:36 2015	(r382020)
+++ head/devel/valgrind/Makefile	Mon Mar 23 18:35:45 2015	(r382021)
@@ -4,6 +4,7 @@
 PORTNAME=	valgrind
 DISTVERSIONPREFIX=	freebsd-
 PORTVERSION=	3.10.0.20150126
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ \
@@ -29,9 +30,9 @@ BUILD_DEPENDS+=		docbook-xsl>=0:${PORTSD
 
 OPTIONS_DEFINE=		MPI DOCS
 OPTIONS_DEFINE_amd64=	32BIT
-#.if exists(${LIB32_PATH})
-#OPTIONS_DEFAULT_amd64=	32BIT
-#.endif
+.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
 
@@ -51,11 +52,9 @@ WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PR
 
 CONFIGURE_ENV+=	ac_cv_path_PERL=${PERL}
 
-.include <bsd.port.options.mk>
+USE_GCC=	yes
 
-.if ${PORT_OPTIONS:M32BIT}
-BROKEN=	Currently does not build with 32bit support
-.endif
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "amd64"
 PLIST_SUB+=	AMD64="" ARCH=amd64
@@ -79,9 +78,7 @@ post-patch:
 	@${RM} -rf ${WRKSRC}/docs/html
 .endif
 
-do-build: do-man-pages
-
-do-man-pages:
+post-build:
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages
 .if ${PORT_OPTIONS:MDOCS}
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html-docs

Modified: head/devel/valgrind/pkg-plist
==============================================================================
--- head/devel/valgrind/pkg-plist	Mon Mar 23 18:20:36 2015	(r382020)
+++ head/devel/valgrind/pkg-plist	Mon Mar 23 18:35:45 2015	(r382021)
@@ -207,7 +207,8 @@ lib/valgrind/default.supp
 %%X86%%lib/valgrind/helgrind-x86-freebsd
 lib/valgrind/i386-coresse-valgrind.xml
 lib/valgrind/i386-linux-valgrind.xml
-lib/valgrind/getoff-%%ARCH%%-freebsd
+%%X86%%lib/valgrind/getoff-x86-freebsd
+%%AMD64%%lib/valgrind/getoff-amd64-freebsd
 %%AMD64%%lib/valgrind/lackey-amd64-freebsd
 %%X86%%lib/valgrind/lackey-x86-freebsd
 %%AMD64%%lib/valgrind/libcoregrind-amd64-freebsd.a