Linux: unlockpt needs to fail with EINVAL, not ENOTTY (bug 26053)

[glibc.git] / login / Makefile

diff --git a/login/Makefile b/login/Makefile
index 427c050a8984d62c88c3c24dc549aa55049c287b..d897057bbde0d8b07bb56a37e4745c3b1786cedc 100644 (file)
--- a/login/Makefile
+++ b/login/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-1998,2000-2003,2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,8 @@
 # Lesser General Public License for more details.
 
 # You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
+# License along with the GNU C Library; if not, see
+# <https://www.gnu.org/licenses/>.
 
 #
 #      Sub-makefile for login portion of the library.
@@ -22,22 +21,30 @@
 
 subdir := login
 
+include ../Makeconfig
+
 headers        := utmp.h bits/utmp.h lastlog.h pty.h
 
-routines := getutent getutent_r getutid getutline getutid_r getutline_r \
-           utmp_file utmpname updwtmp getpt grantpt unlockpt ptsname
+routines := getlogin getlogin_r setlogin getlogin_r_chk \
+           getutent getutent_r getutid getutline getutid_r getutline_r \
+           utmp_file utmpname updwtmp getpt grantpt unlockpt ptsname \
+           ptsname_r_chk
 
-CFLAGS-grantpt.c = -DLIBEXECDIR='"$(libexecdir)"'
+CFLAGS-grantpt.c += -DLIBEXECDIR='"$(libexecdir)"'
 
-others = utmpdump pt_chown
-install-others-programs = $(inst_libexecdir)/pt_chown
+others = utmpdump
 
-distribute := utmp-private.h utmp-equal.h pty-private.h
+ifeq (yes,$(build-pt-chown))
+others += pt_chown
+others-pie = pt_chown
+install-others-programs = $(inst_libexecdir)/pt_chown
+endif
 
 subdir-dirs = programs
 vpath %.c programs
 
-tests := tst-utmp tst-utmpx tst-grantpt
+tests := tst-utmp tst-utmpx tst-grantpt tst-ptsname tst-getlogin tst-updwtmpx \
+  tst-pututxline-lockfail tst-pututxline-cache
 
 # Build the -lutil library with these extra functions.
 extra-libs      := libutil
@@ -47,24 +54,24 @@ libutil-routines:= login login_tty logout logwtmp openpty forkpty
 
 include ../Rules
 
-CFLAGS-getpt.c = -fexceptions
+CFLAGS-getpt.c += -fexceptions
 
-ifeq (yes,$(build-static-nss))
-otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
-            $(resolvobjdir)/libresolv.a $(common-objpfx)libc.a
+ifeq (yesyes,$(have-fpie)$(build-shared))
+pt_chown-cflags += $(pie-ccflag)
 endif
-
 ifeq (yes,$(have-libcap))
 libcap = -lcap
 endif
+CFLAGS-pt_chown.c += $(pt_chown-cflags)
 LDLIBS-pt_chown = $(libcap)
+ifeq (yesyes,$(have-fpie)$(build-shared))
+LDFLAGS-pt_chown = -Wl,-z,now
+endif
 
 # pt_chown needs to be setuid root.
 $(inst_libexecdir)/pt_chown: $(objpfx)pt_chown $(+force)
        $(make-target-directory)
        -$(INSTALL_PROGRAM) -m 4755 -o root $< $@
 
-# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
-# This ensures they will load libc.so for needed symbols if loaded by
-# a statically-linked program that hasn't already loaded it.
-$(objpfx)libutil.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a
+$(objpfx)tst-pututxline-lockfail: $(shared-thread-library)
+$(objpfx)tst-pututxline-cache: $(shared-thread-library)