summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/uclibc-support.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/uclibc-support.patch')
-rw-r--r--meta/recipes-devtools/rpm/rpm/uclibc-support.patch63
1 files changed, 0 insertions, 63 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/uclibc-support.patch b/meta/recipes-devtools/rpm/rpm/uclibc-support.patch
deleted file mode 100644
index dc7b0488a5..0000000000
--- a/meta/recipes-devtools/rpm/rpm/uclibc-support.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1Define the x* wrappers for uclibc as well
2
3Upstream-Status: Submitted [RPM5 maintainer]
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Index: rpm/rpmio/rpmio.h
8===================================================================
9--- rpm.orig/rpmio/rpmio.h
10+++ rpm/rpmio/rpmio.h
11@@ -23,7 +23,8 @@
12 */
13 /*@{*/
14 #if !defined(__LCLINT__) && !defined(__UCLIBC__) && defined(__GLIBC__) && \
15- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
16+ (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) && \
17+ !defined(__UCLIBC__)
18 #define USE_COOKIE_SEEK_POINTER 1
19 typedef _IO_off64_t _libio_off_t;
20 typedef _libio_off_t * _libio_pos_t;
21Index: rpm/system.h
22===================================================================
23--- rpm.orig/system.h
24+++ rpm/system.h
25@@ -489,7 +489,7 @@ extern void muntrace (void)
26 #endif /* defined(__LCLINT__) */
27
28 /* Memory allocation via macro defs to get meaningful locations from mtrace() */
29-#if defined(__GNUC__)
30+#if defined(__GNUC__) || defined(__UCLIBC__)
31 #define xmalloc(_size) (malloc(_size) ? : vmefail(_size))
32 #define xcalloc(_nmemb, _size) (calloc((_nmemb), (_size)) ? : vmefail(_size))
33 #define xrealloc(_ptr, _size) (realloc((_ptr), (_size)) ? : vmefail(_size))
34Index: rpm/lib/librpm.vers
35===================================================================
36--- rpm.orig/lib/librpm.vers
37+++ rpm/lib/librpm.vers
38@@ -406,6 +406,10 @@ LIBRPM_0
39 specedit;
40 strict_erasures;
41 XrpmtsiInit;
42+ xmalloc;
43+ xrealloc;
44+ xcalloc;
45+ xstrdup;
46 local:
47 *;
48 };
49Index: rpm/rpmio/librpmio.vers
50===================================================================
51--- rpm.orig/rpmio/librpmio.vers
52+++ rpm/rpmio/librpmio.vers
53@@ -1455,6 +1455,10 @@ LIBRPMIO_0
54 _mongoc_write_result_init;
55 _mongoc_write_result_merge;
56 _mongoc_write_result_merge_legacy;
57+ xmalloc;
58+ xrealloc;
59+ xcalloc;
60+ xstrdup;
61 local:
62 *;
63 };