diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/uclibc-support.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/uclibc-support.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/uclibc-support.patch b/meta/recipes-devtools/rpm/rpm/uclibc-support.patch new file mode 100644 index 0000000000..64746ce224 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/uclibc-support.patch | |||
@@ -0,0 +1,63 @@ | |||
1 | Define the x* wrappers for uclibc as well | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
6 | |||
7 | Index: rpm-5.4.9/rpmio/rpmio.h | ||
8 | =================================================================== | ||
9 | --- rpm-5.4.9.orig/rpmio/rpmio.h 2010-09-29 07:54:30.000000000 -0700 | ||
10 | +++ rpm-5.4.9/rpmio/rpmio.h 2012-06-12 07:29:19.610745014 -0700 | ||
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; | ||
21 | Index: rpm-5.4.9/system.h | ||
22 | =================================================================== | ||
23 | --- rpm-5.4.9.orig/system.h 2012-04-26 10:46:49.000000000 -0700 | ||
24 | +++ rpm-5.4.9/system.h 2012-06-12 07:30:08.242747422 -0700 | ||
25 | @@ -410,7 +410,7 @@ | ||
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)) | ||
34 | Index: rpm-5.4.9/lib/librpm.vers | ||
35 | =================================================================== | ||
36 | --- rpm-5.4.9.orig/lib/librpm.vers 2011-04-10 15:55:23.000000000 -0700 | ||
37 | +++ rpm-5.4.9/lib/librpm.vers 2012-06-12 07:29:19.610745014 -0700 | ||
38 | @@ -405,6 +405,10 @@ | ||
39 | specedit; | ||
40 | strict_erasures; | ||
41 | XrpmtsiInit; | ||
42 | + xmalloc; | ||
43 | + xrealloc; | ||
44 | + xcalloc; | ||
45 | + xstrdup; | ||
46 | local: | ||
47 | *; | ||
48 | }; | ||
49 | Index: rpm-5.4.9/rpmio/librpmio.vers | ||
50 | =================================================================== | ||
51 | --- rpm-5.4.9.orig/rpmio/librpmio.vers 2012-05-07 07:38:23.000000000 -0700 | ||
52 | +++ rpm-5.4.9/rpmio/librpmio.vers 2012-06-12 07:29:19.626745024 -0700 | ||
53 | @@ -994,6 +994,10 @@ | ||
54 | mongo_simple_int_command; | ||
55 | mongo_simple_str_command; | ||
56 | mongo_update; | ||
57 | + xmalloc; | ||
58 | + xrealloc; | ||
59 | + xcalloc; | ||
60 | + xstrdup; | ||
61 | local: | ||
62 | *; | ||
63 | }; | ||