lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-05 19:35:52 +03:00
Code Activity

support: Add support_install_rootsbindir

Browse Source 
Reviewed by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
Alexandra Hájková
2019-05-13 19:31:53 +02:00
committed by Alexandra Hajkova
parent 7ac6fad987
commit d50f09181e
4 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2019-05-15 Alexandra Hajkova <ahajkova@redhat.com>
* support/support.h (support_install_rootsbindir): New variable.
* support/support_paths.c: Likewise.
* support/Makefile (CFLAGS-support_paths.c): Add -DROOTSBINDIR_PATH.
2019-05-15 Florian Weimer <fweimer@redhat.com> 2019-05-15 Florian Weimer <fweimer@redhat.com>
* iconv/gconv.h (__gconv_transliterate): Move declaration … * iconv/gconv.h (__gconv_transliterate): Move declaration …

3
support/Makefile
View File

@@ -180,7 +180,8 @@ CFLAGS-support_paths.c = \
-DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \ -DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \
-DINSTDIR_PATH=\"$(prefix)\" \ -DINSTDIR_PATH=\"$(prefix)\" \
-DLIBDIR_PATH=\"$(libdir)\" \ -DLIBDIR_PATH=\"$(libdir)\" \
-DBINDIR_PATH=\"$(bindir)\" -DBINDIR_PATH=\"$(bindir)\" \
-DROOTSBINDIR_PATH=\"$(rootsbindir)\"
ifeq (,$(CXX)) ifeq (,$(CXX))
LINKS_DSO_PROGRAM = links-dso-program-c LINKS_DSO_PROGRAM = links-dso-program-c

2
support/support.h
View File

@@ -107,6 +107,8 @@ extern const char support_install_prefix[];
extern const char support_libdir_prefix[]; extern const char support_libdir_prefix[];
/* Corresponds to the install's bin/ directory. */ /* Corresponds to the install's bin/ directory. */
extern const char support_bindir_prefix[]; extern const char support_bindir_prefix[];
/* Corresponds to the install's sbin/ directory. */
extern const char support_install_rootsbindir[];
extern ssize_t support_copy_file_range (int, off64_t *, int, off64_t *, extern ssize_t support_copy_file_range (int, off64_t *, int, off64_t *,
size_t, unsigned int); size_t, unsigned int);

7
support/support_paths.c
View File

@@ -64,3 +64,10 @@ const char support_bindir_prefix[] = BINDIR_PATH;
#else #else
# error please -DBINDIR_PATH=something in the Makefile # error please -DBINDIR_PATH=something in the Makefile
#endif #endif
#ifdef ROOTSBINDIR_PATH
/* Corresponds to the install's sbin/ directory. */
const char support_install_rootsbindir[] = ROOTSBINDIR_PATH;
#else
# error please -DROOTSBINDIR_PATH=something in the Makefile
#endif