Attachment 150689 Details for Bug 196031 – updated patch to unbreak www/webkit-gtk3 build on FreeBSD 8

[patch] updated patch to unbreak www/webkit-gtk3 build on FreeBSD 8

webkit-gkt3.patch (text/plain), 1.77 KB, created by Don Lewis on 2014-12-17 19:50:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Don Lewis

Created: 2014-12-17 19:50:11 UTC

Size: 1.77 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 374834)
>+++ Makefile	(working copy)
>@@ -21,11 +21,11 @@
> 		libwebp.so:${PORTSDIR}/graphics/webp \
> 		libcurl.so:${PORTSDIR}/ftp/curl \
> 		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
>-RUN_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue 
>+RUN_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
> 
> USE_GSTREAMER1=	yes
> USE_XORG=	xt xdamage xcomposite
>-USES=		bison gettext gmake gperf libtool perl5 \
>+USES=		bison compiler:c++11-lib gettext gmake gperf libtool perl5 \
> 		pkgconfig shebangfix tar:xz
> USE_RUBY=	yes
> RUBY_NO_RUN_DEPENDS=yes
>@@ -85,32 +85,25 @@
> # gtest to use <tr1/tuple,> while libc++ only has <tuple>
> CPPFLAGS+=	-DGTEST_USE_OWN_TR1_TUPLE
> # Shutup warning spam
>-CXXFLAGS+=	-Wno-c++11-extensions -Qunused-arguments
>+CXXFLAGS+=	-Wno-c++11-extensions
> 
> CONFIGURE_ARGS+=--enable-webkit2
>-# We need clang + libc++ or gcc 4.7+. gcc has libstdc++ conflict between
>-# gcc port and base. This originates from icu
>-.if ${OSVERSION} < 900000
>-BROKEN=		Fails to build
>-.endif
>-.if ${OSVERSION}<1000019
>-CXXFLAGS+=	-stdlib=libc++ -I${LOCALBASE}/include/c++/v1
>-LDFLAGS+=	-stdlib=libc++
>-BUILD_DEPENDS+=	clang34>=3.4:${PORTSDIR}/lang/clang34 \
>-		libc++>=0:${PORTSDIR}/devel/libc++
>-RUN_DEPENDS+=	libc++>=0:${PORTSDIR}/devel/libc++
>-CC=		clang34
>-CXX=		clang++34
>-CPP=		clang-cpp34
>-CONFIGURE_ENV+=	CC=${CC} CXX=${CXX} CPP=${CPP}
>-.endif
> 
> .if ${ARCH} == powerpc64
> CFLAGS+=	-mminimal-toc
> .endif
> 
>+.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
>+# Needed for __atomic_fetch_add_8
>+CFLAGS+=	-march=i586
>+.endif
>+
> .include <bsd.port.pre.mk>
> 
>+.if ${CHOSEN_COMPILER_TYPE} == clang
>+CXXFLAGS+=	-Qunused-arguments
>+.endif
>+
> .if ${PERL_LEVEL} >= 501400
> BUILD_DEPENDS+=	p5-Switch>0:${PORTSDIR}/lang/p5-Switch
> .endif

Actions: View | Diff

Attachments on bug 196031: 150647 | 150689