svn commit: r484258 - in head/sysutils/fusefs-sshfs: . files

[Mark Linimon]

Author: linimon
Date: Mon Nov  5 23:30:50 2018
New Revision: 484258
URL: https://svnweb.freebsd.org/changeset/ports/484258

Log:
  On architectures that use GCC in base, the "-Wno-unused-result" flag
  must be disabled to fix the build.
  
  PR:		231944
  Submitted by:	Piotr Kubaj
  Approved by:	portmgr (tier-2 blanket)

Modified:
  head/sysutils/fusefs-sshfs/Makefile
  head/sysutils/fusefs-sshfs/files/patch-meson.build

Modified: head/sysutils/fusefs-sshfs/Makefile
==============================================================================
--- head/sysutils/fusefs-sshfs/Makefile	Mon Nov  5 23:28:55 2018	(r484257)
+++ head/sysutils/fusefs-sshfs/Makefile	Mon Nov  5 23:30:50 2018	(r484258)
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	rst2man:textproc/py-docutils
 
-USES=		fuse:3 gettext meson pkgconfig
+USES=		fuse:3 gettext gnome meson pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libfuse

Modified: head/sysutils/fusefs-sshfs/files/patch-meson.build
==============================================================================
--- head/sysutils/fusefs-sshfs/files/patch-meson.build	Mon Nov  5 23:28:55 2018	(r484257)
+++ head/sysutils/fusefs-sshfs/files/patch-meson.build	Mon Nov  5 23:30:50 2018	(r484258)
@@ -1,13 +1,27 @@
---- meson.build.orig	2017-10-25 18:32:34 UTC
+--- meson.build.orig	2018-06-29 08:34:57 UTC
 +++ meson.build
-@@ -63,10 +63,5 @@ else
+@@ -19,12 +19,7 @@ int main(void) {
+     (void) get_4();
+     return 0;
+ }'''
+-if not cc.compiles(code, args: [ '-O0', '-Werror=unused-result' ])
+-     message('Compiler warns about unused result even when casting to void')
+-     add_global_arguments('-Wno-unused-result', language: 'c')
+-endif
+ 
+-
+ rst2man = find_program('rst2man', required: false)
+   
+ cfg = configuration_data()
+@@ -62,11 +57,6 @@ if rst2man.found()
+ else
      message('rst2man not found, not building manual page.')
  endif
- 
+-
 -meson.add_install_script('utils/install_helper.sh',
 -                         get_option('sbindir'),
 -                         get_option('bindir'))
 -
--
+ 
  subdir('test')