Link tst-timer to librt.so only if it is in the rt subdir

This commit is contained in:
Siddhesh Poyarekar 2014-07-03 22:34:28 +05:30
parent c1d88db4f5
commit 8c5b9331ed
2 changed files with 17 additions and 0 deletions

View File

@ -0,0 +1,15 @@
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index 1080dc9..af1a44d 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -16,8 +16,10 @@
# License along with the GNU C Library; if not, see
# <http://www.gnu.org/licenses/>.
+ifeq ($(subdir),rt)
ifeq (yes,$(build-shared))
$(objpfx)tst-timer: $(objpfx)librt.so $(shared-thread-library)
else
$(objpfx)tst-timer: $(objpfx)librt.a $(static-thread-library)
endif
+endif

View File

@ -221,6 +221,7 @@ Patch2031: %{name}-rh1070416.patch
Patch2033: %{name}-aarch64-tls-fixes.patch Patch2033: %{name}-aarch64-tls-fixes.patch
Patch2034: %{name}-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch Patch2034: %{name}-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch
Patch2035: %{name}-rtkaio-testcase.patch
############################################################################## ##############################################################################
# End of glibc patches. # End of glibc patches.
@ -552,6 +553,7 @@ package or when debugging this package.
%patch0047 -p1 %patch0047 -p1
%patch2033 -p1 %patch2033 -p1
%patch2034 -p1 %patch2034 -p1
%patch2035 -p1
############################################################################## ##############################################################################
# %%prep - Additional prep required... # %%prep - Additional prep required...