Skip to content

Commit

Permalink
Merge pull request #377 from LDeakin/zlib_1.3.1
Browse files Browse the repository at this point in the history
Bump zlib to 1.3.1 from 1.2.13
  • Loading branch information
FrancescAlted authored Jan 25, 2024
2 parents b886c11 + fbc0cff commit bf39064
Show file tree
Hide file tree
Showing 265 changed files with 20,281 additions and 17,692 deletions.
2 changes: 1 addition & 1 deletion RELEASE_NOTES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Changes from 1.21.5 to 1.21.6
=============================

#XXX version-specific blurb XXX#
* Zlib updated to 1.3.1


Changes from 1.21.4 to 1.21.5
Expand Down
2 changes: 1 addition & 1 deletion bench/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ LDFLAGS += -DHAVE_SNAPPY -lsnappy
LDFLAGS += -DHAVE_ZLIB -lz

# Support for internal Zlib
#ZLIB_DIR = ../internal-complibs/zlib-1.2.13
#ZLIB_DIR = ../internal-complibs/zlib-1.3.1
#CFLAGS += -DHAVE_ZLIB -I$(ZLIB_DIR)
#SOURCES += $(wildcard $(ZLIB_DIR)/*.c)

Expand Down
2 changes: 1 addition & 1 deletion bench/Makefile.mingw
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ LDFLAGS=-DHAVE_ZLIB -I$(ZLIB_ROOT)/include -lzdll -L$(ZLIB_ROOT)/lib
#LDFLAGS=-DHAVE_ZLIB -I$(ZLIB_ROOT)/include -lz -L$(ZLIB_ROOT)/lib

# Support for internal Zlib
#ZLIB_DIR = ../internal-complibs/zlib-1.2.13
#ZLIB_DIR = ../internal-complibs/zlib-1.3.1
#CFLAGS += -DHAVE_ZLIB -I$(ZLIB_DIR)
#SOURCES += $(wildcard $(ZLIB_DIR)/*.c)

Expand Down
2 changes: 1 addition & 1 deletion blosc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if(NOT DEACTIVATE_ZLIB)
if (ZLIB_FOUND)
set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
else(ZLIB_FOUND)
set(ZLIB_LOCAL_DIR ${INTERNAL_LIBS}/zlib-1.2.13)
set(ZLIB_LOCAL_DIR ${INTERNAL_LIBS}/zlib-1.3.1)
set(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIRS} ${ZLIB_LOCAL_DIR})
endif(ZLIB_FOUND)
endif(NOT DEACTIVATE_ZLIB)
Expand Down

This file was deleted.

Loading

0 comments on commit bf39064

Please sign in to comment.