From: Pieter Lexis Date: Tue, 18 Apr 2017 14:51:04 +0000 (+0200) Subject: Build pkgs against LuaJit (where available) X-Git-Tag: rec-4.1.0-alpha1~152^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2176929a949e10548979a00b8ce1b50aef633e5f;p=thirdparty%2Fpdns.git Build pkgs against LuaJit (where available) --- diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm index 0971ad3f27..8966d5ce1a 100755 --- 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 487d9df09d..1ac4389dac 100755 --- 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 f48f982007..e05f3bd0cd 100755 --- 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 8f58a18d9a..efef3593cb 100644 --- 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 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 70a27d1c19..5bebdff959 100755 --- 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 0a1b840202..682aed138b 100644 --- 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 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 82a1436522..752241004d 100755 --- 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 0f79775f41..f432d6a7e2 100644 --- 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 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 bd5b728c40..42537fb79b 100755 --- 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) \