From 6d8908d48f635d97c5a16578b644240d0dea9059 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Feb 24 2021 16:02:53 +0000 Subject: Apply patch glibc-rh1747502-6.patch patch_name: glibc-rh1747502-6.patch present_in_specfile: true location_in_specfile: 211 --- diff --git a/support/Makefile b/support/Makefile index e955dc5..d80b29a 100644 --- a/support/Makefile +++ b/support/Makefile @@ -171,7 +171,8 @@ CFLAGS-support_paths.c = \ -DOBJDIR_PATH=\"`cd $(objpfx)/..; pwd`\" \ -DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \ -DINSTDIR_PATH=\"$(prefix)\" \ - -DLIBDIR_PATH=\"$(libdir)\" + -DLIBDIR_PATH=\"$(libdir)\" \ + -DBINDIR_PATH=\"$(bindir)\" ifeq (,$(CXX)) LINKS_DSO_PROGRAM = links-dso-program-c diff --git a/support/support.h b/support/support.h index c3ad769..5638d81 100644 --- a/support/support.h +++ b/support/support.h @@ -104,6 +104,8 @@ extern const char support_objdir_elf_ldso[]; extern const char support_install_prefix[]; /* Corresponds to the install's lib/ or lib64/ directory. */ extern const char support_libdir_prefix[]; +/* Corresponds to the install's bin/ directory. */ +extern const char support_bindir_prefix[]; 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 6d0beb1..38577be 100644 --- a/support/support_paths.c +++ b/support/support_paths.c @@ -57,3 +57,10 @@ const char support_libdir_prefix[] = LIBDIR_PATH; #else # error please -DLIBDIR_PATH=something in the Makefile #endif + +#ifdef BINDIR_PATH +/* Corresponds to the install's bin/ directory. */ +const char support_bindir_prefix[] = BINDIR_PATH; +#else +# error please -DBINDIR_PATH=something in the Makefile +#endif