svn commit: r519011 - in head/devel/uatraits: . files
Piotr Kubaj
pkubaj at FreeBSD.org
Wed Dec 4 12:41:25 UTC 2019
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 at 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 <bsd.port.pre.mk>
+
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>
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 | \
More information about the svn-ports-all
mailing list