Remove non-ELF support in rtkaio
This commit is contained in:
parent
f40b2eb05b
commit
615c1c4694
|
@ -0,0 +1,31 @@
|
|||
diff -pruN glibc-2.17-c758a686/rtkaio/Makefile glibc-2.17-c758a686.new/rtkaio/Makefile
|
||||
--- glibc-2.17-c758a686/rtkaio/Makefile 2011-10-19 16:34:41.000000000 +0530
|
||||
+++ glibc-2.17-c758a686.new/rtkaio/Makefile 2013-08-13 18:23:21.064888432 +0530
|
||||
@@ -55,7 +55,7 @@ extra-libs-others := $(extra-libs)
|
||||
|
||||
include $(..)Makeconfig
|
||||
|
||||
-ifeq (yesyes,$(build-shared)$(elf))
|
||||
+ifeq (yes,$(build-shared))
|
||||
generated += librt.so$(librt.so-version)
|
||||
|
||||
$(objpfx)librt.so$(librt.so-version): $(objpfx)librtkaio.so; $(make-link)
|
||||
@@ -73,7 +73,7 @@ CPPFLAGS-librtkaio += -DIS_IN_librt=1 -I
|
||||
|
||||
rpath-dirs := $(patsubst rt,rtkaio,$(rpath-dirs))
|
||||
|
||||
-ifeq (yesyes,$(build-shared)$(elf))
|
||||
+ifeq (yes,$(build-shared))
|
||||
others: $(objpfx)librt.so$(librt.so-version)
|
||||
endif
|
||||
|
||||
@@ -81,8 +81,7 @@ endif
|
||||
# This ensures they will load libc.so for needed symbols if loaded by
|
||||
# a statically-linked program that hasn't already loaded it.
|
||||
$(objpfx)librtkaio.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a \
|
||||
- $(shared-thread-library) \
|
||||
- $(if $(filter yes,$(elf)), $(elfobjdir)/ld.so)
|
||||
+ $(shared-thread-library) $(elfobjdir)/ld.so
|
||||
|
||||
ifeq (yes,$(build-shared))
|
||||
$(addprefix $(objpfx),$(tests)): $(objpfx)librtkaio.so $(shared-thread-library)
|
|
@ -175,6 +175,9 @@ Patch0037: %{name}-rh952799.patch
|
|||
Patch0038: %{name}-rtkaio.patch
|
||||
Patch0039: %{name}-c_stubs.patch
|
||||
|
||||
# Remove non-ELF support in rtkaio
|
||||
Patch0040: %{name}-rh731833-rtkaio.patch
|
||||
|
||||
#
|
||||
# Patches from upstream
|
||||
#
|
||||
|
@ -526,6 +529,7 @@ package or when debugging this package.
|
|||
%patch0037 -p1
|
||||
%patch2028 -p1
|
||||
%patch1001 -p1
|
||||
%patch0040 -p1
|
||||
|
||||
##############################################################################
|
||||
# %%prep - Additional prep required...
|
||||
|
@ -1611,6 +1615,9 @@ rm -f *.filelist*
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Aug 20 2013 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.18-3
|
||||
- Remove non-ELF support in rtkaio.
|
||||
|
||||
* Mon Aug 19 2013 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.18-2
|
||||
- Fix buffer overflow in readdir_r (#995841, CVE-2013-4237).
|
||||
- Remove releng tarball.
|
||||
|
|
Loading…
Reference in New Issue