From c87db1b1f687038e75e737070c238d881086f541 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Fri, 23 Sep 2016 23:14:56 +0200 Subject: Rebased to post #43227 --- util/Makefile.bind.in | 42 +++++++++---------------- util/Makefile.git | 85 --------------------------------------------------- util/bind.sh | 2 +- util/bindvar.sh | 46 ---------------------------- 4 files changed, 16 insertions(+), 159 deletions(-) delete mode 100644 util/Makefile.git delete mode 100644 util/bindvar.sh (limited to 'util') diff --git a/util/Makefile.bind.in b/util/Makefile.bind.in index 495e3919..95880347 100644 --- a/util/Makefile.bind.in +++ b/util/Makefile.bind.in @@ -15,22 +15,15 @@ # Configure and build the bind libraries for use by DHCP -include ./version.tmp -version=${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER} +binddir=@BINDBIND@ +bindsrcdir=@BINDBUILD@ -# bindvar.tmp is constructed by configure, it has the paths for bind -# if GMAKE is blank the shell script couldn't find a gmake to use. -# binddir= -# GMAKE= -include ./bindvar.tmp - -bindsrcdir=bind-${version} - -bindconfig = --disable-kqueue --disable-epoll --disable-devpoll \ - --without-openssl --without-libxml2 --enable-exportlib \ - --with-gssapi=no --enable-threads=no @BINDCONFIG@ \ +bindconfig = --without-openssl --without-libxml2 \ + --without-gssapi --disable-threads \ + --enable-exportlib \ --with-export-includedir=${binddir}/include \ - --with-export-libdir=${binddir}/lib + --with-export-libdir=${binddir}/lib \ + @BINDIOMUX@ @BINDCONFIG@ --enable-full-report @BIND_ATF_FALSE@cleandirs = ./lib ./include @BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf @@ -47,11 +40,6 @@ bind1: gunzip -c bind.tar.gz | tar xf - ; \ fi - @if test -z "${GMAKE}"; then \ - echo "unable to find gmake" 1>&2 ; \ - exit 1; \ - fi - # Configure the export libraries # Currently disable the epoll, devpoll and kqueue options as they # don't interact well with the DHCP code. @@ -74,7 +62,7 @@ atf: else \ echo Building ATF support ; \ (cd ${bindsrcdir}/unit; \ - MAKE=${GMAKE} ${GMAKE} atf > ${binddir}/build.log ; \ + $(MAKE) atf > ${binddir}/build.log ; \ cp -rp atf ${binddir}) ; \ fi @@ -90,11 +78,11 @@ bind2-noguest: echo Building BIND Export libraries - this takes some time. ;\ (cd ${bindsrcdir}/lib/export ; \ echo building in `pwd` ; \ - MAKE=${GMAKE} ${GMAKE} >> ${binddir}/build.log) ; \ + $(MAKE) >> ${binddir}/build.log) ; \ \ echo Installing BIND Export libraries to ${binddir}. ; \ (cd ${bindsrcdir}/lib/export ; \ - MAKE=${GMAKE} ${GMAKE} install > ${binddir}/install.log) ; \ + $(MAKE) install > ${binddir}/install.log) ; \ fi bind2-hostgen: @@ -104,16 +92,16 @@ bind2-hostgen: echo Bind export libraries already installed ; \ else \ echo Building BIND Export libraries - this takes some time. ;\ - (cd ${bindsrcdir}/lib/export/dns ; \ - echo building gen using ${BUILD_CC} in `pwd` ; \ - MAKE=${GMAKE} ${GMAKE} CC=${BUILD_CC} CFLAGS=${BUILD_CFLAGS} CPPFLAGS=${BUILD_CPPFLAGS} LDFLAGS=${BUILD_LDFLAGS} LIBS=${BUILD_LIBS} gen >> ${binddir}/build.log) ; \ + (cd ${bindsrcdir}/lib/export/dns ; \ + echo building gen using ${BUILD_CC} in `pwd` ; \ + $(MAKE) CC=${BUILD_CC} CFLAGS=${BUILD_CFLAGS} CPPFLAGS=${BUILD_CPPFLAGS} LDFLAGS=${BUILD_LDFLAGS} LIBS=${BUILD_LIBS} gen >> ${binddir}/build.log) ; \ (cd ${bindsrcdir}/lib/export ; \ echo building in `pwd` ; \ - MAKE=${GMAKE} ${GMAKE} >> ${binddir}/build.log) ; \ + $(MAKE) >> ${binddir}/build.log) ; \ \ echo Installing BIND Export libraries to ${binddir}. ; \ (cd ${bindsrcdir}/lib/export ; \ - MAKE=${GMAKE} ${GMAKE} install > ${binddir}/install.log) ; \ + $(MAKE) install > ${binddir}/install.log) ; \ fi clean: diff --git a/util/Makefile.git b/util/Makefile.git deleted file mode 100644 index d681b387..00000000 --- a/util/Makefile.git +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright (C) 2009-2012 Internet Systems Consortium, Inc. ("ISC") -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. - -# $Id: Makefile.bind,v 1.8 2012/04/05 22:16:47 sar Exp $ - -# bindvar.tmp is constructed by configure, it has the paths for -# if GMAKE is blank the shell script couldn't find a gmake to use. -# binddir= -# GMAKE= -include ./bindvar.tmp - -bindsrcdir=bind9 - -all: -# Extract the source from the tarball, if it hasn't been already. - @if test -d ${bindsrcdir} ; then \ - echo ${bindsrcdir} already unpacked... ; \ - else \ - gunzip -c bind.tar.gz | tar xf - ; \ - fi - - @if test -z "${GMAKE}"; then \ - echo "unable to find gmake" 1>&2 ; \ - exit 1; \ - fi - -# Configure the export libraries -# Currently disable the epoll and devpoll options as they don't interact -# well with the DHCP code. -# If the top-level Bind Makefile exists we skip the configuration step -# as we assume it's done and won't change. Doing a make clean will -# reset things if necessary. - @if test -f ${bindsrcdir}/Makefile ; then \ - echo Bind export libraries already configured ; \ - else \ - echo Configuring BIND Export libraries for DHCP. ; \ - rm -rf ./lib ./include ./configure.log ./build.log ./install.log ; \ - (cd ${bindsrcdir} && ./configure --disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --enable-threads=no --with-export-includedir=${binddir}/include --with-export-libdir=${binddir}/lib --with-gssapi=no > ${binddir}/configure.log); \ - fi - -# Build and install the export libraries -# No need to do anything if we already have something installed. - @if test -d ${binddir}/lib ; then \ - echo Bind export libraries already installed ; \ - else \ - echo Building BIND Export libraries - this takes some time. ;\ - (cd ${bindsrcdir}/lib/export ; \ - echo building in `pwd` ; \ - MAKE=${GMAKE} ${GMAKE} > ${binddir}/build.log) ; \ - \ - echo Installing BIND Export libraries to ${binddir}. ; \ - (cd ${bindsrcdir}/lib/export ; \ - MAKE=${GMAKE} ${GMAKE} install > ${binddir}/install.log) ; \ - fi - -clean: - @echo Cleaning BIND export library. - (cd ${bindsrcdir}; make -k clean ) - rm -rf ./lib ./include ./configure.log ./build.log \ - ./install.log - -# Include the following so that this Makefile is happy when the parent -# tries to use them. - -distdir: - -distclean: - -install: - -check: - -uninstall: diff --git a/util/bind.sh b/util/bind.sh index 494e2399..13f6fb36 100644 --- a/util/bind.sh +++ b/util/bind.sh @@ -99,7 +99,7 @@ esac if test -d bind/bind9/.git then - cp util/Makefile.git bind/Makefile.in + cp util/Makefile.bind.in bind/Makefile.in rm -rf bind/include bind/lib cd bind/bind9 test -f Makefile && make distclean diff --git a/util/bindvar.sh b/util/bindvar.sh deleted file mode 100644 index 184a4cc0..00000000 --- a/util/bindvar.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2009,2015 Internet Systems Consortium, Inc. ("ISC") -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. - -# $Id: bindvar.sh,v 1.2 2009/12/02 20:43:52 sar Exp $ - -# Create a file with the base directory and gmake path for -# use by the bind/Makefile, we do this to minimize portability -# concerns. - -# Bind requires a GNU style make to compile, if we can't find one -# exit with a non-zero status, otherwise exit with success (i.e. 0) - -binddir=`pwd` -gmake= -for x in gmake gnumake make; do - if $x --version 2>/dev/null | grep GNU > /dev/null; then - gmake=$x - break; - fi -done - -if [ -z $gmake ] -then - echo "$0: Building Bind requires a GNU style make tool and none were found in your path. We tried gmake, gnumake, and make." - exit 1 -fi - -cat < bind/bindvar.tmp -binddir=$binddir/bind -GMAKE=$gmake -EOF - -exit 0 -- cgit v1.2.1