summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/Makefile.bind.in24
-rw-r--r--util/bind.sh2
-rw-r--r--util/bindvar.sh13
3 files changed, 37 insertions, 2 deletions
diff --git a/util/Makefile.bind.in b/util/Makefile.bind.in
index 9cbe5719..495e3919 100644
--- a/util/Makefile.bind.in
+++ b/util/Makefile.bind.in
@@ -78,13 +78,35 @@ atf:
cp -rp atf ${binddir}) ; \
fi
-bind2:
+@CROSS_COMPILING_FALSE@bind2: bind2-noguest
+@CROSS_COMPILING_TRUE@bind2: bind2-hostgen
+
+bind2-noguest:
+# 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
+
+bind2-hostgen:
# 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/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 ; \
echo building in `pwd` ; \
MAKE=${GMAKE} ${GMAKE} >> ${binddir}/build.log) ; \
diff --git a/util/bind.sh b/util/bind.sh
index 81e4d9a4..015fe54f 100644
--- a/util/bind.sh
+++ b/util/bind.sh
@@ -59,6 +59,8 @@ case $# in
### For ease of use, this records the sticky tag of versions
### released with each point release.
###
+ 4.3.3) BINDTAG=v9_9_7_P3 ;;
+ 4.3.3b1) BINDTAG=v9_9_7_P2 ;;
4.3.2|4.3.2rc2) BINDTAG=v9_9_7 ;;
4.3.2rc1) BINDTAG=v9_9_7rc2 ;;
4.3.2b1) BINDTAG=v9_9_7rc1 ;;
diff --git a/util/bindvar.sh b/util/bindvar.sh
index 30ecd906..184a4cc0 100644
--- a/util/bindvar.sh
+++ b/util/bindvar.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
+# 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
@@ -20,6 +20,9 @@
# 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
@@ -29,7 +32,15 @@ for x in gmake gnumake make; do
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 <<EOF > bind/bindvar.tmp
binddir=$binddir/bind
GMAKE=$gmake
EOF
+
+exit 0