From owner-svn-ports-head@freebsd.org Mon May 20 16:42:01 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 563E415B2B35; Mon, 20 May 2019 16:42:01 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E953D86E84; Mon, 20 May 2019 16:42:00 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C398E20E44; Mon, 20 May 2019 16:42:00 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4KGg0Lx027523; Mon, 20 May 2019 16:42:00 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4KGg0la027522; Mon, 20 May 2019 16:42:00 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201905201642.x4KGg0la027522@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Mon, 20 May 2019 16:42:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502124 - head/devel/thrift-cpp X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/devel/thrift-cpp X-SVN-Commit-Revision: 502124 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E953D86E84 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 May 2019 16:42:01 -0000 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 .if ${CHOSEN_COMPILER_TYPE} == clang USE_CXXSTD= c++11 +.endif + +.if ${SSL_DEFAULT} != base +LDFLAGS+= -L${OPENSSLLIB} +CFLAGS+= -I${OPENSSLINC} .endif post-install: