[ntp:bk-ntp-dev-send] BitKeeper patch

Harlan Stenn stenn at mail.eecis.udel.edu
Mon Nov 7 19:13:48 PST 2005


This BitKeeper patch contains the following changesets:
stenn at deacon.udel.edu|ChangeSet|20051108031110|20546

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# ID:	stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
# User:	stenn
# Host:	deacon.udel.edu
# Root:	/deacon/backroom/ntp-dev

#
#--- 1.383/configure.ac	2005-10-25 20:15:34 -04:00
#+++ 1.384/configure.ac	2005-11-07 22:11:02 -05:00
#@@ -4,7 +4,9 @@
# AC_INIT(ntp, VERSION_NUMBER)
# AM_INIT_AUTOMAKE
# AC_CANONICAL_HOST
#-AC_DEFINE_UNQUOTED(STR_SYSTEM, "$host", [canonical system (cpu-vendor-os) string])
#+dnl the 'build' machine is where we run configure and compile
#+dnl the 'host' machine is where the resulting stuff runs.
#+AC_DEFINE_UNQUOTED(STR_SYSTEM, "$host", [canonical system (cpu-vendor-os) of where we should run])
# AM_CONFIG_HEADER(config.h)
# dnl AC_ARG_PROGRAM
# AC_PREREQ(2.53)
#@@ -95,6 +97,9 @@
#     ;;
# esac
# # HMS: Why isn't this $build?
#+# Well, that depends on if we need this for the build toolchain or
#+# for info in the host executable...
#+# I still have no idea which way this should go, but nobody has complained.
# case "$host" in
#  *-*-netbsd*)
#     case "$need_dash_r" in
#@@ -191,25 +196,10 @@
#     ;;
# esac
# 
#-ac_busted_vpath_in_make=no
#-
#-# HMS: Why isn't this $build?
# case "$host" in
#  *-next-nextstep3)
#     CFLAGS="$CFLAGS -posix"
#     ;;
#- *-*-irix6.1*)	# 64 bit only
#-    # busted vpath?
#-    ;;
#- *-*-irix6*)	# 6.2 (and later?)
#-    ac_busted_vpath_in_make=yes
#-    ;;
#- *-*-solaris2.5.1)
#-    ac_busted_vpath_in_make=yes
#-    ;;
#- *-*-unicosmp*)
#-    ac_busted_vpath_in_make=yes
#-    ;;
# dnl This is currently commented out by bor. 
# dnl The new versions of ReliantUNIX round adjtime() interval down
# dnl to 1/100s (system tick). This makes tickadj actually useless.
#@@ -225,6 +215,23 @@
# dnl     ;;
# esac
# 
#+ac_busted_vpath_in_make=no
#+
#+case "$build" in
#+ *-*-irix6.1*)	# 64 bit only
#+    # busted vpath?
#+    ;;
#+ *-*-irix6*)	# 6.2 (and later?)
#+    ac_busted_vpath_in_make=yes
#+    ;;
#+ *-*-solaris2.5.1)
#+    ac_busted_vpath_in_make=yes
#+    ;;
#+ *-*-unicosmp*)
#+    ac_busted_vpath_in_make=yes
#+    ;;
#+esac
#+
# case "$ac_busted_vpath_in_make$srcdir" in
#  no*) ;;
#  yes.) ;;
#@@ -716,7 +723,7 @@
# 	AC_DEFINE(HAVE_SS_FAMILY_IN_SS, 1, [Does struct sockaddr_storage have ss_family?])
# else
#     # Hack around a problem...
#-    # HMS: Why isn't this $build?
#+    # HMS: This is $host because we need the -D if we are building *for* it.
#     case "$host" in
#      *-*-hpux11.11) CPPFLAGS="$CPPFLAGS -D_NETINET_IN6_H"
# 	;;
#@@ -1883,7 +1890,7 @@
# 
# case "$ac_cv_c_inline$ac_cv_struct_timespec" in
#  inlineyes)
#-    case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h$build_os" in
#+    case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h$host_os" in
#      *yes* | *sunos* | *solaris* | *sco* | *netbsd* )
# 	AC_DEFINE(HAVE_PPSAPI, 1, [Do we have the PPS API per the Draft RFC?])
# 	ac_cv_var_jupiter_ok=yes
#@@ -2780,7 +2787,11 @@
# AC_MSG_CHECKING(for openssl library directory)
# AC_ARG_WITH(openssl-libdir,
# 	AC_HELP_STRING([--with-openssl-libdir], [+ =/something/reasonable]),
#-[ans=$withval], [ans=yes])
#+[ans=$withval],
#+[case "$build" in
#+ $host) ans=yes ;;
#+ *)     ans=no ;;
#+esac])
# case "$ans" in
#  no) ;;
#  yes) # Look in:
#@@ -2820,7 +2831,11 @@
# AC_MSG_CHECKING(for openssl include directory)
# AC_ARG_WITH(openssl-incdir,
# 	AC_HELP_STRING([--with-openssl-incdir], [+ =/something/reasonable]),
#-[ans=$withval], [ans=yes])
#+[ans=$withval],
#+[case "$build" in
#+ $host) ans=yes ;;
#+ *)     ans=no ;;
#+esac])
# case "$ans" in
#  no) ;;
#  yes) # look in:
#

# Diff checksum=6bcae591


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at deacon.udel.edu|ChangeSet|20051107081555|20559
D 1.1434 05/11/07 22:11:10-05:00 stenn at deacon.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 481] do not check $build paths for openssl if cross-compiling.  Other $build/$host cleanup, too.
K 20546
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|configure.in|19990526004811|01635|3aed0663 stenn at deacon.udel.edu|configure.ac|20051108031102|44831

== configure.ac ==
stenn at whimsy.udel.edu|configure.in|19990526004811|01635|3aed0663
stenn at deacon.udel.edu|configure.ac|20051026001534|06598
D 1.384 05/11/07 22:11:02-05:00 stenn at deacon.udel.edu +35 -20
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 481] do not check $build paths for openssl if cross-compiling.  Other $build/$host cleanup, too.
K 44831
O -rw-rw-r--
P configure.ac
------------------------------------------------

D7 1
I7 3
dnl the 'build' machine is where we run configure and compile
dnl the 'host' machine is where the resulting stuff runs.
AC_DEFINE_UNQUOTED(STR_SYSTEM, "$host", [canonical system (cpu-vendor-os) of where we should run])
I97 3
# Well, that depends on if we need this for the build toolchain or
# for info in the host executable...
# I still have no idea which way this should go, but nobody has complained.
D194 3
D201 12
I227 17
ac_busted_vpath_in_make=no
\
case "$build" in
 *-*-irix6.1*)	# 64 bit only
    # busted vpath?
    ;;
 *-*-irix6*)	# 6.2 (and later?)
    ac_busted_vpath_in_make=yes
    ;;
 *-*-solaris2.5.1)
    ac_busted_vpath_in_make=yes
    ;;
 *-*-unicosmp*)
    ac_busted_vpath_in_make=yes
    ;;
esac
\
D719 1
I719 1
    # HMS: This is $host because we need the -D if we are building *for* it.
D1886 1
I1886 1
    case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h$host_os" in
D2783 1
I2783 5
[ans=$withval],
[case "$build" in
 $host) ans=yes ;;
 *)     ans=no ;;
esac])
D2823 1
I2823 5
[ans=$withval],
[case "$build" in
 $host) ans=yes ;;
 *)     ans=no ;;
esac])

# Patch checksum=40e1936e


More information about the bk-ntp-dev-send mailing list