Upgrade to upstream version 3.0.4; Add new dhclient options: -H <host-name>
-F <fqdn> -T <timeout>; fix build on ia64 now that cf/linux.h defines PTRSIZE_64BIT
This commit is contained in:
parent
a3ad01f7f0
commit
caefeee4f3
@ -12,6 +12,7 @@ Source1: dhcpd.conf.sample
|
|||||||
Source2: dhcpd.init
|
Source2: dhcpd.init
|
||||||
Source3: dhcrelay.init
|
Source3: dhcrelay.init
|
||||||
Source4: dhcpd.conf
|
Source4: dhcpd.conf
|
||||||
|
Source5: findptrsize.c
|
||||||
Patch: dhcp-3.0-alignment.patch
|
Patch: dhcp-3.0-alignment.patch
|
||||||
Patch100: dhcp-3.0-jbuild.patch
|
Patch100: dhcp-3.0-jbuild.patch
|
||||||
Patch102: dhcp-3.0.1rc13-dhcpctlman.patch
|
Patch102: dhcp-3.0.1rc13-dhcpctlman.patch
|
||||||
@ -221,12 +222,9 @@ cat <<EOF >>includes/site.h
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
%build
|
%build
|
||||||
cat <<EOF >findptrsize.c
|
cp -fp %SOURCE5 .
|
||||||
#include <stdio.h>
|
|
||||||
int main(void) { printf("%%d\n", sizeof(void *)); return 0; }
|
|
||||||
EOF
|
|
||||||
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Dlint -Werror -Wno-unused"
|
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Dlint -Werror -Wno-unused"
|
||||||
%{__cc} -o findptrsize findptrsize.c
|
%{__cc} -I. -o findptrsize findptrsize.c
|
||||||
[ "`./findptrsize`" -ge 8 ] && RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPTRSIZE_64BIT"
|
[ "`./findptrsize`" -ge 8 ] && RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPTRSIZE_64BIT"
|
||||||
%ifarch s390 s390x
|
%ifarch s390 s390x
|
||||||
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE"
|
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE"
|
||||||
|
Loading…
Reference in New Issue
Block a user