ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '1044-include-config.h-in-gen.c' into 'master'

Browse Source 
Resolve "gen fails to generate headers on Debian buster"

Closes #1044

See merge request isc-projects/bind9!1954
This commit is contained in:
Ondřej Surý
2019-05-29 04:30:11 -04:00
parent fa806cc7b3 4c7345bcb6
commit db9cfde1ab
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/dns/Makefile.in
View File

@@ -167,9 +167,14 @@ include/dns/rdatastruct.h: gen \
code.h: gen
./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; }
gen: LFS_CFLAGS = `getconf LFS_CFLAGS 2>/dev/null`
gen: LFS_LDFLAGS = `getconf LFS_LDFLAGS 2>/dev/null`
gen: LFS_LIBS = `getconf LFS_LIBS 2>/dev/null`
gen: gen.c
${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
${LFS_CFLAGS} ${LFS_LDFLAGS} \
${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c \
${BUILD_LIBS} ${LFS_LIBS}
timestamp: include libdns.@A@
touch timestamp

10
lib/dns/gen-unix.h
View File

@@ -28,8 +28,10 @@
#include <sys/types.h> /* Required on some systems for dirent.h. */
#include <errno.h>
#include <dirent.h>
#include <stdbool.h>
#include <stdlib.h>
#include <unistd.h> /* XXXDCL Required for ?. */
#include <isc/lang.h>
@@ -66,9 +68,15 @@ next_file(isc_dir_t *dir) {
dir->filename = NULL;
if (dir->handle != NULL) {
errno = 0;
dirent = readdir(dir->handle);
if (dirent != NULL)
if (dirent != NULL) {
dir->filename = dirent->d_name;
} else {
if (errno != 0) {
exit(1);
}
}
}
if (dir->filename != NULL)