64 lines
1.9 KiB
Diff
Executable File
64 lines
1.9 KiB
Diff
Executable File
Define the x* wrappers for uclibc as well
|
|
|
|
Upstream-Status: Submitted [RPM5 maintainer]
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
|
Index: rpm/rpmio/rpmio.h
|
|
===================================================================
|
|
--- rpm.orig/rpmio/rpmio.h
|
|
+++ rpm/rpmio/rpmio.h
|
|
@@ -23,7 +23,8 @@
|
|
*/
|
|
/*@{*/
|
|
#if !defined(__LCLINT__) && !defined(__UCLIBC__) && defined(__GLIBC__) && \
|
|
- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
|
|
+ (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) && \
|
|
+ !defined(__UCLIBC__)
|
|
#define USE_COOKIE_SEEK_POINTER 1
|
|
typedef _IO_off64_t _libio_off_t;
|
|
typedef _libio_off_t * _libio_pos_t;
|
|
Index: rpm/system.h
|
|
===================================================================
|
|
--- rpm.orig/system.h
|
|
+++ rpm/system.h
|
|
@@ -489,7 +489,7 @@ extern void muntrace (void)
|
|
#endif /* defined(__LCLINT__) */
|
|
|
|
/* Memory allocation via macro defs to get meaningful locations from mtrace() */
|
|
-#if defined(__GNUC__)
|
|
+#if defined(__GNUC__) || defined(__UCLIBC__)
|
|
#define xmalloc(_size) (malloc(_size) ? : vmefail(_size))
|
|
#define xcalloc(_nmemb, _size) (calloc((_nmemb), (_size)) ? : vmefail(_size))
|
|
#define xrealloc(_ptr, _size) (realloc((_ptr), (_size)) ? : vmefail(_size))
|
|
Index: rpm/lib/librpm.vers
|
|
===================================================================
|
|
--- rpm.orig/lib/librpm.vers
|
|
+++ rpm/lib/librpm.vers
|
|
@@ -406,6 +406,10 @@ LIBRPM_0
|
|
specedit;
|
|
strict_erasures;
|
|
XrpmtsiInit;
|
|
+ xmalloc;
|
|
+ xrealloc;
|
|
+ xcalloc;
|
|
+ xstrdup;
|
|
local:
|
|
*;
|
|
};
|
|
Index: rpm/rpmio/librpmio.vers
|
|
===================================================================
|
|
--- rpm.orig/rpmio/librpmio.vers
|
|
+++ rpm/rpmio/librpmio.vers
|
|
@@ -1455,6 +1455,10 @@ LIBRPMIO_0
|
|
_mongoc_write_result_init;
|
|
_mongoc_write_result_merge;
|
|
_mongoc_write_result_merge_legacy;
|
|
+ xmalloc;
|
|
+ xrealloc;
|
|
+ xcalloc;
|
|
+ xstrdup;
|
|
local:
|
|
*;
|
|
};
|