Date: Tue, 31 Mar 2020 13:58:01 +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: r529975 - head/databases/libzdb Message-ID: <202003311358.02VDw1kW022308@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Tue Mar 31 13:58:01 2020 New Revision: 529975 URL: https://svnweb.freebsd.org/changeset/ports/529975 Log: databases/libzdb: fix build on GCC architectures r529335 partially reverted r499489, which caused another breakage on GCC architectures by passing -L/usr/lib while using GCC from ports and making it link to base libstdc++: /usr/local/bin/ld: zdbpp.cpp:(.text.startup+0x1f0): undefined reference to `std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_append(char const*, unsigned long)' Apply changes to Makefile from r499489 to fix it. PR: 237200 Modified: head/databases/libzdb/Makefile Modified: head/databases/libzdb/Makefile ============================================================================== --- head/databases/libzdb/Makefile Tue Mar 31 13:53:19 2020 (r529974) +++ head/databases/libzdb/Makefile Tue Mar 31 13:58:01 2020 (r529975) @@ -31,7 +31,16 @@ PGSQL_CONFIGURE_WITH= postgresql=${LOCALBASE}/bin/pg_c PGSQL_USES= pgsql SQLITE_CONFIGURE_WITH= sqlite=${LOCALBASE} SQLITE_USES= sqlite -SSL_CONFIGURE_ENABLE= openssl=${OPENSSLBASE} SSL_USES= ssl + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MSSL} +.if ${SSL_DEFAULT} == base +CONFIGURE_ARGS+= --enable-openssl +.else +CONFIGURE_ARGS+= --enable-openssl=${OPENSSLBASE} +.endif +.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003311358.02VDw1kW022308>