[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commits] r24782 - in /fsf/trunk/libc: ./ nscd/ sysdeps/x86_64/multiarch/



Author: eglibc
Date: Mon Dec 16 00:01:53 2013
New Revision: 24782

Log:
Import glibc-mainline for 2013-12-16

Added:
    fsf/trunk/libc/nscd/nscd.service
    fsf/trunk/libc/nscd/nscd.tmpfiles
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/configure
    fsf/trunk/libc/configure.ac
    fsf/trunk/libc/sysdeps/x86_64/multiarch/ifunc-impl-list.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Mon Dec 16 00:01:53 2013
@@ -1,3 +1,15 @@
+2013-12-16  Allan McRae  <allan@xxxxxxxxxxxxx>
+
+	* sysdeps/x86_64/multiarch/ifunc-impl-list.c: Update file name.
+
+	[BZ #14120]
+	* configure.ac: Added --enable-maintainer-mode. Check for
+	autoconf when enabled.
+	* configure: Regenerated.
+
+	* nscd/nscd.service: New file.
+	* nscd/nscd.tmpfiles: New file.
+
 2013-12-14  OndÃÂej BÃÂlka  <neleai@xxxxxxxxx>
 
 	[BZ #12100]

Modified: fsf/trunk/libc/configure
==============================================================================
--- fsf/trunk/libc/configure (original)
+++ fsf/trunk/libc/configure Mon Dec 16 00:01:53 2013
@@ -747,6 +747,7 @@
 enable_bind_now
 enable_static_nss
 enable_force_install
+enable_maintainer_mode
 enable_kernel
 enable_all_warnings
 enable_multi_arch
@@ -1408,6 +1409,9 @@
   --enable-static-nss     build static NSS modules [default=no]
   --disable-force-install don't force installation of files from this package,
                           even if they are older than the installed files
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
   --enable-kernel=VERSION compile for compatibility with kernel not older than
                           VERSION
   --enable-all-warnings   enable all useful warnings gcc can issue
@@ -3528,6 +3532,14 @@
   force_install=yes
 fi
 
+
+
+# Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+  enableval=$enable_maintainer_mode; maintainer=$enableval
+else
+  maintainer=no
+fi
 
 
 # Check whether --enable-kernel was given.
@@ -5120,7 +5132,8 @@
 fi
 
 
-for ac_prog in autoconf
+if test "x$maintainer" = "xyes"; then
+  for ac_prog in autoconf
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -5163,27 +5176,28 @@
 done
 test -n "$AUTOCONF" || AUTOCONF="no"
 
-case "x$AUTOCONF" in
-xno|x|x:) AUTOCONF=no ;;
-*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works" >&5
-$as_echo_n "checking whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works... " >&6; }
+  case "x$AUTOCONF" in
+  xno|x|x:) AUTOCONF=no ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking   whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works" >&5
+$as_echo_n "checking   whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works... " >&6; }
 if ${libc_cv_autoconf_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-    if (cd $srcdir; $AUTOCONF $ACFLAGS configure.ac > /dev/null 2>&1); then
-    libc_cv_autoconf_works=yes
-  else
-    libc_cv_autoconf_works=no
-  fi
+      if (cd $srcdir; $AUTOCONF $ACFLAGS configure.ac > /dev/null 2>&1); then
+      libc_cv_autoconf_works=yes
+    else
+      libc_cv_autoconf_works=no
+    fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_autoconf_works" >&5
 $as_echo "$libc_cv_autoconf_works" >&6; }
-  test $libc_cv_autoconf_works = yes || AUTOCONF=no
-  ;;
-esac
-if test "x$AUTOCONF" = xno; then
-  aux_missing="$aux_missing autoconf"
+    test $libc_cv_autoconf_works = yes || AUTOCONF=no
+    ;;
+  esac
+  if test "x$AUTOCONF" = xno; then
+    aux_missing="$aux_missing autoconf"
+  fi
 fi
 
 test -n "$critic_missing" && as_fn_error $? "

Modified: fsf/trunk/libc/configure.ac
==============================================================================
--- fsf/trunk/libc/configure.ac (original)
+++ fsf/trunk/libc/configure.ac Mon Dec 16 00:01:53 2013
@@ -230,6 +230,12 @@
 	      [force_install=$enableval],
 	      [force_install=yes])
 AC_SUBST(force_install)
