Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Feb 2017 03:32:13 +0000 (UTC)
From:      Don Lewis <truckman@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r433277 - head/devel/mtbl/files
Message-ID:  <201702040332.v143WDaL045204@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: truckman
Date: Sat Feb  4 03:32:13 2017
New Revision: 433277
URL: https://svnweb.freebsd.org/changeset/ports/433277

Log:
  Neuter liblz4 version check in configure to unbreak build after
  liblz4 upstream changed versioning from r131 to v1.7.5.
  
  Reported by:	pkg-fallout
  Sponsored by:	Farsight Security, Inc.

Added:
  head/devel/mtbl/files/
  head/devel/mtbl/files/patch-configure   (contents, props changed)

Added: head/devel/mtbl/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/mtbl/files/patch-configure	Sat Feb  4 03:32:13 2017	(r433277)
@@ -0,0 +1,52 @@
+--- configure.orig	2015-08-28 22:16:34 UTC
++++ configure
+@@ -12269,12 +12269,12 @@ if test -n "$liblz4_CFLAGS"; then
+     pkg_cv_liblz4_CFLAGS="$liblz4_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblz4 > 129\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "liblz4 > 129") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblz4 > 0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "liblz4 > 0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_liblz4_CFLAGS=`$PKG_CONFIG --cflags "liblz4 > 129" 2>/dev/null`
++  pkg_cv_liblz4_CFLAGS=`$PKG_CONFIG --cflags "liblz4 > 0" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -12286,12 +12286,12 @@ if test -n "$liblz4_LIBS"; then
+     pkg_cv_liblz4_LIBS="$liblz4_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblz4 > 129\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "liblz4 > 129") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblz4 > 0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "liblz4 > 0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_liblz4_LIBS=`$PKG_CONFIG --libs "liblz4 > 129" 2>/dev/null`
++  pkg_cv_liblz4_LIBS=`$PKG_CONFIG --libs "liblz4 > 0" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -12312,14 +12312,14 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        liblz4_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liblz4 > 129" 2>&1`
++	        liblz4_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liblz4 > 0" 2>&1`
+         else
+-	        liblz4_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liblz4 > 129" 2>&1`
++	        liblz4_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liblz4 > 0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$liblz4_PKG_ERRORS" >&5
+ 
+-	as_fn_error $? "Package requirements (liblz4 > 129) were not met:
++	as_fn_error $? "Package requirements (liblz4 > 0) were not met:
+ 
+ $liblz4_PKG_ERRORS
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702040332.v143WDaL045204>