kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Fix 32BIT build

Browse source 
- 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.
This commit is contained in:
Bryan Drewery 2015-03-23 18:35:45 +00:00
parent 0b6ec94a13
commit 28bad27240
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=382021
4 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
devel/valgrind-devel/Makefile
View file

@ -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:${PORTSDIR}/textproc/docbook-xsl \
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_PROJECT}-${BB_COMMIT}
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

3
devel/valgrind-devel/pkg-plist
View file

@ -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

17
devel/valgrind/Makefile
View file

@ -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:${PORTSDIR}/textproc/docbook-xsl \
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_PROJECT}-${BB_COMMIT}
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

3
devel/valgrind/pkg-plist
View file

@ -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