summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authormatusita <matusita@FreeBSD.org>2002-02-28 16:17:18 +0000
committermatusita <matusita@FreeBSD.org>2002-02-28 16:17:18 +0000
commitb60aca7d4b27fa1e21a79db947dce17304f76bc1 (patch)
tree50df169b44eac979122b76e33ffd3674a61ed058 /sbin
parente2a5a67db8777be244cf99796905f93c34f9caad (diff)
downloadFreeBSD-src-b60aca7d4b27fa1e21a79db947dce17304f76bc1.zip
FreeBSD-src-b60aca7d4b27fa1e21a79db947dce17304f76bc1.tar.gz
Fix "make release.4" breakage.
src/contrib/isc-dhcp/includes/minires/resolv.h has a 'extern' definition but it makes an error when linking crunched binary just like this: dhclient.lo: In function `MRres_nquery': dhclient.lo(.text+0x2dcce): undefined reference to `__h_errno_set' dhclient.lo(.text+0x2dd5b): undefined reference to `__h_errno_set' dhclient.lo: In function `MRres_nquerydomain': dhclient.lo(.text+0x2de53): undefined reference to `__h_errno_set' The author understands this will be a problem (see comments in resolv.h). Murray said that the author will fix this, but as a temporary solution, modifying the source code and not to use __h_errno_set. BTW, I'm sorry that previous commitlog in src/sbin/dhclient/Makefile should read "Found by:" instead of "Confirmed by"; I just found that rev 1.15 has a typo so fixed. Tested on: ushi.jp.FreeBSD.org with today's 5-current source code. (belive me, "make release.4" works fine now)
Diffstat (limited to 'sbin')
-rw-r--r--sbin/dhclient/Makefile2
-rw-r--r--sbin/dhclient/minires/Makefile7
2 files changed, 6 insertions, 3 deletions
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index dadebf7..a59f73b 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -30,7 +30,7 @@ OBJS+= dst/base64.o dst/dst_api.o dst/dst_support.o dst/hmac_link.o \
OBJS+= minires/ns_date.o minires/ns_name.o minires/ns_parse%FIXED.o \
minires/ns_samedomain.o minires/ns_sign.o minires/ns_verify.o \
minires/res_comp.o minires/res_findzonecut.o minires/res_init.o \
- minires/res_mkquery.o minires/res_mkupdate.o minires/res_query.o \
+ minires/res_mkquery.o minires/res_mkupdate.o minires/res_query%FIXED.o \
minires/res_send.o minires/res_sendsigned.o minires/res_update.o
# omapi
diff --git a/sbin/dhclient/minires/Makefile b/sbin/dhclient/minires/Makefile
index 32e72a3..046740e 100644
--- a/sbin/dhclient/minires/Makefile
+++ b/sbin/dhclient/minires/Makefile
@@ -11,15 +11,18 @@ INTERNALSTATICLIB= true
SRCS= ns_date.c ns_name.c ns_parse%FIXED.c ns_samedomain.c ns_sign.c ns_verify.c \
res_comp.c res_findzonecut.c res_init.c res_mkquery.c res_mkupdate.c \
- res_query.c res_send.c res_sendsigned.c res_update.c
+ res_query%FIXED.c res_send.c res_sendsigned.c res_update.c
CFLAGS+= -DHMAC_MD5 -DMINIRES_LIB
NOMAN= true
-CLEANFILES+= ns_parse%FIXED.c
+CLEANFILES+= ns_parse%FIXED.c res_query%FIXED.c
ns_parse%FIXED.c: ns_parse.c
sed 's/struct _ns_flagdata _ns_flagdata/struct _ns_flagdata _ns_flagdata_DONT/' \
${.ALLSRC} > ${.TARGET}
+res_query%FIXED.c: res_query.c
+ sed -e 's/RES_SET_H_ERRNO(\(.*\),\(.*\))/(h_errno = (\1)->res_h_errno = (\2))/' \
+ ${.ALLSRC} > ${.TARGET}
.include <bsd.lib.mk>
OpenPOWER on IntegriCloud