[prev in list] [next in list] [prev in thread] [next in thread] 

List:       graphicsmagick-commit
Subject:    [GM-commit] GraphicsMagick: fuzzing/oss-fuzz-build.sh: Restore xz to oss-fuz...
From:       GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date:       2020-03-31 14:04:14
Message-ID: mailman.76479.1585663465.2125.graphicsmagick-commit () lists ! sourceforge ! net
[Download RAW message or body]

changeset 48788464cee4 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=48788464cee4
                
summary: fuzzing/oss-fuzz-build.sh: Restore xz to oss-fuzz build due to build \
problems getting worked out.

diffstat:

 ChangeLog                              |   5 +++++
 VisualMagick/installer/inc/version.isx |   4 ++--
 fuzzing/oss-fuzz-build.sh              |  16 ++++++++--------
 magick/version.h                       |   4 ++--
 www/Changelog.html                     |   7 +++++++
 5 files changed, 24 insertions(+), 12 deletions(-)

diffs (87 lines):

diff -r c22cb6ffe2e8 -r 48788464cee4 ChangeLog
--- a/ChangeLog	Sat Mar 28 09:25:03 2020 -0500
+++ b/ChangeLog	Tue Mar 31 09:04:12 2020 -0500
@@ -1,3 +1,8 @@
+2020-03-29  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+	* fuzzing/oss-fuzz-build.sh: Restore xz to oss-fuzz build due to
+	build problems getting worked out.
+
 2020-03-28  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
 	* fuzzing/oss-fuzz-build.sh (MAGICK_LIBS): Remove mention of
diff -r c22cb6ffe2e8 -r 48788464cee4 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Sat Mar 28 09:25:03 2020 -0500
+++ b/VisualMagick/installer/inc/version.isx	Tue Mar 31 09:04:12 2020 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020200328"
-#define public MagickPackageReleaseDate "snapshot-20200328"
+#define public MagickPackageVersionAddendum ".020200329"
+#define public MagickPackageReleaseDate "snapshot-20200329"
diff -r c22cb6ffe2e8 -r 48788464cee4 fuzzing/oss-fuzz-build.sh
--- a/fuzzing/oss-fuzz-build.sh	Sat Mar 28 09:25:03 2020 -0500
+++ b/fuzzing/oss-fuzz-build.sh	Tue Mar 31 09:04:12 2020 -0500
@@ -12,13 +12,13 @@
 popd
 
 # build xz
-#echo "=== Building xz..."
-#pushd "$SRC/xz"
-#./autogen.sh
-#PKG_CONFIG_PATH="$WORK/lib/pkgconfig" ./configure --disable-xz --disable-lzmadec \
--disable-lzmainfo --disable-lzma-links --disable-scripts --disable-doc \
                --with-pic=yes --prefix="$WORK"
-#make -j$(nproc)
-#make install
-#popd
+echo "=== Building xz..."
+pushd "$SRC/xz"
+./autogen.sh
+PKG_CONFIG_PATH="$WORK/lib/pkgconfig" ./configure --disable-xz --disable-lzmadec \
--disable-lzmainfo --disable-lzma-links --disable-scripts --disable-doc \
--with-pic=yes --prefix="$WORK" +make -j$(nproc)
+make install
+popd
 
 # build zstd
 echo "==== Building zstd..."
@@ -88,7 +88,7 @@
 # Order libraries in linkage dependency order so libraries on the
 # right provide symbols needed by libraries to the left, to the
 # maximum extent possible.
-MAGICK_LIBS="$WORK/lib/libpng.a $WORK/lib/libtiff.a $WORK/lib/liblcms2.a \
$WORK/lib/libwebpmux.a $WORK/lib/libwebp.a $WORK/lib/libturbojpeg.a \
$WORK/lib/libfreetype.a $WORK/lib/libzstd.a $WORK/lib/libz.a " # Used to have \
$WORK/lib/liblzma.a +MAGICK_LIBS="$WORK/lib/libpng.a $WORK/lib/libtiff.a \
$WORK/lib/liblcms2.a $WORK/lib/libwebpmux.a $WORK/lib/libwebp.a \
$WORK/lib/libturbojpeg.a $WORK/lib/libfreetype.a $WORK/lib/libzstd.a \
$WORK/lib/liblzma.a $WORK/lib/libz.a "  
 echo "=== Building fuzzers..."
 for f in fuzzing/*_fuzzer.cc; do
diff -r c22cb6ffe2e8 -r 48788464cee4 magick/version.h
--- a/magick/version.h	Sat Mar 28 09:25:03 2020 -0500
+++ b/magick/version.h	Tue Mar 31 09:04:12 2020 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x242100
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 24,21,0
-#define MagickChangeDate   "20200328"
-#define MagickReleaseDate  "snapshot-20200328"
+#define MagickChangeDate   "20200329"
+#define MagickReleaseDate  "snapshot-20200329"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r c22cb6ffe2e8 -r 48788464cee4 www/Changelog.html
--- a/www/Changelog.html	Sat Mar 28 09:25:03 2020 -0500
+++ b/www/Changelog.html	Tue Mar 31 09:04:12 2020 -0500
@@ -35,6 +35,13 @@
 <div class="document">
 
 
+<p>2020-03-29  Bob Friesenhahn  &lt;<a class="reference external" \
href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#6 \
4;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 +<blockquote>
+<ul class="simple">
+<li>fuzzing/oss-fuzz-build.sh: Restore xz to oss-fuzz build due to
+build problems getting worked out.</li>
+</ul>
+</blockquote>
 <p>2020-03-28  Bob Friesenhahn  &lt;<a class="reference external" \
href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#6 \
4;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
  <blockquote>
 <ul class="simple">


_______________________________________________
Graphicsmagick-commit mailing list
Graphicsmagick-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit


[prev in list] [next in list] [prev in thread] [next in thread]