Stub doc/handbook/meson.build to keep GNUnet tarball build
This commit is contained in:
parent
b95e6ca8cd
commit
076d8a76f5
1 changed files with 7 additions and 2 deletions
|
|
@ -32,7 +32,7 @@ RUN set -e; \
|
||||||
cp "${LOCAL_TARBALL}" gnunet.tar.gz; \
|
cp "${LOCAL_TARBALL}" gnunet.tar.gz; \
|
||||||
tar xzf gnunet.tar.gz; \
|
tar xzf gnunet.tar.gz; \
|
||||||
GNUNET_DIR="$(ls -d gnunet-* | head -1)"; \
|
GNUNET_DIR="$(ls -d gnunet-* | head -1)"; \
|
||||||
if [ ! -f "${GNUNET_DIR}/meson.build" ] || [ ! -f "${GNUNET_DIR}/doc/handbook/meson.build" ]; then \
|
if [ ! -f "${GNUNET_DIR}/meson.build" ]; then \
|
||||||
echo "Local tarball seems incomplete; falling back to git clone ${GNUNET_REF}"; \
|
echo "Local tarball seems incomplete; falling back to git clone ${GNUNET_REF}"; \
|
||||||
rm -rf "${GNUNET_DIR}"; \
|
rm -rf "${GNUNET_DIR}"; \
|
||||||
git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
|
git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
|
||||||
|
|
@ -43,7 +43,7 @@ RUN set -e; \
|
||||||
curl -L "${GNUNET_TARBALL_URL}" -o gnunet.tar.gz; \
|
curl -L "${GNUNET_TARBALL_URL}" -o gnunet.tar.gz; \
|
||||||
tar xzf gnunet.tar.gz; \
|
tar xzf gnunet.tar.gz; \
|
||||||
GNUNET_DIR="$(ls -d gnunet-* | head -1)"; \
|
GNUNET_DIR="$(ls -d gnunet-* | head -1)"; \
|
||||||
if [ ! -f "${GNUNET_DIR}/meson.build" ] || [ ! -f "${GNUNET_DIR}/doc/handbook/meson.build" ]; then \
|
if [ ! -f "${GNUNET_DIR}/meson.build" ]; then \
|
||||||
echo "Tarball seems incomplete; falling back to git clone ${GNUNET_REF}"; \
|
echo "Tarball seems incomplete; falling back to git clone ${GNUNET_REF}"; \
|
||||||
rm -rf "${GNUNET_DIR}"; \
|
rm -rf "${GNUNET_DIR}"; \
|
||||||
git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
|
git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
|
||||||
|
|
@ -53,6 +53,11 @@ RUN set -e; \
|
||||||
git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
|
git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
|
||||||
GNUNET_DIR="gnunet"; \
|
GNUNET_DIR="gnunet"; \
|
||||||
fi; \
|
fi; \
|
||||||
|
if [ ! -f "${GNUNET_DIR}/doc/handbook/meson.build" ]; then \
|
||||||
|
echo "Creating stub doc/handbook/meson.build to satisfy Meson"; \
|
||||||
|
mkdir -p "${GNUNET_DIR}/doc/handbook"; \
|
||||||
|
printf "# auto-generated stub to skip handbook build\nsubdir_done()\n" > "${GNUNET_DIR}/doc/handbook/meson.build"; \
|
||||||
|
fi; \
|
||||||
cd "${GNUNET_DIR}" && ./bootstrap && \
|
cd "${GNUNET_DIR}" && ./bootstrap && \
|
||||||
./configure --prefix=/usr && make -j$(nproc) && make install
|
./configure --prefix=/usr && make -j$(nproc) && make install
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue