svn commit: r446778 - in branches/2017Q3/devel/ccache: . files

[Bryan Drewery]

Author: bdrewery
Date: Thu Jul 27 20:44:06 2017
New Revision: 446778
URL: https://svnweb.freebsd.org/changeset/ports/446778

Log:
  MFH: r446777
  
  MEMCACHED+STATIC: Fix not having HAVE_LIBMEMCACHED defined.
  
  This was causing memcached functionality to not work.
  
  Also flip around the link ordering for libmemcached and libsasl2 to
  resolve link-time issues.
  
  Sponsored by:	Dell EMC Isilon
  
  Approved by:	portmgr (implicit)

Modified:
  branches/2017Q3/devel/ccache/Makefile
  branches/2017Q3/devel/ccache/files/extra-patch-memcached-configure.ac
Directory Properties:
  branches/2017Q3/   (props changed)

Modified: branches/2017Q3/devel/ccache/Makefile
==============================================================================
--- branches/2017Q3/devel/ccache/Makefile	Thu Jul 27 20:43:21 2017	(r446777)
+++ branches/2017Q3/devel/ccache/Makefile	Thu Jul 27 20:44:06 2017	(r446778)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ccache
 PORTVERSION=	3.3.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	http://www.samba.org/ftp/ccache/ \
 		LOCAL/bdrewery

Modified: branches/2017Q3/devel/ccache/files/extra-patch-memcached-configure.ac
==============================================================================
--- branches/2017Q3/devel/ccache/files/extra-patch-memcached-configure.ac	Thu Jul 27 20:43:21 2017	(r446777)
+++ branches/2017Q3/devel/ccache/files/extra-patch-memcached-configure.ac	Thu Jul 27 20:44:06 2017	(r446778)
@@ -1,5 +1,5 @@
---- configure.ac.orig	2017-07-24 16:42:21.493682000 -0700
-+++ configure.ac	2017-07-24 17:36:06.122588000 -0700
+--- configure.ac.orig	2017-07-27 13:36:38.827581000 -0700
++++ configure.ac	2017-07-27 13:39:10.856958000 -0700
 @@ -28,6 +28,10 @@ AC_PROG_CC_C99
  if test "$ac_cv_prog_cc_c99" = no; then
      AC_MSG_ERROR(cannot find a C99-compatible compiler)
@@ -11,7 +11,7 @@
  
  AC_PROG_CPP
  AC_PROG_INSTALL
-@@ -97,19 +101,38 @@ AC_ARG_ENABLE(memcached,
+@@ -97,19 +101,39 @@ AC_ARG_ENABLE(memcached,
    [AS_HELP_STRING([--enable-memcached],
      [enable memcached as a cache backend])])
  
@@ -36,7 +36,8 @@
 +    fi
 +    if test x$ac_cv_have_libsasl2 = xyes; then
 +      AC_CHECK_LIB(memcached, memcached,[
-+        LIBS="${LIBS} -lsasl2 -lcrypto -lopie -lmd -lmemcached"
++        LIBS="${LIBS} -lmemcached -lsasl2 -lcrypto -lopie -lmd"
++        AC_DEFINE(HAVE_LIBMEMCACHED, 1)
 +      ]
 +      ,[
 +      echo '  WARNING: recent version libmemcached not found'