From owner-svn-ports-head@freebsd.org Wed Dec 4 12:41:25 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D660B1B5A71; Wed, 4 Dec 2019 12:41:25 +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 47Sdks5K2kz3JVY; Wed, 4 Dec 2019 12:41:25 +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 8001932E; Wed, 4 Dec 2019 12:41:25 +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 xB4CfPsH097590; Wed, 4 Dec 2019 12:41:25 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB4CfPrn097588; Wed, 4 Dec 2019 12:41:25 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201912041241.xB4CfPrn097588@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Wed, 4 Dec 2019 12:41:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519011 - in head/devel/uatraits: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/devel/uatraits: . files X-SVN-Commit-Revision: 519011 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Wed, 04 Dec 2019 12:41:25 -0000 Author: pkubaj Date: Wed Dec 4 12:41:24 2019 New Revision: 519011 URL: https://svnweb.freebsd.org/changeset/ports/519011 Log: devel/uatraits: fix build with GCC-based architectures To link with boost, new GCC is needed on GCC architectures. Add -L${OPENSSLLIB} only when OPENSSLLIB is not /usr/lib. Adding -L/usr/lib when using ports GCC makes GCC prefer /usr/lib/libstdc++.so instead of its own libstdc++, which makes the build fail. PR: 239626 Approved by: mentors (implicit approval), daemon (maintainer, earlier version) Added: head/devel/uatraits/files/patch-config_libxml2.m4 (contents, props changed) Modified: head/devel/uatraits/Makefile Modified: head/devel/uatraits/Makefile ============================================================================== --- head/devel/uatraits/Makefile Wed Dec 4 12:13:38 2019 (r519010) +++ head/devel/uatraits/Makefile Wed Dec 4 12:41:24 2019 (r519011) @@ -10,13 +10,11 @@ MASTER_SITES= http://people.freebsd.org/~demon/ MAINTAINER= demon@FreeBSD.org COMMENT= User-Agent detection library -BROKEN_powerpc64= fails to link: checking linkage with boost::test... no - LIB_DEPENDS= ${PY_BOOST} \ libpcre.so:devel/pcre \ libxml2.so:textproc/libxml2 -USES= autoreconf compiler libtool pkgconfig python:2.7 ssl +USES= autoreconf compiler:c++11-lang libtool pkgconfig python:2.7 ssl GNU_CONFIGURE= yes USE_LDCONFIG= yes @@ -25,13 +23,19 @@ CONFIGURE_ARGS= --with-boost-prefix=${LOCALBASE} \ --enable-python --disable-perl --disable-tests \ --disable-java --disable-nodejs CONFIGURE_ENV= crypto_CFLAGS="-I${OPENSSLINC}" \ - crypto_LIBS="-L${OPENSSLLIB} -lcrypto" + crypto_LIBS="-lcrypto" CPPFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} CXXFLAGS_clang= -Wno-c++11-narrowing +.include + +.if ${OPENSSLLIB} != /usr/lib +CONFIGURE_ENV+= crypto_LIBS="-L${OPENSSLLIB} -lcrypto" +.endif + post-patch: @${REINPLACE_CMD} -e 's/\[boost_python]/[${PY_BOOST_LIB}]/' \ ${WRKSRC}/config/ax_boost_python.m4 -.include +.include Added: head/devel/uatraits/files/patch-config_libxml2.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/uatraits/files/patch-config_libxml2.m4 Wed Dec 4 12:41:24 2019 (r519011) @@ -0,0 +1,11 @@ +--- config/libxml2.m4.orig 2019-12-04 11:56:24 UTC ++++ config/libxml2.m4 +@@ -41,7 +41,7 @@ AC_ARG_ENABLE(xmltest, + no_xml=yes + else + XML_CPPFLAGS=`$XML2_CONFIG $xml_config_args --cflags` +- XML_LIBS=`$XML2_CONFIG $xml_config_args --libs` ++ XML_LIBS=`$XML2_CONFIG $xml_config_args --libs | sed 's|-L/usr/lib||g'` + xml_config_major_version=`$XML2_CONFIG $xml_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + xml_config_minor_version=`$XML2_CONFIG $xml_config_args --version | \