From b0e681614bb09d4ff87488e8f006316ced2b7e7e Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Fri, 25 Mar 2016 15:12:25 +0100 Subject: [PATCH] Remove semistatic stuff --- build-scripts/build-recursor-semistatic | 53 ------------------------- configure.ac | 26 ++---------- pdns/dnsdistdist/configure.ac | 8 ++-- 3 files changed, 6 insertions(+), 81 deletions(-) delete mode 100755 build-scripts/build-recursor-semistatic diff --git a/build-scripts/build-recursor-semistatic b/build-scripts/build-recursor-semistatic deleted file mode 100755 index 9c56bc735c..0000000000 --- a/build-scripts/build-recursor-semistatic +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -if [ "$0" != "./build-scripts/build-recursor-semistatic" ]; then - echo "Please run me from the root checkout dir" >&2 - exit 1 -fi - -if [ -z "$VERSION" ]; then - echo 'Please set $VERSION' >&2 - exit 1 -fi - -if [ -z "$RELEASE" ];then - echo 'Please set $RELEASE' >&2 - exit 1 -fi - -if [ -z "$DISTDIR" ]; then - DISTDIR=pdns -fi - -set -e -set -x - -export DEBFULLNAME="PowerDNS.COM BV" -export DEBEMAIL="noreply@powerdns.com" -DEBPKGNAME=pdns-recursor_$VERSION - -cd $DISTDIR - -dh_make -s -f ../pdns-recursor-$VERSION.tar.bz2 -p $DEBPKGNAME < /dev/null -cp pdns-recursor.init.d debian/init.d -#[ -e debian/control ] || dh_make -e powerdns.support@powerdns.com -s -r cdbs -f ../pdns-recursor-$VERSION.tar.bz2 < /dev/null -perl -i -pe 's/Description: <.*>/Description: extremely powerful and versatile recursing nameserver/' debian/control -# only to be nice to people usind the generated .dsc -perl -i -pe 's/(Build-Depends: .*)/$1, libboost-dev, libboost-serialization-dev, liblua5.2-0-dev/' debian/control - -cat > debian/changelog << EOF -pdns-recursor (${VERSION}-${RELEASE}) unstable; urgency=medium - - * Automatic build - - -- PowerDNS.COM AutoBuilder $(date -R) - -EOF - -# Fix the rpm version number -perl -i -pe "s/Version: .*/Version: ${VERSION}/" pdns-recursor.spec -perl -i -pe "s/Release: .*/Release: ${RELEASE}/" pdns-recursor.spec -export LUA=1 -export STATIC=semi -fakeroot debian/rules binary -./configure -fakeroot rpmbuild -bb pdns-recursor.spec diff --git a/configure.ac b/configure.ac index 2a1f955163..c3051b2065 100644 --- a/configure.ac +++ b/configure.ac @@ -80,20 +80,6 @@ eval full_libdir="\"$libdir\"" # detect pkg-config explicitly PKG_PROG_PKG_CONFIG -# check if we want a static build -AC_MSG_CHECKING([whether we will be building static binaries]) - -AC_ARG_ENABLE([static-binaries], - [AS_HELP_STRING([--enable-static-binaries],[build static binaries @<:@default=no@:>@])], - [static=$enableval], - [static=no], -) -AC_MSG_RESULT([$static]) - -AS_IF([test "x$static" != "xno"], [ - PKG_CONFIG="$PKG_CONFIG --static" -]) - AC_CHECK_HEADERS( [sys/mman.h], [AC_CHECK_FUNC( @@ -143,10 +129,6 @@ PDNS_ENABLE_VERBOSE_LOGGING PDNS_ENABLE_PKCS11 PDNS_ENABLE_GSS_TSIG -AS_IF([test "x$static" != "xno"], [ - LDFLAGS="-all-static $LDFLAGS" -]) - modules="bind gmysql random" AC_ARG_WITH([modules], [AS_HELP_STRING([--with-modules], [which backends to compile with @<:@default=bind gmysql random@:>@])], @@ -282,11 +264,9 @@ done LDFLAGS="$RELRO_LDFLAGS $LDFLAGS" -AS_IF([test "x$static" != "xyes"], [ - CFLAGS="$PIE_CFLAGS $CFLAGS" - CXXFLAGS="$PIE_CFLAGS $CXXFLAGS" - PROGRAM_LDFLAGS="$PIE_LDFLAGS $PROGRAM_LDFLAGS" -]) +CFLAGS="$PIE_CFLAGS $CFLAGS" +CXXFLAGS="$PIE_CFLAGS $CXXFLAGS" +PROGRAM_LDFLAGS="$PIE_LDFLAGS $PROGRAM_LDFLAGS" AC_SUBST([PROGRAM_LDFLAGS]) PDNS_ENABLE_COVERAGE diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac index ccb13eb4a3..2d07e736b5 100644 --- a/pdns/dnsdistdist/configure.ac +++ b/pdns/dnsdistdist/configure.ac @@ -54,11 +54,9 @@ PDNS_CHECK_PANDOC LDFLAGS="$RELRO_LDFLAGS $LDFLAGS" -AS_IF([test "x$static" != "xyes"], [ - CFLAGS="$PIE_CFLAGS $CFLAGS" - CXXFLAGS="$PIE_CFLAGS $CXXFLAGS" - PROGRAM_LDFLAGS="$PIE_LDFLAGS $PROGRAM_LDFLAGS" -]) +CFLAGS="$PIE_CFLAGS $CFLAGS" +CXXFLAGS="$PIE_CFLAGS $CXXFLAGS" +PROGRAM_LDFLAGS="$PIE_LDFLAGS $PROGRAM_LDFLAGS" AC_SUBST([PROGRAM_LDFLAGS]) AC_SUBST([AM_CPPFLAGS], -- 2.47.2