Build pkgs against LuaJit (where available)

diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm
index 0971ad3f27898ae8dfe39c92ac039330ac2cdad2..8966d5ce1a2bccde12de6fadac174a2a3c4e5eb2 100755 (executable)
--- a/build-scripts/build-auth-rpm
+++ b/build-scripts/build-auth-rpm
@@ -544,7 +544,7 @@ Requires(postun): systemd-units
 BuildRequires: systemd-units
 BuildRequires: systemd-devel
 BuildRequires: boost-devel
-BuildRequires: lua-devel
+BuildRequires: luajit-devel
 BuildRequires: libsodium-devel
 BuildRequires: bison
 BuildRequires: openssl-devel
@@ -687,7 +687,7 @@ export CPPFLAGS="-DLDAP_DEPRECATED"
        --disable-dependency-tracking \
        --disable-silent-rules \
        --with-modules='' \
-       --with-lua \
+       --with-luajit \
        --with-dynmodules='%{backends} random' \
        --enable-tools \
        --enable-libsodium \

diff --git a/build-scripts/build-dnsdist-rpm b/build-scripts/build-dnsdist-rpm
index 487d9df09dd094fef186ba535f100621ae94cf64..1ac4389dac7c8b4d6105a0892eaa1a23080914c5 100755 (executable)
--- a/build-scripts/build-dnsdist-rpm
+++ b/build-scripts/build-dnsdist-rpm
@@ -54,6 +54,10 @@ DNSCRYPT_CONFIGURE='--enable-dnscrypt \'
 RE2_BUILDREQUIRES='BuildRequires: re2-devel'
 RE2_CONFIGURE='--enable-re2 \'
 
+# CentOS 6 has no luajit
+LUA_BUILDREQUIRES='BuildRequires: luajit-devel'
+LUA_CONFIGURE='--with-luajit \'
+
 # These two are the same for sysv and systemd (we don't install defaults files at the moment)
 DEFAULTS_INSTALL=''
 DEFAULTS_FILES=''
@@ -95,6 +99,8 @@ if [ -f /etc/redhat-release ]; then
       SODIUM_BUILDREQUIRES=''
       SODIUM_CONFIGURE='--disable-libsodium \'
       DNSCRYPT_CONFIGURE='--disable-dnscrypt \'
+      LUA_BUILDREQUIRES='BuildRequires: lua-devel'
+      LUA_CONFIGURE=' \'
       SETUP="%setup -n %{name}-${TARBALLVERSION}"
       RPMBUILD_COMMAND="scl enable devtoolset-3 -- ${RPMBUILD_COMMAND}"
       ;;
@@ -119,9 +125,9 @@ Group: System/DNS
 Source: dnsdist-${TARBALLVERSION}.tar.bz2
 Requires(pre): ${SHADOW_REQUIRES}
 BuildRequires: boost-devel
-BuildRequires: lua-devel
 BuildRequires: readline-devel
 BuildRequires: net-snmp-devel
+${LUA_BUILDREQUIRES}
 ${PROTOBUF_BUILDREQUIRES}
 ${RE2_BUILDREQUIRES}
 ${SODIUM_BUILDREQUIRES}
@@ -137,6 +143,7 @@ ${SETUP}
 %configure \
   --sysconfdir=/etc/dnsdist \
   --with-net-snmp \
+  ${LUA_CONFIGURE}
   ${RE2_CONFIGURE}
   ${SODIUM_CONFIGURE}
   ${DNSCRYPT_CONFIGURE}

diff --git a/build-scripts/build-recursor-rpm b/build-scripts/build-recursor-rpm
index f48f9820072dfa1d4f560510b20f28f0386c0f8b..e05f3bd0cd0419470cc80fa8d551587ddaa1db5e 100755 (executable)
--- a/build-scripts/build-recursor-rpm
+++ b/build-scripts/build-recursor-rpm
@@ -215,7 +215,7 @@ Source0: ../%{name}-${TARBALLVERSION}.tar.bz2
 
 Provides: powerdns-recursor = %{version}-%{release}
 BuildRequires: boost-devel
-BuildRequires: lua-devel
+BuildRequires: luajit-devel
 BuildRequires: systemd-units
 BuildRequires: systemd-devel
 BuildRequires: libsodium-devel
@@ -248,6 +248,7 @@ package if you need a dns cache for your network.
        --with-protobuf \
        --enable-libsodium \
        --with-net-snmp \
+       --with-luajit \
        --enable-systemd
 
 make %{?_smp_mflags}

diff --git a/build-scripts/debian-authoritative/control.in b/build-scripts/debian-authoritative/control.in
index 8f58a18d9afe946d906887709651d6d102b17af9..efef3593cb0f5d300289fbd7ab7308bdd54d7403 100644 (file)
--- a/build-scripts/debian-authoritative/control.in
+++ b/build-scripts/debian-authoritative/control.in
@@ -4,7 +4,7 @@ Priority: extra
 Standards-Version: 3.9.8
 Maintainer: PowerDNS Autobuilder <powerdns.support@powerdns.com>
 Origin: PowerDNS
