|
 |
ce426f |
In order to ensure ABI compatibility between staged builds it was
|
|
|
ce426f |
required that rtkaio/Makefile define both IN_MODULE=MODULE_librt
|
|
|
ce426f |
and IS_IN_librt in order to get both the right set of versioned
|
|
|
ce426f |
symbols and enable cancellation correctly. The changes to rtkaio/Makefile
|
|
|
ce426f |
are Red Hat internal changes.
|
|
|
ce426f |
|
|
|
ce426f |
commit 286663c34b006c1409df4a71f89d6d4d5d01df09
|
|
|
ce426f |
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
|
|
|
ce426f |
Date: Wed Nov 19 12:15:01 2014 +0530
|
|
|
ce426f |
|
|
|
ce426f |
Fix -Wundef warning in SHLIB_COMPAT
|
|
|
ce426f |
|
|
|
ce426f |
Replace the IS_IN_##lib with IS_IN(lib). Verified that the generated
|
|
|
ce426f |
code remains the same.
|
|
|
ce426f |
|
|
|
ce426f |
* include/shlib-compat.h (_SHLIB_COMPAT): Use IS_IN.
|
|
|
ce426f |
Index: glibc-2.17-c758a686/include/shlib-compat.h
|
|
|
ce426f |
===================================================================
|
|
|
ce426f |
--- glibc-2.17-c758a686.orig/include/shlib-compat.h
|
|
|
ce426f |
+++ glibc-2.17-c758a686/include/shlib-compat.h
|
|
|
ce426f |
@@ -45,7 +45,7 @@
|
|
|
ce426f |
# define SHLIB_COMPAT(lib, introduced, obsoleted) \
|
|
|
ce426f |
_SHLIB_COMPAT (lib, introduced, obsoleted)
|
|
|
ce426f |
# define _SHLIB_COMPAT(lib, introduced, obsoleted) \
|
|
|
ce426f |
- ((IS_IN_##lib - 0) \
|
|
|
ce426f |
+ (IS_IN (lib) \
|
|
|
ce426f |
&& (!(ABI_##lib##_##obsoleted - 0) \
|
|
|
ce426f |
|| ((ABI_##lib##_##introduced - 0) < (ABI_##lib##_##obsoleted - 0))))
|
|
|
ce426f |
|
|
|
ce426f |
Index: glibc-2.17-c758a686/rtkaio/Makefile
|
|
|
ce426f |
===================================================================
|
|
|
ce426f |
--- glibc-2.17-c758a686.orig/rtkaio/Makefile
|
|
|
ce426f |
+++ glibc-2.17-c758a686/rtkaio/Makefile
|
|
|
ce426f |
@@ -69,7 +69,8 @@ CFLAGS-kaio_librt-cancellation.c = -fasy
|
|
|
ce426f |
|
|
|
ce426f |
LDFLAGS-rtkaio.so = -Wl,-soname=lib$(libprefix)rt.so$(librt.so-version) \
|
|
|
ce426f |
-Wl,--enable-new-dtags,-z,nodelete
|
|
|
ce426f |
-CPPFLAGS-librtkaio += -DIS_IN_librt=1 -I$(..)rt
|
|
|
ce426f |
+CPPFLAGS-librtkaio += -UIN_MODULE -DIN_MODULE=MODULE_librt \
|
|
|
ce426f |
+ -UIS_IN_librt -DIS_IN_librt=1 -I$(..)rt
|
|
|
ce426f |
|
|
|
ce426f |
rpath-dirs := $(patsubst rt,rtkaio,$(rpath-dirs))
|
|
|
ce426f |
|