Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing build regression [BISON COMPILE] #871

Closed
wants to merge 25 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions packages/php-wasm/compile/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ RUN cd php-src && ./buildconf --force

# Bring in the libraries
RUN mkdir -p /root/lib/include /root/lib/lib /libs
COPY ../bison2.7/dist/ /libs/bison2.7
COPY ../libedit/dist/root/lib /root/lib
COPY ../libiconv/dist/root/lib /root/lib
COPY ../libncurses/dist/root/lib /root/lib
COPY ../libopenssl/dist/root/lib /root/lib
COPY ../libpng16/dist/root/lib /root/lib
COPY ../libsqlite3/dist/root/lib /root/lib
COPY ../libxml2/dist/root/lib /root/lib
COPY ../libz/dist/root/lib /root/lib
COPY ../libzip/dist/1.2.0/root/lib /libs/libzip/1.2.0
COPY ../libzip/dist/1.9.2/root/lib /libs/libzip/1.9.2
COPY ./bison2.7/dist/ /libs/bison2.7
COPY ./libedit/dist/root/lib /root/lib
COPY ./libiconv/dist/root/lib /root/lib
COPY ./libncurses/dist/root/lib /root/lib
COPY ./libopenssl/dist/root/lib /root/lib
COPY ./libpng16/dist/root/lib /root/lib
COPY ./libsqlite3/dist/root/lib /root/lib
COPY ./libxml2/dist/root/lib /root/lib
COPY ./libz/dist/root/lib /root/lib
COPY ./libzip/dist/1.2.0/root/lib /libs/libzip/1.2.0
COPY ./libzip/dist/1.9.2/root/lib /libs/libzip/1.9.2

# Build PHP

Expand Down Expand Up @@ -59,9 +59,12 @@ RUN touch /root/.configure-flags && \
# PHP <= 7.3 requires Bison 2.7
# PHP >= 7.4 and Bison 3.0
RUN if [[ "${PHP_VERSION:0:1}" -le "7" && "${PHP_VERSION:2:1}" -le "3" ]]; then \
mv /libs/bison2.7/usr/local/bison /usr/local/bison && \
ln -s /usr/local/bison/bin/bison /usr/bin/bison && \
ln -s /usr/local/bison/bin/yacc /usr/bin/yacc; \
wget http://launchpadlibrarian.net/140087283/libbison-dev_2.7.1.dfsg-1_amd64.deb; \
wget http://launchpadlibrarian.net/140087282/bison_2.7.1.dfsg-1_amd64.deb; \
apt install -y --allow-downgrades ./libbison-dev_2.7.1.dfsg-1_amd64.deb; \
apt install -y --allow-downgrades ./bison_2.7.1.dfsg-1_amd64.deb; \
apt-mark hold libbison-dev; \
apt-mark hold bison; \
adamziel marked this conversation as resolved.
Show resolved Hide resolved
else \
apt install -y bison; \
adamziel marked this conversation as resolved.
Show resolved Hide resolved
fi;
Expand Down
Loading