From cf16973e03a6524fce4026fb2a1b7f7a70524345 Mon Sep 17 00:00:00 2001 From: finitemonkey Date: Fri, 10 Apr 2020 10:51:26 +0100 Subject: Ensure that DMagick is not rebuilt unnecessarily. Prevents dmagick/c/magickVersion.d from being written unless its content has changed, thereby avoiding the file's updated mtime from triggering an unnecessary rebuild. Fixes: https://github.com/MikeWey/DMagick/issues/24 --- build-aux/magickVersion.cache | 0 build-aux/magickVersion.sh | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 build-aux/magickVersion.cache diff --git a/build-aux/magickVersion.cache b/build-aux/magickVersion.cache new file mode 100644 index 0000000..e69de29 diff --git a/build-aux/magickVersion.sh b/build-aux/magickVersion.sh index 3a43d05..e969f9d 100755 --- a/build-aux/magickVersion.sh +++ b/build-aux/magickVersion.sh @@ -2,6 +2,10 @@ echo $PACKAGE_DIR +CACHE_FILE=$PACKAGE_DIR/build-aux/magickVersion.cache + +MAGICK_VERSION_CACHED="$(cat $CACHE_FILE 2>/dev/null)" + MAGICK_VERSION=$(pkg-config --modversion MagickCore | tr -d '.') MAGICK_VERSION_TEXT=$(pkg-config --modversion MagickCore) MAGICK_QUANTUM_DEPTH="16" @@ -19,7 +23,11 @@ if [ -n "$(pkg-config --variable=libname MagickCore | grep HDRI)" ]; then MAGICK_HDRI="true" fi -sed 's/@MagickLibVersion@/'$MAGICK_VERSION'/g' "$PACKAGE_DIR/dmagick/c/magickVersion.d.in" | \ -sed 's/@MagickLibVersionText@/'$MAGICK_VERSION_TEXT'/g' | \ -sed 's/@QuantumDepth@/'$MAGICK_QUANTUM_DEPTH'/g' | \ -sed 's/@HDRI@/'$MAGICK_HDRI'/g' > "$PACKAGE_DIR/dmagick/c/magickVersion.d" +if [ "$MAGICK_VERSION_CACHED" != "$MAGICK_VERSION_TEXT" ]; then + echo -n "$MAGICK_VERSION_TEXT" > $CACHE_FILE + + sed 's/@MagickLibVersion@/'$MAGICK_VERSION'/g' "$PACKAGE_DIR/dmagick/c/magickVersion.d.in" | \ + sed 's/@MagickLibVersionText@/'$MAGICK_VERSION_TEXT'/g' | \ + sed 's/@QuantumDepth@/'$MAGICK_QUANTUM_DEPTH'/g' | \ + sed 's/@HDRI@/'$MAGICK_HDRI'/g' > "$PACKAGE_DIR/dmagick/c/magickVersion.d" +fi -- cgit v1.2.3