Skip to content

Commit

Permalink
graphics/dspdfviewer: simplify logic for -Wno-error=extra-semi-stmt
Browse files Browse the repository at this point in the history
I first bogusly added OSVERSION < 1300000 at the end, but in hindsight
and from looking at svnweb the version logic after 11.3 EOL is
v >= 1300014 || (v in 1104000 .. 1200000) || v >= 1201000
==
(v in 1104000 .. 1200000) || v >= 1201000
==
(v >= 1200000 && v < 1201000)

So the port should not relax the check on (early) 12.0, which we can as
well leave out.

While here, add a note about upstream #191 still being open.

Phabricator:	D26646
  • Loading branch information
rene0 committed Oct 21, 2020
1 parent 0de9828 commit 34fe03d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion graphics/dspdfviewer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,12 @@ CFLAGS+= -Wno-error=undefined-func-template
.endif

.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200039 && ${CHOSEN_COMPILER_TYPE} == clang
# (rene) also related to issue #191 which is still open as of 2020-10-21
CFLAGS+= -Wno-error=zero-as-null-pointer-constant
.endif

# Fixes build failure for Clang 8.0.0
.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1300014 || (${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) || ${OSVERSION} >= 1201000) && ${CHOSEN_COMPILER_TYPE} == clang
.if ${OPSYS} == FreeBSD && && ${CHOSEN_COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=extra-semi-stmt
.endif

Expand Down

0 comments on commit 34fe03d

Please sign in to comment.