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

Siddhesh Poyarekar siddhesh at fedoraproject.org
Thu Jul 3 17:14:21 UTC 2014


commit 8c5b9331ed7a7d3774c3ace11e5d6402f42f9461
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Thu Jul 3 22:34:28 2014 +0530

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

 glibc-rtkaio-testcase.patch |   15 +++++++++++++++
 glibc.spec                  |    2 ++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/glibc-rtkaio-testcase.patch b/glibc-rtkaio-testcase.patch
new file mode 100644
index 0000000..b81f853
--- /dev/null
+++ b/glibc-rtkaio-testcase.patch
@@ -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
diff --git a/glibc.spec b/glibc.spec
index 762e292..cd05c46 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -221,6 +221,7 @@ Patch2031: %{name}-rh1070416.patch
 
 Patch2033: %{name}-aarch64-tls-fixes.patch
 Patch2034: %{name}-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch
+Patch2035: %{name}-rtkaio-testcase.patch
 
 ##############################################################################
 # End of glibc patches.
@@ -552,6 +553,7 @@ package or when debugging this package.
 %patch0047 -p1
 %patch2033 -p1
 %patch2034 -p1
+%patch2035 -p1
 
 ##############################################################################
 # %%prep - Additional prep required...


More information about the scm-commits mailing list