Skip to content

Commit 21ec575

Browse files
committed
Add libxml2 and update libffi (for wayland)
1 parent 4ee57dd commit 21ec575

File tree

6 files changed

+40
-11
lines changed

6 files changed

+40
-11
lines changed

buildconfig/manylinux-build/docker_base/Dockerfile-aarch64

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ RUN ["bash", "/pkg-config_build/build-pkg-config.sh"]
4444
ADD buildtools /buildtools/
4545
RUN ["bash", "/buildtools/install.sh"]
4646

47+
ADD libffi /libffi_build/
48+
RUN ["bash", "/libffi_build/build-libffi.sh"]
49+
50+
ADD libxml2 /libxml2_build/
51+
RUN ["bash", "/libxml2_build/build-libxml2.sh"]
52+
4753
#ADD zlib-ng /zlib-ng_build/
4854
#RUN ["bash", "/zlib-ng_build/build-zlib-ng.sh"]
4955

@@ -94,9 +100,6 @@ RUN ["bash", "/pulseaudio_build/build-pulseaudio.sh"]
94100
ADD libxmp /libxmp_build/
95101
RUN ["bash", "/libxmp_build/build-libxmp.sh"]
96102

97-
ADD libffi /libffi_build/
98-
RUN ["bash", "/libffi_build/build-libffi.sh"]
99-
100103
# explicit install not needed anymore
101104
# ADD gettext /gettext_build/
102105
# RUN ["bash", "/gettext_build/build-gettext.sh"]

buildconfig/manylinux-build/docker_base/Dockerfile-i686

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ RUN ["linux32", "bash", "/pkg-config_build/build-pkg-config.sh"]
4444
ADD buildtools /buildtools/
4545
RUN ["linux32", "bash", "/buildtools/install.sh"]
4646

47+
ADD libffi /libffi_build/
48+
RUN ["linux32", "bash", "/libffi_build/build-libffi.sh"]
49+
50+
ADD libxml2 /libxml2_build/
51+
RUN ["linux32", "bash", "/libxml2_build/build-libxml2.sh"]
52+
4753
#ADD zlib-ng /zlib-ng_build/
4854
#RUN ["linux32", "bash", "/zlib-ng_build/build-zlib-ng.sh"]
4955

@@ -94,15 +100,12 @@ RUN ["linux32", "bash", "/pulseaudio_build/build-pulseaudio.sh"]
94100
ADD libxmp /libxmp_build/
95101
RUN ["linux32", "bash", "/libxmp_build/build-libxmp.sh"]
96102

97-
ADD libffi /libffi_build/
98-
RUN ["bash", "/libffi_build/build-libffi.sh"]
99-
100103
# explicit install not needed anymore
101104
# ADD gettext /gettext_build/
102105
# RUN ["bash", "/gettext_build/build-gettext.sh"]
103106

104107
ADD glib /glib_build/
105-
RUN ["bash", "/glib_build/build-glib.sh"]
108+
RUN ["linux32", "bash", "/glib_build/build-glib.sh"]
106109

107110
ADD fluidsynth /fluidsynth_build/
108111
RUN ["linux32", "bash", "/fluidsynth_build/build-fluidsynth.sh"]

buildconfig/manylinux-build/docker_base/Dockerfile-x86_64

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ RUN ["bash", "/pkg-config_build/build-pkg-config.sh"]
4444
ADD buildtools /buildtools/
4545
RUN ["bash", "/buildtools/install.sh"]
4646

47+
ADD libffi /libffi_build/
48+
RUN ["bash", "/libffi_build/build-libffi.sh"]
49+
50+
ADD libxml2 /libxml2_build/
51+
RUN ["bash", "/libxml2_build/build-libxml2.sh"]
52+
4753
#ADD zlib-ng /zlib-ng_build/
4854
#RUN ["bash", "/zlib-ng_build/build-zlib-ng.sh"]
4955

@@ -94,9 +100,6 @@ RUN ["bash", "/pulseaudio_build/build-pulseaudio.sh"]
94100
ADD libxmp /libxmp_build/
95101
RUN ["bash", "/libxmp_build/build-libxmp.sh"]
96102

97-
ADD libffi /libffi_build/
98-
RUN ["bash", "/libffi_build/build-libffi.sh"]
99-
100103
# explicit install not needed anymore
101104
# ADD gettext /gettext_build/
102105
# RUN ["bash", "/gettext_build/build-gettext.sh"]

buildconfig/manylinux-build/docker_base/libffi/build-libffi.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ sha512sum -c libffi.sha512
1313
tar xzf ${LIBFFI}.tar.gz
1414
cd $LIBFFI
1515

16-
./configure $PG_BASE_CONFIGURE_FLAGS
16+
# --disable-multi-os-directory is passed so that /usr/local/lib is used
17+
./configure $PG_BASE_CONFIGURE_FLAGS --disable-docs --disable-multi-os-directory
1718
make
1819
make install
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
set -e -x
3+
4+
cd $(dirname `readlink -f "$0"`)
5+
6+
LIBXML2_VER=2.11
7+
LIBXML2_PATCH=7
8+
LIBXML2="libxml2-$LIBXML2_VER.$LIBXML2_PATCH"
9+
10+
curl -sL --retry 10 https://download.gnome.org/sources/libxml2/${LIBXML2_VER}/${LIBXML2}.tar.xz > ${LIBXML2}.tar.xz
11+
sha512sum -c libxml2.sha512
12+
13+
tar xf ${LIBXML2}.tar.xz
14+
cd $LIBXML2
15+
16+
./configure $PG_BASE_CONFIGURE_FLAGS --disable-static --with-python=no
17+
make
18+
make install
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
202b0523d982eb5269dcb4644d8ab2ea31404771069462cdd6c5cd7e6672e0e50371ceb334133bb8f2c0a42f133e8f40c3f582bba5fc71ab168a2b18d4cfd81d libxml2-2.11.7.tar.xz

0 commit comments

Comments
 (0)