Skip to content

Commit 475ffe2

Browse files
committed
Try workaround for libc++
1 parent a2c21c2 commit 475ffe2

File tree

5 files changed

+47
-2
lines changed

5 files changed

+47
-2
lines changed

.github/workflows/RHUB-check.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
on:
2+
push:
3+
pull_request:
4+
5+
name: RHUB-check
6+
7+
jobs:
8+
R-CMD-check:
9+
runs-on: ubuntu-latest
10+
name: r-hub2/${{ matrix.container }}
11+
container: ghcr.io/r-hub/containers/${{ matrix.container }}:latest
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
container: [ 'clang18', 'clang20', 'ubuntu-clang' ]
16+
17+
env:
18+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
19+
R_KEEP_PKG_SOURCE: yes
20+
DOWNLOAD_STATIC_LIBV8: true
21+
22+
steps:
23+
- uses: actions/checkout@v4
24+
25+
- uses: r-lib/actions/setup-pandoc@v2
26+
27+
- uses: r-lib/actions/setup-r-dependencies@v2
28+
with:
29+
extra-packages: any::rcmdcheck
30+
needs: check
31+
32+
- uses: r-lib/actions/check-r-package@v2

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: magick
22
Type: Package
33
Title: Advanced Graphics and Image-Processing in R
4-
Version: 2.8.6
4+
Version: 2.8.7
55
Authors@R: person("Jeroen", "Ooms", role = c("aut", "cre"), email = "[email protected]",
66
comment = c(ORCID = "0000-0002-4035-0289"))
77
Description: Bindings to 'ImageMagick': the most comprehensive open-source image

NEWS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2.8.7
2+
- Vendor a static build on Linux libc++ systems (due to incompatibility
3+
with the local ImageMagick-7, see CRAN notes)
4+
- Warn Conda users that they should use conda to install this package
5+
6+
2.8.6
7+
- Add dependency on R (>= 4.1.0)
8+
19
2.8.5
210
- Reduce some test verbosity as per CRAN request
311
- Update maintainer email address

cleanup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/sh
2-
rm -f src/Makevars configure.log autobrew
2+
rm -f src/Makevars configure.log autobrew get-im*.sh

configure

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ if [ -z "$PKGCONFIG_LIBS" ] && [ `command -v GraphicsMagick++-config` ]; then
2626
echo "Warning: found GraphicsMagick++ instead of ImageMagick++. GraphicsMagick is not supported."
2727
fi
2828

29+
# CRAN Linux LIBC++ is incompatible with Fedora-42 ImageMagick-7
30+
if [ "$(uname -sm)" = "Linux x86_64" ] && echo "$CXX" | grep -Fq "clang"; then
31+
curl -sOL "https://github.com/ropensci/magick/releases/download/ImageMagick-6.9.13-25/get-im-linux.sh" && . ./get-im-linux.sh || true
32+
fi
33+
2934
# Note that cflags may be empty in case of success
3035
if [ "$INCLUDE_DIR" ] || [ "$LIB_DIR" ]; then
3136
echo "Found INCLUDE_DIR and/or LIB_DIR!"

0 commit comments

Comments
 (0)