Update.
2003-09-24 Jakub Jelinek <jakub@redhat.com> * nscd/Makefile (others): Add nscd before including ../Rules.
This commit is contained in:
Ulrich Drepper
parent
c9c60884af
commit
0f124303c8
|
|
@ -1,3 +1,7 @@
|
|||
2003-09-24 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* nscd/Makefile (others): Add nscd before including ../Rules.
|
||||
|
||||
2003-09-24 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* nscd/Makefile: Add rules to build nscd as a PIE.
|
||||
|
|
|
|||
|
|
@ -312,7 +312,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi subdirs force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF CCVERSION SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO OLD_DEBIAN_INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_initfinit_array libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_Bgroup ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_have_initfini libc_cv_cpp_asm_debuginfo no_whole_archive exceptions LIBGD EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script gnu_ld gnu_as elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi subdirs force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF CCVERSION SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO OLD_DEBIAN_INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_initfinit_array libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_Bgroup ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_have_initfini libc_cv_cpp_asm_debuginfo no_whole_archive exceptions LIBGD EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script gnu_ld gnu_as elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -5455,6 +5455,33 @@ fi
|
|||
echo "$as_me:$LINENO: result: $libc_cv_z_execstack" >&5
|
||||
echo "${ECHO_T}$libc_cv_z_execstack" >&6
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for -fpie" >&5
|
||||
echo $ECHO_N "checking for -fpie... $ECHO_C" >&6
|
||||
if test "${libc_cv_fpie+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat > conftest.c <<EOF
|
||||
int foo;
|
||||
EOF
|
||||
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fpie
|
||||
-o conftest conftest.c 1>&5'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }
|
||||
then
|
||||
libc_cv_fpie=yes
|
||||
else
|
||||
libc_cv_fpie=no
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $libc_cv_fpie" >&5
|
||||
echo "${ECHO_T}$libc_cv_fpie" >&6
|
||||
|
||||
|
||||
fi
|
||||
|
||||
if test $elf != yes; then
|
||||
|
|
@ -7842,6 +7869,7 @@ s,@libc_cv_Bgroup@,$libc_cv_Bgroup,;t t
|
|||
s,@ASFLAGS_config@,$ASFLAGS_config,;t t
|
||||
s,@libc_cv_z_combreloc@,$libc_cv_z_combreloc,;t t
|
||||
s,@libc_cv_z_execstack@,$libc_cv_z_execstack,;t t
|
||||
s,@libc_cv_fpie@,$libc_cv_fpie,;t t
|
||||
s,@libc_cv_have_initfini@,$libc_cv_have_initfini,;t t
|
||||
s,@libc_cv_cpp_asm_debuginfo@,$libc_cv_cpp_asm_debuginfo,;t t
|
||||
s,@no_whole_archive@,$no_whole_archive,;t t
|
||||
|
|
|
|||
|
|
@ -35,6 +35,9 @@ nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
|
|||
ifeq ($(have-thread-library),yes)
|
||||
|
||||
others := nscd_nischeck
|
||||
ifneq (yesyes,$(have-fpie)$(build-shared))
|
||||
others += nscd
|
||||
endif
|
||||
install-sbin := nscd nscd_nischeck
|
||||
|
||||
extra-objs := $(nscd-modules:=.o) nscd_nischeck.o
|
||||
|
|
@ -84,8 +87,6 @@ $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o))
|
|||
$(LDFLAGS) $(LDFLAGS-$(@F)) \
|
||||
-L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) \
|
||||
-o $@ $^ $(common-objpfx)libc_nonshared.a
|
||||
else
|
||||
others += nscd
|
||||
endif
|
||||
|
||||
# This makes sure -DNOT_IN_libc is passed for all these modules.
|
||||
|
|
|
|||
Loading…
Reference in New Issue