Skip to content

Commit a851c7d

Browse files
committed
Use system zlib for all platforms
1 parent ab90c12 commit a851c7d

File tree

6 files changed

+6
-3
lines changed

6 files changed

+6
-3
lines changed

prepare-debian-ubuntu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
# Install build dependencies
44
sudo apt-get install $@ \
5-
file bison make flex texinfo gettext g++ gcc git libgmp3-dev libmpfr-dev libmpc-dev libncurses5-dev
5+
file bison make flex texinfo gettext g++ gcc git libgmp3-dev libmpfr-dev libmpc-dev libncurses5-dev zlib1g-dev

prepare-fedora.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# Install build dependencies
44
sudo dnf install $@ \
55
gcc gcc-c++ make git gettext texinfo bison flex gmp-devel mpfr-devel libmpc-devel \
6-
ncurses-devel diffutils gawk file
6+
ncurses-devel diffutils gawk file zlib-ng-devel

prepare-mac-os.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fi
4848
# actual installation
4949
if [ $try_brew -eq 1 ]; then
5050
CURRENT_USER=$(stat -f '%Su' /dev/console)
51-
sudo -u $CURRENT_USER brew install gettext texinfo bison flex gnu-sed gsl gmp mpfr
51+
sudo -u $CURRENT_USER brew install gettext texinfo bison flex gnu-sed gsl gmp mpfr zlib
5252
exit
5353
fi
5454
if [ $try_port -eq 1 ]; then

scripts/001-binutils.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ WITH_PYTHON="${WITH_PYTHON:-no}"
6868
--disable-initfini-array \
6969
--with-python="$WITH_PYTHON" \
7070
--disable-werror \
71+
--with-system-zlib \
7172
$TARG_XTRA_OPTS
7273

7374
## Compile and install.

scripts/002-gcc-stage1.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ cd build-$TARGET-stage1
7272
--disable-libmudflap \
7373
--disable-libquadmath \
7474
--disable-nls \
75+
--with-system-zlib \
7576
$TARG_XTRA_OPTS
7677

7778
## Compile and install.

scripts/005-gcc-stage2.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ cd build-$TARGET-stage2
7070
--enable-threads=posix \
7171
--disable-tls \
7272
--disable-nls \
73+
--with-system-zlib \
7374
$TARG_XTRA_OPTS
7475

7576
## Compile and install.

0 commit comments

Comments
 (0)