From 01bccbe11b8161358d4261293be3b54338c273d0 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Feb 12 2021 08:44:06 +0000 Subject: Apply patch glibc-rh1817513-27.patch patch_name: glibc-rh1817513-27.patch present_in_specfile: true location_in_specfile: 428 --- diff --git a/support/Makefile b/support/Makefile index 6afaa68..65b1629 100644 --- a/support/Makefile +++ b/support/Makefile @@ -178,6 +178,7 @@ CFLAGS-support_paths.c = \ -DINSTDIR_PATH=\"$(prefix)\" \ -DLIBDIR_PATH=\"$(libdir)\" \ -DBINDIR_PATH=\"$(bindir)\" \ + -DSBINDIR_PATH=\"$(sbindir)\" \ -DROOTSBINDIR_PATH=\"$(rootsbindir)\" ifeq (,$(CXX)) diff --git a/support/support.h b/support/support.h index 97d142e..121cc9e 100644 --- a/support/support.h +++ b/support/support.h @@ -109,6 +109,8 @@ 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_sbindir_prefix[]; +/* Corresponds to the install's sbin/ directory (without prefix). */ extern const char support_install_rootsbindir[]; extern ssize_t support_copy_file_range (int, off64_t *, int, off64_t *, diff --git a/support/support_paths.c b/support/support_paths.c index a37a072..eb23902 100644 --- a/support/support_paths.c +++ b/support/support_paths.c @@ -65,6 +65,13 @@ const char support_bindir_prefix[] = BINDIR_PATH; # error please -DBINDIR_PATH=something in the Makefile #endif +#ifdef SBINDIR_PATH +/* Corresponds to the install's bin/ directory. */ +const char support_sbindir_prefix[] = SBINDIR_PATH; +#else +# error please -DSBINDIR_PATH=something in the Makefile +#endif + #ifdef ROOTSBINDIR_PATH /* Corresponds to the install's sbin/ directory. */ const char support_install_rootsbindir[] = ROOTSBINDIR_PATH;