From owner-svn-ports-all@freebsd.org Wed Aug 19 10:38:40 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E2B753BA490; Wed, 19 Aug 2020 10:38:40 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BWklh5lHKz4YyP; Wed, 19 Aug 2020 10:38:40 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A8AC7216E6; Wed, 19 Aug 2020 10:38:40 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07JAcevR052070; Wed, 19 Aug 2020 10:38:40 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07JAce16052067; Wed, 19 Aug 2020 10:38:40 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202008191038.07JAce16052067@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Wed, 19 Aug 2020 10:38:40 +0000 (UTC) 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 X-SVN-Group: ports-branches X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in branches/2020Q3/deskutils/terminal-image-viewer: . files X-SVN-Commit-Revision: 545303 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Aug 2020 10:38:40 -0000 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 + +.if ${CHOSEN_COMPILER_TYPE} == clang +EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile .endif -.include +.include 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) -