From owner-svn-ports-head@freebsd.org Tue Jan 15 23:14:13 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 2EF0C1499EC4; Tue, 15 Jan 2019 23:14:13 +0000 (UTC) (envelope-from bdrewery@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 BCBAE77D94; Tue, 15 Jan 2019 23:14:12 +0000 (UTC) (envelope-from bdrewery@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 AC9C621BB1; Tue, 15 Jan 2019 23:14:12 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0FNEC4f090216; Tue, 15 Jan 2019 23:14:12 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0FNECgI090214; Tue, 15 Jan 2019 23:14:12 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201901152314.x0FNECgI090214@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 15 Jan 2019 23:14:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490434 - in head/devel/ccache: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head/devel/ccache: . files X-SVN-Commit-Revision: 490434 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BCBAE77D94 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Tue, 15 Jan 2019 23:14:13 -0000 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 .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'