Date: Mon, 20 May 2019 16:42:00 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502124 - head/devel/thrift-cpp Message-ID: <201905201642.x4KGg0la027522@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Mon May 20 16:42:00 2019 New Revision: 502124 URL: https://svnweb.freebsd.org/changeset/ports/502124 Log: devel/thrift-cpp: fix build with GCC-based architectures Add -L${OPENSSLLIB} -I${OPENSSLINC} only when base OpenSSL isn't used. Explicitly adding -L/usr/lib make ports GCC link to libstdc++ from /usr/lib instead of /usr/local/lib/gcc8. Also, explicitly don't use Lua and Qt5, the port uses it if it's installed. PR: 237506 Approved by: komarov@valerka.net (maintainer timeout), mat (mentor) Differential Revision: https://reviews.freebsd.org/D20287 Modified: head/devel/thrift-cpp/Makefile Modified: head/devel/thrift-cpp/Makefile ============================================================================== --- head/devel/thrift-cpp/Makefile Mon May 20 16:36:24 2019 (r502123) +++ head/devel/thrift-cpp/Makefile Mon May 20 16:42:00 2019 (r502124) @@ -3,7 +3,7 @@ PORTNAME= thrift PORTVERSION= ${THRIFT_PORTVERSION} # to keep in sync with thrift -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= APACHE/thrift/${PORTVERSION} @@ -20,7 +20,6 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo -BROKEN_powerpc64= fails to compile: undefined reference to std::__throw_out_of_range_fmt BROKEN_SSL= openssl111 BROKEN_SSL_REASON_openssl111= 'configure: error: "Error: libcrypto required."' @@ -44,15 +43,19 @@ CONFIGURE_ARGS+= \ --without-php_extension \ --without-python \ --without-ruby \ + --without-lua \ + --with-qt5=no \ --without-go -LDFLAGS+= -L${OPENSSLLIB} -CFLAGS+= -I${OPENSSLINC} - .include <bsd.port.pre.mk> .if ${CHOSEN_COMPILER_TYPE} == clang USE_CXXSTD= c++11 +.endif + +.if ${SSL_DEFAULT} != base +LDFLAGS+= -L${OPENSSLLIB} +CFLAGS+= -I${OPENSSLINC} .endif post-install:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905201642.x4KGg0la027522>