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 | |
| parent | 0f704098ff424523387786abc707db2e7b236cba (diff) | |
| download | aports-4db272e0366f840ae2b9c025fb0d71e561c83b21.tar.bz2 aports-4db272e0366f840ae2b9c025fb0d71e561c83b21.tar.xz | |
testing/rpm: fix musl build
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/rpm/APKBUILD | 10 | ||||
| -rw-r--r-- | testing/rpm/rpm-uclibc.patch | 25 |
2 files changed, 25 insertions, 10 deletions
diff --git a/testing/rpm/APKBUILD b/testing/rpm/APKBUILD index bf9ddd4e8..51fbae74b 100644 --- a/testing/rpm/APKBUILD +++ b/testing/rpm/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=rpm pkgver=4.11.0.1 -pkgrel=0 +pkgrel=1 pkgdesc="The RPM package manager" url="http://www.rpm.org/" arch="all" license="GPL2 LGPL2+" depends="" -depends_dev="nspr-dev nss-dev db-dev lua-dev zlib-dev bzip2-dev xz-dev +depends_dev="nspr-dev nss-dev db-dev lua-dev zlib-dev bzip2-dev xz-dev libelf-dev file-dev popt-dev libcap-dev acl-dev" makedepends="$depends_dev graphviz gettext-dev python-dev" install="" @@ -59,8 +59,8 @@ py_rpm() { } md5sums="b35f5359e0d4494d7b11e8d0c1512a0d rpm-4.11.0.1.tar.bz2 -5b52ad780c3ec753d1124d6d53697612 rpm-uclibc.patch" +e20eb0419329aa42eabe4595ce7f4756 rpm-uclibc.patch" sha256sums="98496c0c73095d7c66a8b6f1d8ab00998e1daf4e46a017ae74190c65132ffb21 rpm-4.11.0.1.tar.bz2 -0b43737b018a089351db920f1a72a8984a8dbc11f3a0df4e9722e14bdcd8bec3 rpm-uclibc.patch" +beefbc9a4b94f78e667c1d1932d2c726028583a374ec984db7aa4eb448143c2c rpm-uclibc.patch" sha512sums="72bd3054b2d0def1e25fba7113eda14def38baef62b558e65cafaf3b374823d0905d982772cffddfd9dc6698eff293251acb2ace7dfda0964085669caa88d535 rpm-4.11.0.1.tar.bz2 -0c4a03c1ea6cc3fef2ce25797ad5fbe7b22576fa6ff8d8f3424496e90e13d774e05785cbddf24ed07a7bdc3a25ac4d614537ec5ed1b14f2039c93a1a9077a9ff rpm-uclibc.patch" +601e6094f0fbf33c7435637d56814c829edbe9ce255052084cd40fc8bb6c05dd06faf72a880090c6930c71f3885b3d35f621f45898dd8492d9df3dc2b35dd0a6 rpm-uclibc.patch" diff --git a/testing/rpm/rpm-uclibc.patch b/testing/rpm/rpm-uclibc.patch index 0d07345c6..03cfbacf1 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> |