svn commit: r545302 - in head/deskutils/terminal-image-viewer: . files

[Piotr Kubaj]

Author: pkubaj
Date: Wed Aug 19 10:37:47 2020
New Revision: 545302
URL: https://svnweb.freebsd.org/changeset/ports/545302

Log:
  deskutils/terminal-image-viewer: fix build on GCC architectures
  
  -lstdc++fs is necessary for GCC:
  /usr/local/bin/ld: tiv.cpp:(.text.startup+0x19cc): undefined reference to `std::experimental::filesystem::v1::__cxx11::directory_iterator::operator++()'
  MFH:		2020Q3 (fix build blanket)

Added:
  head/deskutils/terminal-image-viewer/files/extra-patch-Makefile   (contents, props changed)
Modified:
  head/deskutils/terminal-image-viewer/Makefile
  head/deskutils/terminal-image-viewer/files/patch-Makefile

Modified: head/deskutils/terminal-image-viewer/Makefile
==============================================================================
--- head/deskutils/terminal-image-viewer/Makefile	Wed Aug 19 10:29:10 2020	(r545301)
+++ head/deskutils/terminal-image-viewer/Makefile	Wed Aug 19 10:37:47 2020	(r545302)
@@ -23,8 +23,10 @@ WRKSRC_SUBDIR=	src/main/cpp
 
 PLIST_FILES=	bin/tiv
 
-.if exists(/usr/include/c++/v1) && !exists(/usr/include/c++/v1/filesystem)
-BROKEN=		STL feature 'filesystem' isn't available # '
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == clang
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Added: head/deskutils/terminal-image-viewer/files/extra-patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/terminal-image-viewer/files/extra-patch-Makefile	Wed Aug 19 10:37:47 2020	(r545302)
@@ -0,0 +1,11 @@
+--- Makefile.orig       2019-10-21 19:12:09 UTC
++++ Makefile
+@@ -14,7 +14,7 @@ bindir      ?= $(exec_prefix)/bin
+ 
+ override CXXFLAGS += -std=c++17 -Wall -fexceptions
+ override LDFLAGS  += -pthread
+-override LDLIBS   += -lstdc++fs
++#override LDLIBS   += -lstdc++fs
+ 
+ all: $(PROGNAME)
+ 

Modified: head/deskutils/terminal-image-viewer/files/patch-Makefile
==============================================================================
--- head/deskutils/terminal-image-viewer/files/patch-Makefile	Wed Aug 19 10:29:10 2020	(r545301)
+++ head/deskutils/terminal-image-viewer/files/patch-Makefile	Wed Aug 19 10:37:47 2020	(r545302)
@@ -9,12 +9,3 @@
  
  # https://www.gnu.org/prep/standards/html_node/Directory-Variables.html#Directory-Variables
  prefix      ?= /usr/local
-@@ -14,7 +14,7 @@ bindir      ?= $(exec_prefix)/bin
- 
- override CXXFLAGS += -std=c++17 -Wall -fexceptions
- override LDFLAGS  += -pthread
--override LDLIBS   += -lstdc++fs
-+#override LDLIBS   += -lstdc++fs
- 
- all: $(PROGNAME)
-