Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 19 Apr 2014 18:26:49 +0200
From:      Kurt Jaeger <fbsd-ports@opsec.eu>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        kwm@FreeBSD.org
Subject:   ports/188797: [patch update] fix print/harfbuzz build on 9.2p4
Message-ID:  <E1WbY6L-00071E-Ju@fa9.opsec.eu>
Resent-Message-ID: <201404191630.s3JGU07O092609@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         188797
>Category:       ports
>Synopsis:       [patch update] fix print/harfbuzz build on 9.2p4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 19 16:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Kurt Jaeger
>Release:        FreeBSD 9.2-RELEASE-p4 amd64
>Organization:
-
>Environment:
System: FreeBSD fa9.opsec.eu 9.2-RELEASE-p4 FreeBSD 9.2-RELEASE-p4 #0: Tue Apr  8 18:08:22 UTC 2014     root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
	print/harfbuzz fails to build on 9.2p4 because configure
	adds ' --std=c++0x' to CXXFLAGS, which causes the build to fail.

	Fix USES while there. Does this require a PORTREVISION increment ?

>How-To-Repeat:
	See http://opsec.eu/backup/harfbuzz-build-failure
	for a log of the failed build.
>Fix:

diff -r -u -N print/harfbuzz/Makefile /usr/home/pi/myp/print/harfbuzz/Makefile
--- print/harfbuzz/Makefile	2014-04-17 21:20:04.000000000 +0200
+++ /usr/home/pi/myp/print/harfbuzz/Makefile	2014-04-19 18:22:11.000000000 +0200
@@ -14,9 +14,8 @@
 		libicudata.so:${PORTSDIR}/devel/icu \
 		libgraphite2.so:${PORTSDIR}/graphics/graphite2
 
-USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USES=		gmake pathfix pkgconfig
+USES=		gmake pathfix pkgconfig tar:bzip2
 USE_GNOME=	cairo glib20 ltverhack
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-graphite2
@@ -30,4 +29,17 @@
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libharfbuzz*.so.0
 
+.if ${OSVERSION} < 1000024
+post-configure:
+	${REINPLACE_CMD} -e 's/ --std=c++0x//' ${WRKSRC}/util/Makefile
+	${REINPLACE_CMD} -e 's/ --std=c++0x//' ${WRKSRC}/docs/reference/Makefile
+	${REINPLACE_CMD} -e 's/ --std=c++0x//' ${WRKSRC}/docs/Makefile
+	${REINPLACE_CMD} -e 's/ --std=c++0x//' ${WRKSRC}/test/shaping/Makefile
+	${REINPLACE_CMD} -e 's/ --std=c++0x//' ${WRKSRC}/test/api/Makefile
+	${REINPLACE_CMD} -e 's/ --std=c++0x//' ${WRKSRC}/test/Makefile
+	${REINPLACE_CMD} -e 's/ --std=c++0x//' ${WRKSRC}/src/hb-ucdn/Makefile
+	${REINPLACE_CMD} -e 's/ --std=c++0x//' ${WRKSRC}/src/Makefile
+	${REINPLACE_CMD} -e 's/ --std=c++0x//' ${WRKSRC}/Makefile
+.endif
+
 .include <bsd.port.post.mk>


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1WbY6L-00071E-Ju>