-Build-Depends: debhelper (>= 9~), dh-autoreconf, dh-systemd, po-debconf, libtool, flex, bison, libmysqlclient-dev, libpq-dev, libssl-dev, libgdbm-dev, libldap2-dev, libsqlite3-dev, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, libboost-program-options-dev, libboost-test-dev, autotools-dev, automake, autoconf, liblua5.2-dev, pkg-config, ragel, libgmp-dev, libbotan1.10-dev, libcurl4-openssl-dev, libzmq-dev, libyaml-cpp-dev (>= 0.5), libgeoip-dev, libopendbx1-dev, libcdb-dev, unixodbc-dev (>= 2.3.1), libprotobuf-dev, protobuf-compiler @LIBSYSTEMDDEV@ @LIBSODIUMDEV@
+Build-Depends: debhelper (>= 9~), dh-autoreconf, dh-systemd, po-debconf, libtool, flex, bison, libmysqlclient-dev, libpq-dev, libssl-dev, libgdbm-dev, libldap2-dev, libsqlite3-dev, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, libboost-program-options-dev, libboost-test-dev, autotools-dev, automake, autoconf, libluajit5.1-dev, pkg-config, ragel, libgmp-dev, libbotan1.10-dev, libcurl4-openssl-dev, libzmq-dev, libyaml-cpp-dev (>= 0.5), libgeoip-dev, libopendbx1-dev, libcdb-dev, unixodbc-dev (>= 2.3.1), libprotobuf-dev, protobuf-compiler @LIBSYSTEMDDEV@ @LIBSODIUMDEV@
 Homepage: http://www.powerdns.com/
 
 Package: pdns-server

diff --git a/build-scripts/debian-authoritative/rules b/build-scripts/debian-authoritative/rules
index 70a27d1c19bd7b82e5617254f865c85a3ddfd40a..5bebdff959a7b8dccfdc19a1a776e7492eab8fcf 100755 (executable)
--- a/build-scripts/debian-authoritative/rules
+++ b/build-scripts/debian-authoritative/rules
@@ -53,6 +53,7 @@ override_dh_auto_configure:
                --enable-botan1.10 \
                --enable-tools \
                --enable-unit-tests \
+               --with-luajit \
                $(ENABLE_SYSTEMD) \
                $(ENABLE_LIBSODIUM)
 

diff --git a/build-scripts/debian-dnsdist/control.in b/build-scripts/debian-dnsdist/control.in
index 0a1b8402024c68dc58107e236d6e675decbe5350..682aed138b246a97221716176715f10b0cf45051 100644 (file)
--- a/build-scripts/debian-dnsdist/control.in
+++ b/build-scripts/debian-dnsdist/control.in
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: PowerDNS Autobuilder <powerdns.support@powerdns.com>
 Origin: PowerDNS
-Build-Depends: debhelper (>= 9), dh-autoreconf, dh-systemd (>= 1.5), libboost-dev, libedit-dev, liblua5.2-dev, protobuf-compiler, libprotobuf-dev, lib-snmp-dev, pkg-config @LIBRE2DEV@ @LIBSODIUMDEV@ @LIBSYSTEMDDEV@
+Build-Depends: debhelper (>= 9), dh-autoreconf, dh-systemd (>= 1.5), libboost-dev, libedit-dev, libluajit5.1-dev, protobuf-compiler, libprotobuf-dev, lib-snmp-dev, pkg-config @LIBRE2DEV@ @LIBSODIUMDEV@ @LIBSYSTEMDDEV@
 Standards-Version: 3.9.7
 Homepage: http://dnsdist.org
 

diff --git a/build-scripts/debian-dnsdist/rules b/build-scripts/debian-dnsdist/rules
index 82a14365226d5502dba5200042e7d4302541ed80..752241004d6ebbcc7d8f9c486cc3e79e6b80e1b2 100755 (executable)
--- a/build-scripts/debian-dnsdist/rules
+++ b/build-scripts/debian-dnsdist/rules
@@ -54,6 +54,7 @@ override_dh_auto_configure:
          --libexecdir='$${prefix}/lib' \
          --with-protobuf=yes \
          --with-net-snmp \
+         --with-luajit \
          $(ENABLE_SYSTEMD) \
          $(ENABLE_RE2) \
          $(ENABLE_LIBSODIUM)

diff --git a/build-scripts/debian-recursor/control.in b/build-scripts/debian-recursor/control.in
index 0f79775f416e3f2e72b61a3f485e7db62a75175d..f432d6a7e29741edc4daea5d800d508ff560fc30 100644 (file)
--- a/build-scripts/debian-recursor/control.in
+++ b/build-scripts/debian-recursor/control.in
@@ -4,7 +4,7 @@ Priority: extra
 Standards-Version: 3.9.6
 Maintainer: PowerDNS Autobuilder <powerdns.support@powerdns.com>
 Origin: PowerDNS
-Build-Depends: debhelper (>= 9~), dh-systemd, quilt, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, liblua5.2-dev, libsnmp-dev, libprotobuf-dev, protobuf-compiler, pkg-config @LIBSYSTEMDDEV@ @LIBSODIUMDEV@
+Build-Depends: debhelper (>= 9~), dh-systemd, quilt, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, libluajit5.1-dev, libsnmp-dev, libprotobuf-dev, protobuf-compiler, pkg-config @LIBSYSTEMDDEV@ @LIBSODIUMDEV@
 Homepage: http://www.powerdns.com/
 
 Package: pdns-recursor

diff --git a/build-scripts/debian-recursor/rules b/build-scripts/debian-recursor/rules
index bd5b728c407cbbb3b2713923a4fc6311722828f3..42537fb79b1a27fdc9aac52fcdd0f19c7867d5e3 100755 (executable)
--- a/build-scripts/debian-recursor/rules
+++ b/build-scripts/debian-recursor/rules
@@ -49,7 +49,7 @@ override_dh_auto_configure:
                --infodir=\$${prefix}/share/info \
                --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)' \
                --libexecdir='$${prefix}/lib' \
-               --with-lua \
+               --with-luajit \
                --with-protobuf=yes \
                --with-net-snmp \
                $(ENABLE_SYSTEMD) \