Date: Wed, 19 Aug 2020 10:38:40 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r545303 - in branches/2020Q3/deskutils/terminal-image-viewer: . files Message-ID: <202008191038.07JAce16052067@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Wed Aug 19 10:38:39 2020 New Revision: 545303 URL: https://svnweb.freebsd.org/changeset/ports/545303 Log: MFH: r545302 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++()' Approved by: portmgr (fix build blanket) Added: branches/2020Q3/deskutils/terminal-image-viewer/files/extra-patch-Makefile - copied unchanged from r545302, head/deskutils/terminal-image-viewer/files/extra-patch-Makefile Modified: branches/2020Q3/deskutils/terminal-image-viewer/Makefile branches/2020Q3/deskutils/terminal-image-viewer/files/patch-Makefile Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/deskutils/terminal-image-viewer/Makefile ============================================================================== --- branches/2020Q3/deskutils/terminal-image-viewer/Makefile Wed Aug 19 10:37:47 2020 (r545302) +++ branches/2020Q3/deskutils/terminal-image-viewer/Makefile Wed Aug 19 10:38:39 2020 (r545303) @@ -22,8 +22,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> Copied: branches/2020Q3/deskutils/terminal-image-viewer/files/extra-patch-Makefile (from r545302, head/deskutils/terminal-image-viewer/files/extra-patch-Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/deskutils/terminal-image-viewer/files/extra-patch-Makefile Wed Aug 19 10:38:39 2020 (r545303, copy of r545302, head/deskutils/terminal-image-viewer/files/extra-patch-Makefile) @@ -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: branches/2020Q3/deskutils/terminal-image-viewer/files/patch-Makefile ============================================================================== --- branches/2020Q3/deskutils/terminal-image-viewer/files/patch-Makefile Wed Aug 19 10:37:47 2020 (r545302) +++ branches/2020Q3/deskutils/terminal-image-viewer/files/patch-Makefile Wed Aug 19 10:38:39 2020 (r545303) @@ -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) -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008191038.07JAce16052067>