Attachment 164889 Details for Bug 205749 – Makefile patch

[patch] Makefile patch

patch-Makefile (text/plain), 1.99 KB, created by stephon on 2015-12-31 06:28:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: stephon

Created: 2015-12-31 06:28:25 UTC

Size: 1.99 KB

patch

obsolete

>--- Makefile.orig	2015-12-31 14:00:23.712992000 +0800
>+++ Makefile	2015-12-31 14:14:01.008798000 +0800
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	pdo_cassandra
> PORTVERSION=	0.2.1
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	databases
> PKGNAMEPREFIX=	php5-
> 
>@@ -12,10 +12,6 @@
> 
> LICENSE=	APACHE20
> 
>-BROKEN=		fails to compile
>-DEPRECATED=	PHP 5.4 EOL reached
>-EXPIRATION_DATE=	2016-01-15
>-
> LIB_DEPENDS=	libboost_iostreams.so:${PORTSDIR}/devel/boost-libs
> 
> USE_GITHUB=	yes
>@@ -27,13 +23,16 @@
> USE_PHP_BUILD=	yes
> USE_PHP=	pdo
> USE_PHPEXT=	yes
>-PHP_DEFAULT=	5.4
> IGNORE_WITH_PHP=52
>-USE_GCC=	yes
>+MAKE_JOBS_UNSAFE=	yes
> 
> .include <bsd.port.pre.mk>
> .include "${PORTSDIR}/devel/thrift/bsd.thrift.mk"
> 
>+.if ${OSVERSION} >= 1000000
>+USE_CXXSTD=	c++11
>+.endif
>+
> THRIFT_MAJOR_VER=	${THRIFT_PORTVERSION:R:R}
> THRIFT_MINOR_VER=	${THRIFT_PORTVERSION:R:E}
> THRIFT_PATCH_VER=	${THRIFT_PORTVERSION:E}
>@@ -45,10 +44,13 @@
> LIB_DEPENDS+=	libthrift.so:${PORTSDIR}/devel/thrift
> .endif
> 
>+#  Fix build problem in FreeBSD 10+
> post-configure:
>-.if ${THRIFT_PORTVERSION} == "0.8.0"
>-	${REINPLACE_CMD} 's/$[^:]$apache::thrift/\1 ::apache::thrift/g' ${WRKSRC}/gen-cpp/Cassandra.h
>-	${REINPLACE_CMD} 's/$[^:]$apache::thrift/\1 ::apache::thrift/g' ${WRKSRC}/gen-cpp/Cassandra.cpp
>+.if ${THRIFT_MAJOR_VER} >= 0 && ${THRIFT_MINOR_VER} >= 9
>+	${REINPLACE_CMD} 's/$[^:]$apache::thrift::protocol::TInputRecursionTracker/\1 ::apache::thrift::protocol::TInputRecursionTracker/g' ${WRKSRC}/gen-cpp/Cassandra.cpp
>+	${REINPLACE_CMD} 's/$[^:]$apache::thrift::protocol::TOutputRecursionTracker/\1 ::apache::thrift::protocol::TOutputRecursionTracker/g' ${WRKSRC}/gen-cpp/Cassandra.cpp
>+	${REINPLACE_CMD} 's/$[^:]$apache::thrift::protocol::TInputRecursionTracker/\1 ::apache::thrift::protocol::TInputRecursionTracker/g' ${WRKSRC}/gen-cpp/cassandra_types.cpp
>+	${REINPLACE_CMD} 's/$[^:]$apache::thrift::protocol::TOutputRecursionTracker/\1 ::apache::thrift::protocol::TOutputRecursionTracker/g' ${WRKSRC}/gen-cpp/cassandra_types.cpp
> .endif
> 
> .include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 205749: 164889 | 166157 | 166158 | 166159