Skip to content
This repository was archived by the owner on Nov 24, 2024. It is now read-only.

Commit ca8b954

Browse files
committed
Build libgcrypt and gpgme, mk. 4
1 parent bd60cbc commit ca8b954

File tree

4 files changed

+100
-6
lines changed

4 files changed

+100
-6
lines changed

Dockerfile.centos7-i386

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,22 @@ ARG AUTOMAKE_VERSION=1.16.5
5252
COPY build-automake.sh /
5353
RUN bash -x /build-automake.sh
5454

55-
ARG GPGME_VERSION=1.17.1
56-
COPY build-gpgme.sh /
57-
RUN bash -x /build-gpgme.sh
55+
ARG LIBGPG_ERROR_VERSION=1.45
56+
COPY build-libgpg-error.sh /
57+
RUN bash -x /build-libgpg-error.sh
58+
59+
ARG LIBASSUAN_VERSION=2.5.5
60+
COPY build-libassuan.sh /
61+
RUN bash -x /build-libassuan.sh
5862

5963
ARG LIBGCRYPT_VERSION=1.10.1
6064
COPY build-libgcrypt.sh /
6165
RUN bash -x /build-libgcrypt.sh
6266

67+
ARG GPGME_VERSION=1.17.1
68+
COPY build-gpgme.sh /
69+
RUN bash -x /build-gpgme.sh
70+
6371
# create unprivileged user for non-build-script use of this image
6472
# build-in-docker.sh will likely not use this one, as it enforces the caller's uid inside the container
6573
RUN useradd --system build

Dockerfile.centos7-x86_64

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,22 @@ ARG AUTOMAKE_VERSION=1.16.5
4949
COPY build-automake.sh /
5050
RUN bash -x /build-automake.sh
5151

52-
ARG GPGME_VERSION=1.17.1
53-
COPY build-gpgme.sh /
54-
RUN bash -x /build-gpgme.sh
52+
ARG LIBGPG_ERROR_VERSION=1.45
53+
COPY build-libgpg-error.sh /
54+
RUN bash -x /build-libgpg-error.sh
55+
56+
ARG LIBASSUAN_VERSION=2.5.5
57+
COPY build-libassuan.sh /
58+
RUN bash -x /build-libassuan.sh
5559

5660
ARG LIBGCRYPT_VERSION=1.10.1
5761
COPY build-libgcrypt.sh /
5862
RUN bash -x /build-libgcrypt.sh
5963

64+
ARG GPGME_VERSION=1.17.1
65+
COPY build-gpgme.sh /
66+
RUN bash -x /build-gpgme.sh
67+
6068
# create unprivileged user for non-build-script use of this image
6169
# build-in-docker.sh will likely not use this one, as it enforces the caller's uid inside the container
6270
RUN useradd --system build

build-libassuan.sh

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#! /bin/bash
2+
3+
set -xe
4+
5+
git clone https://dev.gnupg.org/source/libassuan.git -b libassuan-"$LIBASSUAN_VERSION" libassuan-"$LIBASSUAN_VERSION"
6+
7+
cd libassuan-"$LIBASSUAN_VERSION"
8+
9+
# needed for automake
10+
export PATH=/deps/bin:"$PATH"
11+
12+
EXTRA_CONFIGURE_FLAGS=
13+
if [ "$ARCH" == "i386" ]; then
14+
EXTRA_CONFIGURE_FLAGS=" --build=i686-linux-gnu --host=i686-linux-gnu --target=i686-linux-gnu"
15+
elif [ "$ARCH" == "armhf" ] || [ "$ARCH" == "aarch64" ]; then
16+
EXTRA_CONFIGURE_FLAGS=" --host=$DEBARCH --target=$DEBARCH"
17+
fi
18+
19+
[ -f autogen.sh ] && ./autogen.sh
20+
21+
./configure --prefix=/deps $EXTRA_CONFIGURE_FLAGS
22+
23+
set +x
24+
echo "+ make -j$(nproc)" 1>&2
25+
26+
if [ -z $VERBOSE ]; then
27+
make -j$(nproc) 2>&1 | while read line; do
28+
echo -n .
29+
done
30+
echo
31+
else
32+
make -j$(nproc)
33+
fi
34+
set -x
35+
36+
make install
37+
38+
cd ../../
39+
rm -rf libassuan-"$LIBASSUAN_VERSION"/

build-libgpg-error.sh

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#! /bin/bash
2+
3+
set -xe
4+
5+
git clone https://dev.gnupg.org/source/libgpg-error.git -b libgpg-error-"$LIBGPG_ERROR_VERSION" libgpg-error-"$LIBGPG_ERROR_VERSION"
6+
7+
cd libgpg-error-"$LIBGPG_ERROR_VERSION"
8+
9+
# needed for automake
10+
export PATH=/deps/bin:"$PATH"
11+
12+
EXTRA_CONFIGURE_FLAGS=
13+
if [ "$ARCH" == "i386" ]; then
14+
EXTRA_CONFIGURE_FLAGS=" --build=i686-linux-gnu --host=i686-linux-gnu --target=i686-linux-gnu"
15+
elif [ "$ARCH" == "armhf" ] || [ "$ARCH" == "aarch64" ]; then
16+
EXTRA_CONFIGURE_FLAGS=" --host=$DEBARCH --target=$DEBARCH"
17+
fi
18+
19+
[ -f autogen.sh ] && ./autogen.sh
20+
21+
./configure --prefix=/deps $EXTRA_CONFIGURE_FLAGS
22+
23+
set +x
24+
echo "+ make -j$(nproc)" 1>&2
25+
26+
if [ -z $VERBOSE ]; then
27+
make -j$(nproc) 2>&1 | while read line; do
28+
echo -n .
29+
done
30+
echo
31+
else
32+
make -j$(nproc)
33+
fi
34+
set -x
35+
36+
make install
37+
38+
cd ../../
39+
rm -rf libgpg-error-"$LIBGPG_ERROR_VERSION"/

0 commit comments

Comments
 (0)