From 0c5c597697cac9abcce78ba796a8073489df7c09 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 08 2020 11:32:32 +0000 Subject: Apply patch glibc-rh1747502-8.patch patch_name: glibc-rh1747502-8.patch present_in_specfile: true location_in_specfile: 213 --- diff --git a/support/Makefile b/support/Makefile index d80b29a..8ee0a66 100644 --- a/support/Makefile +++ b/support/Makefile @@ -172,7 +172,8 @@ CFLAGS-support_paths.c = \ -DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \ -DINSTDIR_PATH=\"$(prefix)\" \ -DLIBDIR_PATH=\"$(libdir)\" \ - -DBINDIR_PATH=\"$(bindir)\" + -DBINDIR_PATH=\"$(bindir)\" \ + -DROOTSBINDIR_PATH=\"$(rootsbindir)\" ifeq (,$(CXX)) LINKS_DSO_PROGRAM = links-dso-program-c diff --git a/support/support.h b/support/support.h index 5638d81..14b50db 100644 --- a/support/support.h +++ b/support/support.h @@ -106,6 +106,8 @@ extern const char support_install_prefix[]; extern const char support_libdir_prefix[]; /* Corresponds to the install's bin/ directory. */ 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 *, size_t, unsigned int); diff --git a/support/support_paths.c b/support/support_paths.c index 38577be..a37a072 100644 --- a/support/support_paths.c +++ b/support/support_paths.c @@ -64,3 +64,10 @@ const char support_bindir_prefix[] = BINDIR_PATH; #else # error please -DBINDIR_PATH=something in the Makefile #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