diff options
| author | Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> | 2014-03-06 08:19:38 +0100 |
|---|---|---|
| committer | Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> | 2014-03-06 08:19:38 +0100 |
| commit | 4db272e0366f840ae2b9c025fb0d71e561c83b21 (patch) | |
| tree | c3b10481c2d49e53d8c7bdb584168425d9ae1d43 /testing/rpm/rpm-uclibc.patch | |
| parent | 0f704098ff424523387786abc707db2e7b236cba (diff) | |
| download | aports-4db272e0366f840ae2b9c025fb0d71e561c83b21.tar.bz2 aports-4db272e0366f840ae2b9c025fb0d71e561c83b21.tar.xz | |
testing/rpm: fix musl build
Diffstat (limited to 'testing/rpm/rpm-uclibc.patch')
| -rw-r--r-- | testing/rpm/rpm-uclibc.patch | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/testing/rpm/rpm-uclibc.patch b/testing/rpm/rpm-uclibc.patch index 0d07345c60..03cfbacf19 100644 --- a/testing/rpm/rpm-uclibc.patch +++ b/testing/rpm/rpm-uclibc.patch @@ -1,6 +1,7 @@ ---- rpm-4.10.2.orig/misc/fts.c -+++ rpm-4.10.2/misc/fts.c -@@ -42,6 +42,11 @@ +diff -rupN a/misc/fts.c b/misc/fts.c +--- a/misc/fts.c 2012-11-07 13:55:24.000000000 +0100 ++++ b/misc/fts.c 2014-03-06 08:15:37.983514119 +0100 +@@ -42,6 +42,11 @@ static char sccsid[] = "@(#)fts.c 8.6 (B #include <string.h> #include <unistd.h> #else @@ -12,7 +13,7 @@ #if defined(hpux) # define _INCLUDE_POSIX_SOURCE # define __errno_location() (&errno) -@@ -61,11 +66,10 @@ +@@ -61,11 +66,10 @@ static char sccsid[] = "@(#)fts.c 8.6 (B # define _STAT_VER 0 # define __fxstat64(_stat_ver, _fd, _sbp) fstat64((_fd), (_sbp)) #endif @@ -21,10 +22,24 @@ -#include <string.h> -#include <errno.h> -#include "misc/fts.h" -+#if defined(__UCLIBC__) ++#ifndef __GLIBC__ +# define _STAT_VER 0 +# define __fxstat64(_stat_ver, _fd, _sbp) fstat64((_fd), (_sbp)) +#endif # define __set_errno(val) (*__errno_location ()) = (val) # define __open open # define __close close +diff -rupN a/misc/fts.h b/misc/fts.h +--- a/misc/fts.h 2012-11-07 13:55:24.000000000 +0100 ++++ b/misc/fts.h 2014-03-06 08:17:10.426850180 +0100 +@@ -61,6 +61,10 @@ + # define _D_EXACT_NAMLEN(d) (strlen((d)->d_name)) + #endif + ++#if !defined(_D_EXACT_NAMLEN) ++# define _D_EXACT_NAMLEN(d) (strlen((d)->d_name)) ++#endif ++ + #endif + + #include <sys/types.h> |