[Glibc-bsd-commits] r4511 - in trunk/glibc-ports/kfreebsd: . bits
Petr Salinger
ps-guest at alioth.debian.org
Fri May 31 15:36:53 UTC 2013
Author: ps-guest
Date: 2013-05-31 15:36:52 +0000 (Fri, 31 May 2013)
New Revision: 4511
Modified:
trunk/glibc-ports/kfreebsd/bits/fcntl.h
trunk/glibc-ports/kfreebsd/configure
trunk/glibc-ports/kfreebsd/configure.in
Log:
define O_CLOEXEC and bump minimal kernel version to 8.3
Modified: trunk/glibc-ports/kfreebsd/bits/fcntl.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/fcntl.h 2013-05-31 07:12:29 UTC (rev 4510)
+++ trunk/glibc-ports/kfreebsd/bits/fcntl.h 2013-05-31 15:36:52 UTC (rev 4511)
@@ -83,8 +83,7 @@
#if defined (__USE_XOPEN2K8) || defined (__USE_BSD)
/* Defined by POSIX 1003.1-2008; BSD default, but reserve for future use. */
#define O_TTY_INIT 0x00080000 /* Restore default termios attributes */
-/* Defining O_CLOEXEC would break kfreebsd 8.1, see #635192 */
-/* #define O_CLOEXEC 0x00100000 */
+#define O_CLOEXEC 0x00100000
#endif
/* For now FreeBSD has synchronisity options for data and read operations.
Modified: trunk/glibc-ports/kfreebsd/configure
===================================================================
--- trunk/glibc-ports/kfreebsd/configure 2013-05-31 07:12:29 UTC (rev 4510)
+++ trunk/glibc-ports/kfreebsd/configure 2013-05-31 15:36:52 UTC (rev 4511)
@@ -22,78 +22,180 @@
fi
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
- then ac_cv_prog_egrep='grep -E'
- else ac_cv_prog_egrep='egrep'
+ if test -z "$GREP"; then
+ ac_path_GREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_GREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_GREP=$GREP
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
-echo "$as_me:$LINENO: checking installed kFreeBSD kernel header files" >&5
-echo $ECHO_N "checking installed kFreeBSD kernel header files... $ECHO_C" >&6
-if test "${libc_cv_kfreebsd810+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+ if test -z "$EGREP"; then
+ ac_path_EGREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_EGREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking installed kFreeBSD kernel header files" >&5
+$as_echo_n "checking installed kFreeBSD kernel header files... " >&6; }
+if test "${libc_cv_kfreebsd830+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <osreldate.h>
#if !defined(__FreeBSD_kernel_version) && defined(__FreeBSD_version)
#define __FreeBSD_kernel_version __FreeBSD_version
#endif
-#if !defined __FreeBSD_kernel_version || __FreeBSD_kernel_version < (8 *100000+ 1 *1000+ 0) /* 8.1.0 */
+#if !defined __FreeBSD_kernel_version || __FreeBSD_kernel_version < (8 *100000+ 3 *1000+ 0) /* 8.3.0 */
eat flaming death
#endif
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "eat flaming death" >/dev/null 2>&1; then
- libc_cv_kfreebsd810='TOO OLD!'
+ $EGREP "eat flaming death" >/dev/null 2>&1; then :
+ libc_cv_kfreebsd830='TOO OLD!'
else
- libc_cv_kfreebsd810='8.1.0 or later'
+ libc_cv_kfreebsd830='8.3.0 or later'
fi
rm -f conftest*
fi
-echo "$as_me:$LINENO: result: $libc_cv_kfreebsd810" >&5
-echo "${ECHO_T}$libc_cv_kfreebsd810" >&6
-if test "$libc_cv_kfreebsd810" != '8.1.0 or later'; then
- { { echo "$as_me:$LINENO: error: GNU libc requires kernel header files from
-kFreeBSD 8.1.0 or later to be installed before configuring.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_kfreebsd830" >&5
+$as_echo "$libc_cv_kfreebsd830" >&6; }
+if test "$libc_cv_kfreebsd830" != '8.3.0 or later'; then
+ as_fn_error "GNU libc requires kernel header files from
+kFreeBSD 8.3.0 or later to be installed before configuring.
The kernel header files are found usually in /usr/src/sys/; make sure
-these directories use files from kFreeBSD 8.1.0 or later.
+these directories use files from kFreeBSD 8.3.0 or later.
This check uses <osreldate.h>, so
make sure that file was built correctly when installing the kernel header
files. To use kernel headers not from /usr/src/sys/, use the
-configure option --with-headers." >&5
-echo "$as_me: error: GNU libc requires kernel header files from
-kFreeBSD 8.1.0 or later to be installed before configuring.
-The kernel header files are found usually in /usr/src/sys/; make sure
-these directories use files from kFreeBSD 8.1.0 or later.
-This check uses <osreldate.h>, so
-make sure that file was built correctly when installing the kernel header
-files. To use kernel headers not from /usr/src/sys/, use the
-configure option --with-headers." >&2;}
- { (exit 1); exit 1; }; }
+configure option --with-headers." "$LINENO" 5
fi
-# Check whether --enable-compatible-utmp or --disable-compatible-utmp was given.
-if test "${enable_compatible_utmp+set}" = set; then
- enableval="$enable_compatible_utmp"
- enable_utmp_compat=$enableval
+# Check whether --enable-compatible-utmp was given.
+if test "${enable_compatible_utmp+set}" = set; then :
+ enableval=$enable_compatible_utmp; enable_utmp_compat=$enableval
else
enable_utmp_compat=no
-fi;
+fi
+
if test "$enable_utmp_compat" = no; then
utmp_subdir=utmp-utmpx
else
@@ -111,13 +213,13 @@
case "$machine" in
i386*)
libc_cv_gcc_unwind_find_fde=yes
- arch_minimum_kernel=8.1.0
+ arch_minimum_kernel=8.3.0
;;
x86_64*)
- arch_minimum_kernel=8.1.0
+ arch_minimum_kernel=8.3.0
;;
*)
- arch_minimum_kernel=8.1.0
+ arch_minimum_kernel=8.3.0
;;
esac
if test -n "$minimum_kernel"; then
@@ -126,27 +228,23 @@
arch_version=$((`echo "$arch_minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
if test $user_version -lt $arch_version; then
- { echo "$as_me:$LINENO: WARNING: minimum kernel version reset to $arch_minimum_kernel" >&5
-echo "$as_me: WARNING: minimum kernel version reset to $arch_minimum_kernel" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: minimum kernel version reset to $arch_minimum_kernel" >&5
+$as_echo "$as_me: WARNING: minimum kernel version reset to $arch_minimum_kernel" >&2;}
minimum_kernel=$arch_minimum_kernel
fi
else
- if test $arch_minimum_kernel != '8.1.0'; then
+ if test $arch_minimum_kernel != '8.3.0'; then
minimum_kernel=$arch_minimum_kernel
fi
fi
if test -n "$minimum_kernel"; then
- echo "$as_me:$LINENO: checking for kernel header at least $minimum_kernel" >&5
-echo $ECHO_N "checking for kernel header at least $minimum_kernel... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel header at least $minimum_kernel" >&5
+$as_echo_n "checking for kernel header at least $minimum_kernel... " >&6; }
hdrnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 100000 + \2 * 1000 + \3)/'`;
decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`;
abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`;
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <osreldate.h>
#if !defined(__FreeBSD_kernel_version) && defined(__FreeBSD_version)
@@ -157,15 +255,15 @@
#endif
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "eat flaming death" >/dev/null 2>&1; then
+ $EGREP "eat flaming death" >/dev/null 2>&1; then :
libc_minimum_kernel='too old!'
else
libc_minimum_kernel=ok
fi
rm -f conftest*
- echo "$as_me:$LINENO: result: $libc_minimum_kernel" >&5
-echo "${ECHO_T}$libc_minimum_kernel" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_minimum_kernel" >&5
+$as_echo "$libc_minimum_kernel" >&6; }
if test "$libc_minimum_kernel" = ok; then
cat >>confdefs.h <<_ACEOF
#define __KFREEBSD_KERNEL_VERSION $decnum
@@ -176,11 +274,8 @@
_ACEOF
else
- { { echo "$as_me:$LINENO: error: *** The available kernel headers are older than the requested
-*** compatible kernel version" >&5
-echo "$as_me: error: *** The available kernel headers are older than the requested
-*** compatible kernel version" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "*** The available kernel headers are older than the requested
+*** compatible kernel version" "$LINENO" 5
fi
fi
@@ -290,6 +385,7 @@
use_ldconfig=yes
# We need some extensions to the `ldd' script.
+
case "$machine" in
x86_64*)
ldd_rewrite_script=$dir/x86_64/ldd-rewrite.sed
@@ -308,8 +404,8 @@
else
ac_prefix=$ac_default_prefix
fi
- echo "$as_me:$LINENO: checking for symlinks in ${ac_prefix}/include" >&5
-echo $ECHO_N "checking for symlinks in ${ac_prefix}/include... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symlinks in ${ac_prefix}/include" >&5
+$as_echo_n "checking for symlinks in ${ac_prefix}/include... " >&6; }
ac_message=
if test -L ${ac_prefix}/include/net; then
ac_message="$ac_message
@@ -320,23 +416,17 @@
${ac_prefix}/include/scsi is a symlink"
fi
if test -n "$ac_message"; then
- { { echo "$as_me:$LINENO: error: $ac_message
+ as_fn_error "$ac_message
\`make install' will destroy the target of the link(s).
Delete the links and re-run configure, or better still, move the entire
-${ac_prefix}/include directory out of the way." >&5
-echo "$as_me: error: $ac_message
-\`make install' will destroy the target of the link(s).
-Delete the links and re-run configure, or better still, move the entire
-${ac_prefix}/include directory out of the way." >&2;}
- { (exit 1); exit 1; }; }
+${ac_prefix}/include directory out of the way." "$LINENO" 5
else
- echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
fi
fi
# We support internal syscalls.
# It is advertised as inlined syscalls availability ...
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INLINED_SYSCALLS 1
-_ACEOF
+$as_echo "#define HAVE_INLINED_SYSCALLS 1" >>confdefs.h
+
Modified: trunk/glibc-ports/kfreebsd/configure.in
===================================================================
--- trunk/glibc-ports/kfreebsd/configure.in 2013-05-31 07:12:29 UTC (rev 4510)
+++ trunk/glibc-ports/kfreebsd/configure.in 2013-05-31 15:36:52 UTC (rev 4511)
@@ -18,7 +18,7 @@
# existing system library, because we are the only system library.
inhibit_glue=yes
-define([LIBC_KFREEBSD_VERSION],[6.0.0])dnl
+define([LIBC_KFREEBSD_VERSION],[8.3.0])dnl
if test -n "$sysheaders"; then
OLD_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
@@ -47,10 +47,11 @@
configure option --with-headers.])
fi
-AC_ARG_ENABLE(compatible-utmp, dnl
-[ --disable-compatible-utmp use a struct utmp which is the same as struct
- utmpx, as on kFreeBSD, but incompatible with FreeBSD],
- enable_utmp_compat=$enableval, enable_utmp_compat=no)
+AC_ARG_ENABLE([compatible-utmp],
+ AC_HELP_STRING([--disable-compatible-utmp],
+ [use a struct utmp which is the same as struct utmpx, as on kFreeBSD, but incompatible with FreeBSD]),
+ [enable_utmp_compat=$enableval],
+ [enable_utmp_compat=no])
if test "$enable_utmp_compat" = no; then
utmp_subdir=utmp-utmpx
else
@@ -68,13 +69,13 @@
case "$machine" in
i386*)
libc_cv_gcc_unwind_find_fde=yes
- arch_minimum_kernel=6.0.0
+ arch_minimum_kernel=8.3.0
;;
x86_64*)
- arch_minimum_kernel=6.0.0
+ arch_minimum_kernel=8.3.0
;;
*)
- arch_minimum_kernel=6.0.0
+ arch_minimum_kernel=8.3.0
;;
esac
if test -n "$minimum_kernel"; then
@@ -87,7 +88,7 @@
minimum_kernel=$arch_minimum_kernel
fi
else
- if test $arch_minimum_kernel != '6.0.0'; then
+ if test $arch_minimum_kernel != '8.3.0'; then
minimum_kernel=$arch_minimum_kernel
fi
fi
More information about the Glibc-bsd-commits
mailing list