From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 18 Dec 2017 17:38:35 +0000 (+0100)
Subject: builder: Begin with dnsdist rpms
X-Git-Tag: dnsdist-1.3.3~83^2~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2c9d5cfcde05e6d121171f2dcdc896344fa968d;p=thirdparty%2Fpdns.git

builder: Begin with dnsdist rpms
---

diff --git a/builder-support/dockerfiles/Dockerfile.dnsdist b/builder-support/dockerfiles/Dockerfile.dnsdist
new file mode 100644
index 0000000000..ab7a3352b7
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.dnsdist
@@ -0,0 +1,21 @@
+FROM alpine:3.6 as dnsdist
+
+RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \
+                       libtool file boost-dev ragel py-virtualenv
+RUN apk add --no-cache \
+                       libedit-dev
+
+ADD builder/helpers/set-configure-ac-version.sh /dnsdist/builder/helpers/
+@EXEC sdist_dirs=(build-aux m4 pdns ext)
+@EXEC for d in ${sdist_dirs[@]} ; do echo "COPY $d/ /dnsdist/$d/" ; done
+WORKDIR /dnsdist/pdns/dnsdistdist
+
+RUN mkdir /sdist
+
+ARG BUILDER_VERSION
+RUN /dnsdist/builder/helpers/set-configure-ac-version.sh && \
+     autoreconf -v -i --force && \
+    ./configure --disable-dependency-tracking && \
+    make dist
+RUN cp dnsdist-${BUILDER_VERSION}.tar.bz2 /sdist/
+
diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
index 677c2b22c8..3e060c611b 100644
--- a/builder-support/dockerfiles/Dockerfile.rpmbuild
+++ b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -29,6 +29,14 @@ RUN if $(grep -q 'release 6' /etc/redhat-release); then \
     fi
 @ENDIF
 
+@IF [ ! -z "$M_dnsdist" ]
+RUN if $(grep -q 'release 6' /etc/redhat-release); then \
+      scl enable devtoolset-3 -- builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
+    else \
+      builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
+    fi
+@ENDIF
+
 # mv accross layers with overlay2 is buggy in some kernel versions (results in empty dirs)
 # See: https://github.com/moby/moby/issues/33733
 #RUN mv /root/rpmbuild/RPMS/* /dist/
diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index c7c563c7da..9eda0d5017 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -51,9 +51,7 @@ EXTRA_DIST=dnslabeltext.rl \
 	   README.md \
 	   delaypipe.cc delaypipe.hh \
 	   html \
-	   .version \
 	   contrib \
-	   build-aux/gen-version \
 	   ext/incbin/UNLICENSE \
 	   incfiles \
 	   src_js \
diff --git a/pdns/dnsdistdist/build-aux/gen-version b/pdns/dnsdistdist/build-aux/gen-version
index 65e37dfd1d..68c709be98 120000
--- a/pdns/dnsdistdist/build-aux/gen-version
+++ b/pdns/dnsdistdist/build-aux/gen-version
@@ -1 +1 @@
-../../../build-aux/gen-version
\ No newline at end of file
+../../../builder-support/gen-version
\ No newline at end of file
diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index 9bc010e3ff..3c7084b882 100644
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.61])
 
 AC_INIT([dnsdist], m4_esyscmd(build-aux/gen-version))
-AM_INIT_AUTOMAKE([foreign dist-bzip2 parallel-tests 1.11 subdir-objects])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip parallel-tests 1.11 subdir-objects])
 AM_SILENT_RULES([yes])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])