Skip to content

Commit

Permalink
media-gfx/darktable: only test the toolchain if [[ ${MERGE_TYPE} != b…
Browse files Browse the repository at this point in the history
…inary ]]

Again, not touching 2.6.2.

Signed-off-by: Marek Szuba <[email protected]>
  • Loading branch information
Marek Szuba committed Jun 18, 2020
1 parent 9fcc122 commit 22cceff
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 23 deletions.
18 changes: 10 additions & 8 deletions media-gfx/darktable/darktable-3.0.2-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,16 @@ PATCHES=(
S="${WORKDIR}/${P/_/~}"

pkg_pretend() {
# Bug #695658
if tc-is-gcc; then
test-flags-CC -floop-block &> /dev/null || \
die "Please switch to a gcc version built with USE=graphite"
fi

if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible compiler"
if [[ ${MERGE_TYPE} != binary ]]; then
# Bug #695658
if tc-is-gcc; then
test-flags-CC -floop-block &> /dev/null || \
die "Please switch to a gcc version built with USE=graphite"
fi

if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible compiler"
fi
fi
}

Expand Down
18 changes: 10 additions & 8 deletions media-gfx/darktable/darktable-3.0.2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,16 @@ PATCHES=(
S="${WORKDIR}/${P/_/~}"

pkg_pretend() {
# Bug #695658
if tc-is-gcc; then
test-flags-CC -floop-block &> /dev/null || \
die "Please switch to a gcc version built with USE=graphite"
fi

if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible compiler"
if [[ ${MERGE_TYPE} != binary ]]; then
# Bug #695658
if tc-is-gcc; then
test-flags-CC -floop-block &> /dev/null || \
die "Please switch to a gcc version built with USE=graphite"
fi

if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible compiler"
fi
fi
}

Expand Down
16 changes: 9 additions & 7 deletions media-gfx/darktable/darktable-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,16 @@ PATCHES=(
)

pkg_pretend() {
# Bug #695658
if tc-is-gcc; then
test-flags-CC -floop-block &> /dev/null || \
die "Please switch to a gcc version built with USE=graphite"
fi
if [[ ${MERGE_TYPE} != binary ]]; then
# Bug #695658
if tc-is-gcc; then
test-flags-CC -floop-block &> /dev/null || \
die "Please switch to a gcc version built with USE=graphite"
fi

if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible compiler"
if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible compiler"
fi
fi
}

Expand Down

0 comments on commit 22cceff

Please sign in to comment.