mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng16] Use --zprefix in oss-fuzz libpng build to avoid conflict with system libz.

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2017-10-03 09:51:09 -05:00
parent edb1f47139
commit 477a241c10
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ANNOUNCE
View File

@ -1,4 +1,4 @@
Libpng 1.6.35beta01 - October 1, 2017 Libpng 1.6.35beta01 - October 3, 2017
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -24,10 +24,11 @@ Other information:
Changes since the last public release (1.6.34): Changes since the last public release (1.6.34):
Version 1.6.35beta01 [October 1, 2017] Version 1.6.35beta01 [October 3, 2017]
Restored 21 of the contrib/pngsuite/i*.png, which do not cause test Restored 21 of the contrib/pngsuite/i*.png, which do not cause test
failures. Placed the remainder in contrib/pngsuite/interlaced/i*.png. failures. Placed the remainder in contrib/pngsuite/interlaced/i*.png.
Clone zlib into the oss-fuzz zlib project and build zlib alongside libpng. Clone zlib into the oss-fuzz zlib project and build zlib alongside libpng.
Use --zprefix in oss-fuzz libpng build to avoid conflict with system libz.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

3
CHANGES
View File

@ -6040,10 +6040,11 @@ Version 1.6.33 [September 28, 2017]
Version 1.6.34 [September 29, 2017] Version 1.6.34 [September 29, 2017]
Removed contrib/pngsuite/i*.png; some of caused test failures. Removed contrib/pngsuite/i*.png; some of caused test failures.
Version 1.6.35beta01 [October 1, 2017] Version 1.6.35beta01 [October 3, 2017]
Restored 21 of the contrib/pngsuite/i*.png, which do not cause test Restored 21 of the contrib/pngsuite/i*.png, which do not cause test
failures. Placed the remainder in contrib/pngsuite/interlaced/i*.png. failures. Placed the remainder in contrib/pngsuite/interlaced/i*.png.
Clone zlib into the oss-fuzz zlib project and build zlib alongside libpng. Clone zlib into the oss-fuzz zlib project and build zlib alongside libpng.
Use --zprefix in oss-fuzz libpng build to avoid conflict with system libz.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

4
contrib/oss-fuzz/build.sh
View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# Last changed in libpng 1.6.35 [October 1, 2017] # Last changed in libpng 1.6.35 [October 3, 2017]
# #
# Revisions by Glenn Randers-Pehrson, 2017: # Revisions by Glenn Randers-Pehrson, 2017:
# 1. Build only the library, not the tools (changed "make -j$(nproc) all" to # 1. Build only the library, not the tools (changed "make -j$(nproc) all" to
@ -32,7 +32,7 @@ cat scripts/pnglibconf.dfa | \
mv scripts/pnglibconf.dfa.temp scripts/pnglibconf.dfa mv scripts/pnglibconf.dfa.temp scripts/pnglibconf.dfa
# build zlib library. # build zlib library.
(cd ../zlib; ./configure; make -j$(nproc) clean; make -j$(nproc) all) (cd ../zlib; ./configure --zprefix; make -j$(nproc) clean; make -j$(nproc) all)
# build the libpng library. # build the libpng library.
autoreconf -f -i autoreconf -f -i