Skip to content

Commit 3618966

Browse files
committed
use cmake to build libxml2
1 parent ae973ea commit 3618966

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

Dockerfile.linux

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ RUN tar -xf cmake-3.26.5-linux-x86_64.tar.gz
2121
RUN mv cmake-3.26.5-linux-x86_64 opt
2222
ENV CMAKE_ROOT=/ffmpeg-static/opt/share/cmake-3.27
2323

24-
# Install a recent version of pkg-config
25-
RUN wget https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz && \
26-
tar -xf pkg-config-0.28.tar.gz && \
27-
cd pkg-config-0.28 && \
28-
./configure --with-internal-glib --prefix=/ffmpeg-static/opt && make && make install
29-
3024
# Install a recent version of yasm
3125
RUN git clone https://github.com/yasm/yasm.git && \
3226
cd yasm \

docker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ set -euo pipefail
66

77
version=$(<VERSION)
88

9-
docker build -t linux . -f ./Dockerfile.linux
10-
docker build -t windows . -f ./Dockerfile.windows
9+
docker build -t linux . -f ./Dockerfile.linux --progress=plain
10+
docker build -t windows . -f ./Dockerfile.windows --progress=plain
1111

1212
mkdir dist
1313

recipes/libxml2.sh

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,18 @@ function setup_cross {
33
}
44

55
function build {
6-
./autogen.sh
7-
./configure --prefix=$dist/$1 \
8-
$autotools_options \
9-
--enable-static \
10-
--without-iconv \
11-
--without-lzma \
12-
--without-python
13-
make -$MJ
6+
mkdir build
7+
cd build
8+
cmake \
9+
$cmake_options \
10+
-DCMAKE_INSTALL_PREFIX="$dist/$1" \
11+
-DLIBXML2_WITH_LZMA=OFF \
12+
-DLIBXML2_WITH_ICONV=OFF \
13+
-DLIBXML2_WITH_PYTHON=OFF \
14+
-DLIBXML2_WITH_ZLIB=OFF \
15+
-DBUILD_SHARED_LIBS=OFF \
16+
-DCMAKE_BUILD_TYPE=Release \
17+
..
1418
make install
1519
}
1620

0 commit comments

Comments
 (0)