Skip to content

Commit

Permalink
[ImageMagick] Link some utilities to librt because of clock_gettime
Browse files Browse the repository at this point in the history
  • Loading branch information
giordano committed Aug 22, 2021
1 parent 26afe07 commit f3850e7
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 4 deletions.
23 changes: 19 additions & 4 deletions I/ImageMagick/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,33 @@
# `julia build_tarballs.jl --help` to see a usage message.
using BinaryBuilder
name = "ImageMagick"
version = v"6.9.12"
upstream_version = v"6.9.12-19"
version = VersionNumber(upstream_version.major, upstream_version.minor, upstream_version.patch)

# Collection of sources required to build imagemagick
sources = [
ArchiveSource("https://github.com/ImageMagick/ImageMagick6/archive/6.9.12-19.tar.gz",
"2f184f1f5c3e19849347b2b4acb6dd074290903d36fa5924956ee06c85ddf783"),
ArchiveSource("https://github.com/ImageMagick/ImageMagick6/archive/$(upstream_version).tar.gz",
"2f184f1f5c3e19849347b2b4acb6dd074290903d36fa5924956ee06c85ddf783"),
DirectorySource("./bundled"),
]

# Bash recipe for building across all platforms
script = raw"""
cd $WORKSPACE/srcdir/ImageMagick6*/
./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target} --without-x --disable-openmp --disable-installed --disable-dependency-tracking --without-frozenpaths --without-perl --disable-docs --disable-static
if [[ "${target}" == *-linux-gnu ]]; then
atomic_patch -p1 ../patches/utilities-link-rt.patch
fi
./configure --prefix=${prefix} \
--build=${MACHTYPE} \
--host=${target} \
--without-x \
--disable-openmp \
--disable-installed \
--disable-dependency-tracking \
--without-frozenpaths \
--without-perl \
--disable-docs \
--disable-static
make -j${nproc}
make install
"""
Expand Down
51 changes: 51 additions & 0 deletions I/ImageMagick/bundled/patches/utilities-link-rt.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -5471,37 +5471,37 @@
$(UTILITIES_TTF_XFAIL_TESTS) \
$(UTILITIES_XML_XFAIL_TESTS)

-utilities_animate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_animate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) -lrt
utilities_animate_LDFLAGS = $(LDFLAGS)
utilities_animate_SOURCES = utilities/animate.c
-utilities_compare_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_compare_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) -lrt
utilities_compare_LDFLAGS = $(LDFLAGS)
utilities_compare_SOURCES = utilities/compare.c
-utilities_composite_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_composite_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) -lrt
utilities_composite_LDFLAGS = $(LDFLAGS)
utilities_composite_SOURCES = utilities/composite.c
-utilities_conjure_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_conjure_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) -lrt
utilities_conjure_LDFLAGS = $(LDFLAGS)
utilities_conjure_SOURCES = utilities/conjure.c
-utilities_convert_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_convert_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) -lrt
utilities_convert_LDFLAGS = $(LDFLAGS)
utilities_convert_SOURCES = utilities/convert.c
-utilities_display_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_display_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) -lrt
utilities_display_LDFLAGS = $(LDFLAGS)
utilities_display_SOURCES = utilities/display.c
-utilities_identify_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_identify_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) -lrt
utilities_identify_LDFLAGS = $(LDFLAGS)
utilities_identify_SOURCES = utilities/identify.c
-utilities_import_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_import_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) -lrt
utilities_import_LDFLAGS = $(LDFLAGS)
utilities_import_SOURCES = utilities/import.c
-utilities_mogrify_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_mogrify_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) -lrt
utilities_mogrify_LDFLAGS = $(LDFLAGS)
utilities_mogrify_SOURCES = utilities/mogrify.c
-utilities_montage_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_montage_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) -lrt
utilities_montage_LDFLAGS = $(LDFLAGS)
utilities_montage_SOURCES = utilities/montage.c
-utilities_stream_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_stream_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) -lrt
utilities_stream_LDFLAGS = $(LDFLAGS)
utilities_stream_SOURCES = utilities/stream.c
UTILITIES_MANS = \

0 comments on commit f3850e7

Please sign in to comment.