mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-22 18:07:25 +00:00
Code Issues Releases Wiki Activity

Complete #38754 for HP-UX [#39300]

Browse Source
This commit is contained in:
Francis Dupont 2015-04-16 23:28:29 +02:00
parent 70689a73b4
commit 1b245c913a
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELNOTES
View File

@ -80,7 +80,7 @@ by Eric Young (eay@cryptsoft.com).
can now be built from its embedded sources in bind, solving the can now be built from its embedded sources in bind, solving the
atf-run / atf-report issue with recent (>= 0.20) versions of ATF. atf-run / atf-report issue with recent (>= 0.20) versions of ATF.
The new configuration option is "./configure --with-atf=bind". The new configuration option is "./configure --with-atf=bind".
[ISC-Bugs #38754] [ISC-Bugs #38754, #39300]
- Corrected a compilation error introduced by the fix for ISC-Bugs #22806. - Corrected a compilation error introduced by the fix for ISC-Bugs #22806.
On older linuxes that do not include the tpacket_auxdata structure don't On older linuxes that do not include the tpacket_auxdata structure don't

37
util/Makefile.bind.in
View File

@ -26,17 +26,20 @@ include ./bindvar.tmp
bindsrcdir=bind-${version} bindsrcdir=bind-${version}
bindconfig = --disable-kqueue --disable-epoll --disable-devpoll bindconfig = --disable-kqueue --disable-epoll --disable-devpoll \
bindconfig += --without-openssl --without-libxml2 --enable-exportlib --without-openssl --without-libxml2 --enable-exportlib \
bindconfig += --enable-threads=no --with-export-includedir=${binddir}/include --with-gssapi=no --enable-threads=no @BINDCONFIG@ \
bindconfig += --with-export-libdir=${binddir}/lib --with-gssapi=no --with-export-includedir=${binddir}/include \
bindconfig += @BINDCONFIG@ --with-export-libdir=${binddir}/lib
cleandirs = ./lib ./include @BIND_ATF_FALSE@cleandirs = ./lib ./include
@BIND_ATF_TRUE@cleandirs += ./atf @BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf
cleanfiles = ./configure.log ./build.log ./install.log cleanfiles = ./configure.log ./build.log ./install.log
all: @BIND_ATF_FALSE@all: bind1 bind2
@BIND_ATF_TRUE@all: bind1 atf bind2
bind1:
# Extract the source from the tarball, if it hasn't been already. # Extract the source from the tarball, if it hasn't been already.
@if test -d ${bindsrcdir} ; then \ @if test -d ${bindsrcdir} ; then \
echo ${bindsrcdir} already unpacked... ; \ echo ${bindsrcdir} already unpacked... ; \
@ -64,16 +67,18 @@ all:
./configure ${bindconfig} > ${binddir}/configure.log); \ ./configure ${bindconfig} > ${binddir}/configure.log); \
fi fi
atf:
# Build and copy the ATF support if not yet installed. # Build and copy the ATF support if not yet installed.
@BIND_ATF_TRUE@ @if test -d ./atf ; then \ @if test -d ./atf ; then \
@BIND_ATF_TRUE@ echo ATF support already installed ; \ echo ATF support already installed ; \
@BIND_ATF_TRUE@ else \ else \
@BIND_ATF_TRUE@ echo Building ATF support ; \ echo Building ATF support ; \
@BIND_ATF_TRUE@ (cd ${bindsrcdir}/unit; \ (cd ${bindsrcdir}/unit; \
@BIND_ATF_TRUE@ MAKE=${GMAKE} ${GMAKE} atf > ${binddir}/build.log ; \ MAKE=${GMAKE} ${GMAKE} atf > ${binddir}/build.log ; \
@BIND_ATF_TRUE@ cp -rp atf ${binddir}) ; \ cp -rp atf ${binddir}) ; \
@BIND_ATF_TRUE@ fi fi
bind2:
# Build and install the export libraries # Build and install the export libraries
# No need to do anything if we already have something installed. # No need to do anything if we already have something installed.
@if test -d ${binddir}/lib ; then \ @if test -d ${binddir}/lib ; then \