arrfab / rpms / glibc

Forked from rpms/glibc 4 years ago
Clone

Blame SOURCES/glibc-rh731833-rtkaio.patch

147e83
diff -pruN glibc-2.17-c758a686/rtkaio/Makefile glibc-2.17-c758a686/rtkaio/Makefile
147e83
--- glibc-2.17-c758a686/rtkaio/Makefile	2011-10-19 16:34:41.000000000 +0530
147e83
+++ glibc-2.17-c758a686/rtkaio/Makefile	2013-08-13 18:23:21.064888432 +0530
147e83
@@ -55,7 +55,7 @@ extra-libs-others := $(extra-libs)
147e83
 
147e83
 include $(..)Makeconfig
147e83
 
147e83
-ifeq (yesyes,$(build-shared)$(elf))
147e83
+ifeq (yes,$(build-shared))
147e83
 generated += librt.so$(librt.so-version)
147e83
 
147e83
 $(objpfx)librt.so$(librt.so-version): $(objpfx)librtkaio.so; $(make-link)
147e83
@@ -73,7 +73,7 @@ CPPFLAGS-librtkaio += -DIS_IN_librt=1 -I
147e83
 
147e83
 rpath-dirs := $(patsubst rt,rtkaio,$(rpath-dirs))
147e83
 
147e83
-ifeq (yesyes,$(build-shared)$(elf))
147e83
+ifeq (yes,$(build-shared))
147e83
 others: $(objpfx)librt.so$(librt.so-version)
147e83
 endif
147e83
 
147e83
@@ -81,8 +81,7 @@ endif
147e83
 # This ensures they will load libc.so for needed symbols if loaded by
147e83
 # a statically-linked program that hasn't already loaded it.
147e83
 $(objpfx)librtkaio.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a \
147e83
-		   $(shared-thread-library) \
147e83
-		   $(if $(filter yes,$(elf)), $(elfobjdir)/ld.so)
147e83
+		   $(shared-thread-library) $(elfobjdir)/ld.so
147e83
 
147e83
 ifeq (yes,$(build-shared))
147e83
 $(addprefix $(objpfx),$(tests)): $(objpfx)librtkaio.so $(shared-thread-library)