svn commit: r552989 - branches/2020Q4/devel/plan9port
Piotr Kubaj
pkubaj at FreeBSD.org
Thu Oct 22 15:45:01 UTC 2020
Author: pkubaj
Date: Thu Oct 22 15:45:00 2020
New Revision: 552989
URL: https://svnweb.freebsd.org/changeset/ports/552989
Log:
MFH: r552988
devel/plan9port: fix build on GCC architectures
Actually respect CC.
Approved by: portmgr (fix build blanket)
Modified:
branches/2020Q4/devel/plan9port/Makefile
Directory Properties:
branches/2020Q4/ (props changed)
Modified: branches/2020Q4/devel/plan9port/Makefile
==============================================================================
--- branches/2020Q4/devel/plan9port/Makefile Thu Oct 22 15:44:13 2020 (r552988)
+++ branches/2020Q4/devel/plan9port/Makefile Thu Oct 22 15:45:00 2020 (r552989)
@@ -48,6 +48,8 @@ DATA_DISTFILES= pgw.tar.bz2 \
roget.tar.bz2 \
scat.tgz
+.include <bsd.port.pre.mk>
+
post-extract-DATA-on:
@cd ${WRKSRC}/dict && ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/pgw.tar.bz2
@cd ${WRKSRC}/dict && ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/roget.tar.bz2
@@ -62,7 +64,10 @@ post-patch:
@${REINPLACE_CMD} -e 's|ulong|u64int|' ${WRKSRC}/src/libmach/FreeBSD.c
do-configure:
- @${ECHO_CMD} 'CFLAGS="${CFLAGS}"' > ${WRKSRC}/LOCAL.config
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+ @${ECHO_CMD} 'CC9="${CC}"' > ${WRKSRC}/LOCAL.config
+.endif
+ @${ECHO_CMD} 'CFLAGS="${CFLAGS}"' >> ${WRKSRC}/LOCAL.config
@${ECHO_CMD} 'LDFLAGS="${LDFLAGS}"' >> ${WRKSRC}/LOCAL.config
@${ECHO_CMD} 'FONTSRV=fontsrv' >> ${WRKSRC}/LOCAL.config
@@ -85,4 +90,4 @@ post-install:
${STRIP_CMD} $$f > /dev/null 2>&1 || ${TRUE}; \
done
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
More information about the svn-ports-branches
mailing list