ports/184069: fix build: devel/bam
Timothy Beyer
beyert at cs.ucr.edu
Tue Nov 19 06:10:00 UTC 2013
>Number: 184069
>Category: ports
>Synopsis: update port: devel/bam
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 19 06:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Timothy Beyer
>Release: FreeBSD 9.2-RELEASE amd64
>Organization:
no organization
>Environment:
System: FreeBSD hypercube.aeonnet 9.2-RELEASE FreeBSD 9.2-RELEASE #0: Tue Oct 1 00:41:23 PDT 2013 root at hypercube.aeonnet:/usr/obj/usr/src/sys/CUSTOM-9.2 amd64
>Description:
- fix build with GCC, avoid possibility of potentially broken build for both gcc and clang
>How-To-Repeat:
Apply patch and build port
>Fix:
The included patch
--- bam.diff begins here ---
diff -urN bam.orig/Makefile bam/Makefile
--- bam.orig/Makefile 2013-09-20 10:03:26.000000000 -0700
+++ bam/Makefile 2013-11-18 22:03:20.000000000 -0800
@@ -14,16 +14,24 @@
FETCH_ARGS= "-Fpr"
USE_BZIP2= yes
+.if !defined(CC) || !${CC:T:Mclang}
+USE_GCC= any
+.endif
PLIST_FILES= bin/bam
NO_STAGE= yes
+
do-build:
.if defined(CC) && ${CC:T:Mclang}
- @${REINPLACE_CMD} -e 's|-ldl||g' ${WRKSRC}/make_unix_clang.sh
+ @${REINPLACE_CMD} -e "s|src/tools/txt2c|${WRKSRC}/src/tools/txt2c|g" \
+ ${WRKSRC}/make_unix_clang.sh
+ @${REINPLACE_CMD} -e "s|-ldl||g" ${WRKSRC}/make_unix_clang.sh
(cd ${WRKSRC} && ${SH} make_unix_clang.sh)
.else
- @${REINPLACE_CMD} -e 's|-ldl||g' ${WRKSRC}/make_unix.sh
+ @${REINPLACE_CMD} -e "s|src/tools/txt2c|${WRKSRC}/src/tools/txt2c|g" \
+ ${WRKSRC}/make_unix.sh
+ @${REINPLACE_CMD} -e "s|-ldl||g" ${WRKSRC}/make_unix.sh
(cd ${WRKSRC} && ${SH} make_unix.sh)
.endif
--- bam.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list