diff options
| author | jperkin <jperkin> | 2014-07-28 15:11:00 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2014-07-28 15:11:00 +0000 |
| commit | 0b8765623bb598dac5f37c34a5f579a2d2e7d569 (patch) | |
| tree | 226f35b7a4f187c2942d73ce16e45310d723d106 /misc | |
| parent | 1386edb11a4e26a6a1f94c319414f9791b0b0fad (diff) | |
| download | pkgsrc-0b8765623bb598dac5f37c34a5f579a2d2e7d569.tar.gz | |
Fix conflict between RPM's system.h and SunOS libelf.h.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/rpm/distinfo | 3 | ||||
| -rw-r--r-- | misc/rpm/patches/patch-rpmio_rpmfileutil.c | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/misc/rpm/distinfo b/misc/rpm/distinfo index 429cb8cea08..83663074513 100644 --- a/misc/rpm/distinfo +++ b/misc/rpm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2013/09/20 17:26:14 ryoon Exp $ +$NetBSD: distinfo,v 1.13 2014/07/28 15:11:00 jperkin Exp $ SHA1 (rpm-4.11.1.tar.bz2) = 31ddc4185137ce3f718c99e91dcb040614fe820c RMD160 (rpm-4.11.1.tar.bz2) = 3acb73dffef60c5e98ad23d2551ebca0837c218c @@ -13,4 +13,5 @@ SHA1 (patch-lib_rpmrc.c) = cf9e1349d84dea4f60b7db574e31e14799d4e75c SHA1 (patch-misc_fnmatch.c) = ba5db96bb0f473d08a8fda5f32d7df455ce92208 SHA1 (patch-misc_fts.c) = c0555292deb60c1bd661f082ca7318d6623541bc SHA1 (patch-misc_fts.h) = ec4ee0ea18f5d210eb32d9f22c90e43d2ede0c53 +SHA1 (patch-rpmio_rpmfileutil.c) = fd1debee2c38e866b8098223bab304a66b76eb23 SHA1 (patch-system.h) = 215e3cfaafc1573c527b7f430b3807093550c39e diff --git a/misc/rpm/patches/patch-rpmio_rpmfileutil.c b/misc/rpm/patches/patch-rpmio_rpmfileutil.c new file mode 100644 index 00000000000..f04e220ac25 --- /dev/null +++ b/misc/rpm/patches/patch-rpmio_rpmfileutil.c @@ -0,0 +1,19 @@ +$NetBSD: patch-rpmio_rpmfileutil.c,v 1.1 2014/07/28 15:11:00 jperkin Exp $ + +SunOS libelf.h defines its own "_" macro which overrides the NLS one that +was already set by system.h, so reload system.h to get it back. + +--- rpmio/rpmfileutil.c.orig 2013-06-10 15:55:10.000000000 +0000 ++++ rpmio/rpmfileutil.c +@@ -13,6 +13,11 @@ + + #endif + ++#ifdef __sun ++#undef H_SYSTEM ++#include "system.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/wait.h> |