diff options
| author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-08-19 10:37:47 +0000 |
|---|---|---|
| committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-08-19 10:37:47 +0000 |
| commit | cb27f8abb7bf47f40c355fb63ba2b85c7092e536 (patch) | |
| tree | 100440e22faec9795b94ecc49254d07d2117d36a /deskutils/terminal-image-viewer | |
| parent | e0aecbef8d1f599555dd5f7cf0357107e6f76752 (diff) | |
| download | ports-cb27f8abb7bf47f40c355fb63ba2b85c7092e536.tar.gz ports-cb27f8abb7bf47f40c355fb63ba2b85c7092e536.zip | |
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)
Notes
Notes:
svn path=/head/; revision=545302
Diffstat (limited to 'deskutils/terminal-image-viewer')
| -rw-r--r-- | deskutils/terminal-image-viewer/Makefile | 8 | ||||
| -rw-r--r-- | deskutils/terminal-image-viewer/files/extra-patch-Makefile | 11 | ||||
| -rw-r--r-- | deskutils/terminal-image-viewer/files/patch-Makefile | 9 |
3 files changed, 16 insertions, 12 deletions
diff --git a/deskutils/terminal-image-viewer/Makefile b/deskutils/terminal-image-viewer/Makefile index f81eee713fa3..f8040fcad463 100644 --- a/deskutils/terminal-image-viewer/Makefile +++ b/deskutils/terminal-image-viewer/Makefile @@ -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> diff --git a/deskutils/terminal-image-viewer/files/extra-patch-Makefile b/deskutils/terminal-image-viewer/files/extra-patch-Makefile new file mode 100644 index 000000000000..47ac850ed7b1 --- /dev/null +++ b/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) + diff --git a/deskutils/terminal-image-viewer/files/patch-Makefile b/deskutils/terminal-image-viewer/files/patch-Makefile index 5d372b63329c..95bfe71538a7 100644 --- a/deskutils/terminal-image-viewer/files/patch-Makefile +++ b/deskutils/terminal-image-viewer/files/patch-Makefile @@ -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) - |