Date: Tue, 15 Jan 2019 23:14:12 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490434 - in head/devel/ccache: . files Message-ID: <201901152314.x0FNECgI090214@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Jan 15 23:14:12 2019 New Revision: 490434 URL: https://svnweb.freebsd.org/changeset/ports/490434 Log: Fix build of ccache-memcached-static sasl2 update in r485191 Modified: head/devel/ccache/Makefile head/devel/ccache/files/extra-patch-memcached-configure.ac Modified: head/devel/ccache/Makefile ============================================================================== --- head/devel/ccache/Makefile Tue Jan 15 23:09:06 2019 (r490433) +++ head/devel/ccache/Makefile Tue Jan 15 23:14:12 2019 (r490434) @@ -62,11 +62,13 @@ NO_CCACHE_DEPEND= yes OPTIONS_SUB= yes -STATIC_LDFLAGS= -static +STATIC_LDFLAGS+= -static .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MMEMCACHED} +# Hack for libsasl2.a requiring HMAC_CTX_reset from hidden libntlm.a. +STATIC_LDFLAGS+= -L${LOCALBASE}/lib/sasl2 PORTVERSION= 3.5.dev.20180926 USE_GITHUB= yes GH_TAGNAME= f7712082106bef085515f86ae47e7dbbd2a48b57 Modified: head/devel/ccache/files/extra-patch-memcached-configure.ac ============================================================================== --- head/devel/ccache/files/extra-patch-memcached-configure.ac Tue Jan 15 23:09:06 2019 (r490433) +++ head/devel/ccache/files/extra-patch-memcached-configure.ac Tue Jan 15 23:14:12 2019 (r490434) @@ -32,18 +32,18 @@ - ]) + if test x${enable_static} = xyes; then + AC_CHECK_LIB(sasl2, sasl_version, ac_cv_have_libsasl2=yes, -+ ac_cv_have_libsasl2=no, -lcrypto -lopie -lmd) ++ ac_cv_have_libsasl2=no, -lntlm -lcrypto -lopie -lmd) + fi + if test x$ac_cv_have_libsasl2 = xyes; then + AC_CHECK_LIB(memcached, memcached,[ -+ LIBS="${LIBS} -lmemcached -lsasl2 -lcrypto -lopie -lmd" ++ LIBS="${LIBS} -lmemcached -lsasl2 -lntlm -lcrypto -lopie -lmd" + AC_DEFINE(HAVE_LIBMEMCACHED, 1) + ] + ,[ + echo ' WARNING: recent version libmemcached not found' + echo ' please install libmemcached > 1.0 with development files' + exit 1 -+ ], -lsasl2 -lcrypto -lopie -lmd) ++ ], -lsasl2 -lntlm -lcrypto -lopie -lmd) + else + AC_CHECK_LIB(memcached, memcached,[],[ + echo ' WARNING: recent version libmemcached not found'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901152314.x0FNECgI090214>