+
+AC_ARG_ENABLE([maintainer-mode],
+	      AC_HELP_STRING([--enable-maintainer-mode],
+			     [enable make rules and dependencies not useful (and sometimes confusing) to the casual installer]),
+	      [maintainer=$enableval],
+	      [maintainer=no])
 
 dnl On some platforms we allow dropping compatibility with all kernel
 dnl versions.
@@ -1004,22 +1010,24 @@
 
 AC_CHECK_TOOL(NM, nm, false)
 
-AC_CHECK_PROGS(AUTOCONF, autoconf, no)
-case "x$AUTOCONF" in
-xno|x|x:) AUTOCONF=no ;;
-*)
-  AC_CACHE_CHECK(dnl
-whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works, libc_cv_autoconf_works, [dnl
-  if (cd $srcdir; $AUTOCONF $ACFLAGS configure.ac > /dev/null 2>&1); then
-    libc_cv_autoconf_works=yes
-  else
-    libc_cv_autoconf_works=no
-  fi])
-  test $libc_cv_autoconf_works = yes || AUTOCONF=no
-  ;;
-esac
-if test "x$AUTOCONF" = xno; then
-  aux_missing="$aux_missing autoconf"
+if test "x$maintainer" = "xyes"; then
+  AC_CHECK_PROGS(AUTOCONF, autoconf, no)
+  case "x$AUTOCONF" in
+  xno|x|x:) AUTOCONF=no ;;
+  *)
+    AC_CACHE_CHECK(dnl
+  whether $AUTOCONF${ACFLAGS:+ }$ACFLAGS works, libc_cv_autoconf_works, [dnl
+    if (cd $srcdir; $AUTOCONF $ACFLAGS configure.ac > /dev/null 2>&1); then
+      libc_cv_autoconf_works=yes
+    else
+      libc_cv_autoconf_works=no
+    fi])
+    test $libc_cv_autoconf_works = yes || AUTOCONF=no
+    ;;
+  esac
+  if test "x$AUTOCONF" = xno; then
+    aux_missing="$aux_missing autoconf"
+  fi
 fi
 
 test -n "$critic_missing" && AC_MSG_ERROR([

Added: fsf/trunk/libc/nscd/nscd.service
==============================================================================
--- fsf/trunk/libc/nscd/nscd.service (added)
+++ fsf/trunk/libc/nscd/nscd.service Mon Dec 16 00:01:53 2013
@@ -1,0 +1,18 @@
+# systemd service file for nscd
+
+[Unit]
+Description=Name Service Cache Daemon
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/nscd --foreground
+ExecStop=/usr/sbin/nscd --shutdown
+ExecReload=/usr/sbin/nscd -i passwd
+ExecReload=/usr/sbin/nscd -i group
+ExecReload=/usr/sbin/nscd -i hosts
+ExecReload=/usr/sbin/nscd -i services
+Restart=always
+PIDFile=/run/nscd/nscd.pid
+
+[Install]
+WantedBy=multi-user.target

Added: fsf/trunk/libc/nscd/nscd.tmpfiles
==============================================================================
--- fsf/trunk/libc/nscd/nscd.tmpfiles (added)
+++ fsf/trunk/libc/nscd/nscd.tmpfiles Mon Dec 16 00:01:53 2013
@@ -1,0 +1,4 @@
+# Configuration to create /run/nscd directory
+# Used as part of systemd's tmpfiles
+
+d /run/nscd 0755 root root

Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/ifunc-impl-list.c
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/ifunc-impl-list.c (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/ifunc-impl-list.c Mon Dec 16 00:01:53 2013
@@ -180,7 +180,7 @@
 	      IFUNC_IMPL_ADD (array, i, strspn, HAS_SSE4_2, __strspn_sse42)
 	      IFUNC_IMPL_ADD (array, i, strspn, 1, __strspn_sse2))
 
-  /* Support sysdeps/x86_64/multiarch/strstr-c.c.  */
+  /* Support sysdeps/x86_64/multiarch/strstr.c.  */
   IFUNC_IMPL (i, name, strstr,
 	      IFUNC_IMPL_ADD (array, i, strstr, 1, __strstr_sse2_unaligned)
 	      IFUNC_IMPL_ADD (array, i, strstr, 1, __strstr_sse2))

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits