Mon Jul 28 15:11:00 2014 UTC ()
Fix conflict between RPM's system.h and SunOS libelf.h.


(jperkin)
diff -r1.12 -r1.13 pkgsrc/misc/rpm/distinfo
diff -r0 -r1.1 pkgsrc/misc/rpm/patches/patch-rpmio_rpmfileutil.c
cvs diff -r1.12 -r1.13 pkgsrc/misc/rpm/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/rpm/distinfo 2013/09/20 17:26:14 1.12
+++ pkgsrc/misc/rpm/distinfo 2014/07/28 15:11:00 1.13
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: distinfo,v 1.12 2013/09/20 17:26:14 ryoon Exp $ 1$NetBSD: distinfo,v 1.13 2014/07/28 15:11:00 jperkin Exp $
2 2
3SHA1 (rpm-4.11.1.tar.bz2) = 31ddc4185137ce3f718c99e91dcb040614fe820c 3SHA1 (rpm-4.11.1.tar.bz2) = 31ddc4185137ce3f718c99e91dcb040614fe820c
4RMD160 (rpm-4.11.1.tar.bz2) = 3acb73dffef60c5e98ad23d2551ebca0837c218c 4RMD160 (rpm-4.11.1.tar.bz2) = 3acb73dffef60c5e98ad23d2551ebca0837c218c
5Size (rpm-4.11.1.tar.bz2) = 3778922 bytes 5Size (rpm-4.11.1.tar.bz2) = 3778922 bytes
6SHA1 (patch-build_rpmfc.c) = dab644d99d7ed43850443433b242d6ec16630b9c 6SHA1 (patch-build_rpmfc.c) = dab644d99d7ed43850443433b242d6ec16630b9c
7SHA1 (patch-cb) = c52dfaec6cf89d069f26900265d34f7ad91092f0 7SHA1 (patch-cb) = c52dfaec6cf89d069f26900265d34f7ad91092f0
8SHA1 (patch-configure.ac) = 6d57fc79820c8d9e604cad0eb1fd682eb0268cdb 8SHA1 (patch-configure.ac) = 6d57fc79820c8d9e604cad0eb1fd682eb0268cdb
9SHA1 (patch-lib_backend_db3.c) = f488c10c75a000a14f3026a2de6f871892ba9222 9SHA1 (patch-lib_backend_db3.c) = f488c10c75a000a14f3026a2de6f871892ba9222
10SHA1 (patch-lib_header.c) = f4e1455704f5819613366b3864973c2a91926175 10SHA1 (patch-lib_header.c) = f4e1455704f5819613366b3864973c2a91926175
11SHA1 (patch-lib_rpmdb__internal.h) = 39947c14f9d65c5dc91e5f5979e76800904377d4 11SHA1 (patch-lib_rpmdb__internal.h) = 39947c14f9d65c5dc91e5f5979e76800904377d4
12SHA1 (patch-lib_rpmrc.c) = cf9e1349d84dea4f60b7db574e31e14799d4e75c 12SHA1 (patch-lib_rpmrc.c) = cf9e1349d84dea4f60b7db574e31e14799d4e75c
13SHA1 (patch-misc_fnmatch.c) = ba5db96bb0f473d08a8fda5f32d7df455ce92208 13SHA1 (patch-misc_fnmatch.c) = ba5db96bb0f473d08a8fda5f32d7df455ce92208
14SHA1 (patch-misc_fts.c) = c0555292deb60c1bd661f082ca7318d6623541bc 14SHA1 (patch-misc_fts.c) = c0555292deb60c1bd661f082ca7318d6623541bc
15SHA1 (patch-misc_fts.h) = ec4ee0ea18f5d210eb32d9f22c90e43d2ede0c53 15SHA1 (patch-misc_fts.h) = ec4ee0ea18f5d210eb32d9f22c90e43d2ede0c53
 16SHA1 (patch-rpmio_rpmfileutil.c) = fd1debee2c38e866b8098223bab304a66b76eb23
16SHA1 (patch-system.h) = 215e3cfaafc1573c527b7f430b3807093550c39e 17SHA1 (patch-system.h) = 215e3cfaafc1573c527b7f430b3807093550c39e
File Added: pkgsrc/misc/rpm/patches/patch-rpmio_rpmfileutil.c
$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>