This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch allan/config-files created. glibc-2.21-43-g788aadf
- From: allan at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Feb 2015 10:04:13 -0000
- Subject: GNU C Library master sources branch allan/config-files created. glibc-2.21-43-g788aadf
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, allan/config-files has been created
at 788aadfe4dab72f030f2c9352c83ea6e38b61509 (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=788aadfe4dab72f030f2c9352c83ea6e38b61509
commit 788aadfe4dab72f030f2c9352c83ea6e38b61509
Author: Allan McRae <allan@archlinux.org>
Date: Sun Feb 8 17:18:16 2015 +1000
Install nscd systemd files
Install nscd systemd services file and tmpfile when glibc is configured with
--with-systemdsystemunitdir=<dir>
diff --git a/Makeconfig b/Makeconfig
index 751e9ff..d9faa49 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -306,6 +306,8 @@ ifndef sysincludedir
sysincludedir = /usr/include
endif
+# Directory to install systemd service files
+inst_systemdsystemunitdir = $(install_root)$(systemd-system-unit-dir)
# Commands to install files.
ifndef INSTALL_DATA
diff --git a/config.make.in b/config.make.in
index ad4dd30..c73af0b 100644
--- a/config.make.in
+++ b/config.make.in
@@ -94,6 +94,7 @@ use-nscd = @use_nscd@
build-hardcoded-path-in-tests= @hardcoded_path_in_tests@
build-pt-chown = @build_pt_chown@
enable-lock-elision = @enable_lock_elision@
+systemd-system-unit-dir = @systemdsystemunitdir@
# Build tools.
CC = @CC@
diff --git a/configure b/configure
index ce0c6a0..e21e1e4 100755
--- a/configure
+++ b/configure
@@ -675,6 +675,7 @@ bindnow
enable_lock_elision
hardcoded_path_in_tests
use_default_link
+systemdsystemunitdir
sysheaders
with_fp
READELF
@@ -753,6 +754,7 @@ with_fp
with_binutils
with_selinux
with_headers
+with_systemdsystemunitdir
with_default_link
enable_sanity_checks
enable_shared
@@ -1454,6 +1456,8 @@ Optional Packages:
--with-selinux if building with SELinux support
--with-headers=PATH location of system headers to use (for example
/usr/src/linux/include) [default=compiler default]
+ --with-systemdsystemunitdir=DIR
+ directory for systemd service files
--with-default-link do not use explicit linker scripts
--with-cpu=CPU select code for CPU variant
@@ -3422,6 +3426,16 @@ fi
+# Check whether --with-systemdsystemunitdir was given.
+if test "${with_systemdsystemunitdir+set}" = set; then :
+ withval=$with_systemdsystemunitdir; systemdsystemunitdir=$withval
+else
+ systemdsystemunitdir=''
+fi
+
+
+
+
# Check whether --with-default-link was given.
if test "${with_default_link+set}" = set; then :
diff --git a/configure.ac b/configure.ac
index d89aaf0..464ffcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,6 +127,13 @@ AC_ARG_WITH([headers],
[sysheaders=''])
AC_SUBST(sysheaders)
+AC_ARG_WITH([systemdsystemunitdir],
+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
+ [directory for systemd service files]),
+ [systemdsystemunitdir=$withval],
+ [systemdsystemunitdir=''])
+AC_SUBST(systemdsystemunitdir)
+
AC_SUBST(use_default_link)
AC_ARG_WITH([default-link],
AC_HELP_STRING([--with-default-link],
diff --git a/nscd/Makefile b/nscd/Makefile
index 184c921..1d65c00 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -27,6 +27,10 @@ routines := nscd_getpw_r nscd_getgr_r nscd_gethst_r nscd_getai \
nscd_initgroups nscd_getserv_r nscd_netgroup
aux := nscd_helper
install-others = $(inst_sysconfdir)/nscd.conf
+ifneq ($(systemd-system-unit-dir),)
+install-others += $(inst_systemdsystemunitdir)/nscd.service
+install-others += $(inst_libdir)/tmpfiles.d/nscd.conf
+endif
endif
# To find xmalloc.c
@@ -108,3 +112,11 @@ endif
$(inst_sysconfdir)/nscd.conf: nscd.conf $(+force)
$(do-install)
+
+ifneq ($(systemd-system-unit-dir),)
+$(inst_systemdsystemunitdir)/nscd.service: nscd.service $(+force)
+ $(do-install)
+
+$(inst_libdir)/tmpfiles.d/nscd.conf: nscd.tmpfiles $(+force)
+ $(do-install)
+endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1d77d8681654192d5207a6993314a091972a1f82
commit 1d77d8681654192d5207a6993314a091972a1f82
Author: Mike Frysinger <vapier@gentoo.org>
Date: Tue May 14 09:37:07 2013 +1000
Install config files
glibc comes with a bunch of config files that every distro hand installs
because glibc itself doesn't take care of it. Update glibc to do the work.
diff --git a/nscd/Makefile b/nscd/Makefile
index ede941d..184c921 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -26,6 +26,7 @@ ifneq ($(use-nscd),no)
routines := nscd_getpw_r nscd_getgr_r nscd_gethst_r nscd_getai \
nscd_initgroups nscd_getserv_r nscd_netgroup
aux := nscd_helper
+install-others = $(inst_sysconfdir)/nscd.conf
endif
# To find xmalloc.c
@@ -104,3 +105,6 @@ $(objpfx)nscd: $(shared-thread-library) $(common-objpfx)nis/libnsl.so
else
$(objpfx)nscd: $(static-thread-library) $(common-objpfx)nis/libnsl.a
endif
+
+$(inst_sysconfdir)/nscd.conf: nscd.conf $(+force)
+ $(do-install)
diff --git a/posix/Makefile b/posix/Makefile
index 15e8818..beba7e2 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -98,6 +98,7 @@ tests += $(tests-static)
others := getconf
install-bin := getconf
install-others-programs := $(inst_libexecdir)/getconf
+install-others = $(inst_sysconfdir)/gai.conf
before-compile += testcases.h ptestcases.h $(objpfx)posix-conf-vars-def.h
@@ -316,6 +317,9 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
mv -f $@/$$spec.new $@/$$spec; \
done < $(objpfx)getconf.speclist
+$(inst_sysconfdir)/gai.conf: gai.conf $(+force)
+ $(do-install)
+
$(objpfx)getconf.speclist: getconf-speclist.c posix-envs.def
$(compile.c) -E -o - \
| sed -n -e '/@@@PRESENT_/s/@@@PRESENT_//p' > $@.new
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources