cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix configure of security/gpgme-qt5 for users that have

Browse Source 
'WITHOUT_GNU_GREP_COMPAT=yes' set

Obtained from:	based on upstream patch of m4/qt.m4
This commit is contained in:
Jason E. Hale 2016-12-20 07:47:38 +00:00
parent 55807a238d
commit 6f4acc8acd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=428979
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
security/gpgme/files/patch-configure Normal file
View File

@ -0,0 +1,32 @@
Fix configure for users that have 'WITHOUT_GNU_GREP_COMPAT=yes' set
m4/qt.m4 fixed upstream in git 211844f.
--- configure.orig 2016-12-20 07:27:31 UTC
+++ configure
@@ -18746,7 +18746,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking moc version" >&5
$as_echo_n "checking moc version... " >&6; }
mocversion=`$MOC -v 2>&1`
- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+ mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
if test x"$mocversiongrep" != x"$mocversion"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -18844,7 +18844,7 @@ else
fi
mocversion=`$MOC2 -v 2>&1`
- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
+ mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
if test x"$mocversiongrep" != x"$mocversion"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}qtchooser", so it can be a program name with args.
@@ -18940,7 +18940,7 @@ fi
qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
mocversion=`$qt5tooldir/moc -v 2>&1`
- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+ mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
if test x"$mocversiongrep" != x"$mocversion"; then
# no valid moc found
have_qt5_libs="no";