[dev-util/eresi-0.82_beta2] Fix compiler error

svn path=/sunrise/; revision=10887

diff --git a/dev-util/eresi/ChangeLog b/dev-util/eresi/ChangeLog
index a3f59cd40347f0cf4dc65a3fe86f4c2f308d55dd..6d2e8aa1b0558309be7949cc14d8ca319b62c955 100644 (file)
--- a/dev-util/eresi/ChangeLog
+++ b/dev-util/eresi/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Jul 2010; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
+  +files/0.82_beta2-drop-dprintf.patch, eresi-0.82_beta2.ebuild:
+  Fix build-time issue due to conflicting dprintf declarations
+
   04 Jul 2010; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
   eresi-0.82_beta2.ebuild:
   Updated SRC_URI to new host

diff --git a/dev-util/eresi/Manifest b/dev-util/eresi/Manifest
index 044293a3d25156b97ad1d42fbbe28a6c010cf6c5..70b2fac32351d1b101b3a708f73e224e21f1361f 100644 (file)
--- a/dev-util/eresi/Manifest
+++ b/dev-util/eresi/Manifest
@@ -1,5 +1,6 @@
+AUX 0.82_beta2-drop-dprintf.patch 616 RMD160 990cbe1a39592b891793b462a569ed1eefe8106a SHA1 01a27ea7b68028368c0aebcde75427d1ef5748b8 SHA256 3ebb142d00774f32cb32fd7dcbb40afa6283166a6bd4104f067e485fee244ada
 AUX 0.82_beta2-parallel-make.patch 1970 RMD160 6b7bd0515188264a8ad8c799c6873d15b43f4332 SHA1 6e67edb49670c3c67e9df46abf5d89229ef41459 SHA256 564b6e46e10797b096d75f50691f9bf2244271fe04e4234a908dcd4f7dfade13
 DIST eresi-0.82_beta2.tar.bz2 1132566 RMD160 a52cb8ae6da30dc9f2dd024e064a8da3c3666d02 SHA1 41d28e4bfc486c8f48cf15fb57e4b3f35f21a3aa SHA256 93daa8e392d33897d2fe3a9b27b198671941a53803fdb9bc08dea8a3f9b13a44
-EBUILD eresi-0.82_beta2.ebuild 2034 RMD160 ec0a9c5b83e9e2b08b6e15b9f9c10286aa09c480 SHA1 08b8b4169331aec402e970a98d3728edca6a6dea SHA256 3f59ed8a23be363a2996a5b050d2a24b16cf749736a11f9b39f14d587ea3063a
-MISC ChangeLog 574 RMD160 b18d4bdb4ceff793e729bcc941ec436ddf7cfdf4 SHA1 da60e09e32660d89b72e44cf7ae64373b3f3462f SHA256 b60b32732e68433bea488afd6791f37fd0622d52cda037757472b2e502a8eec5
+EBUILD eresi-0.82_beta2.ebuild 2086 RMD160 9fe14c690a7046e715989ccad002c9c4025426b5 SHA1 dd836df59f2744c1fecb5cf4c59c7a6c64df094b SHA256 f42bdd07d8966df91f5de2acb485e8b7bbe520d0c5717ab47422636860a30505
+MISC ChangeLog 767 RMD160 2b026b1069bf7e7aa49c36c211345ccf95801e70 SHA1 92aec678e29959e7cb682020cc4391467e7147c8 SHA256 a4a0cba3ed0a9dd2c69d613220e87d8db2f2eec3ed746bf645f1bc003916fe6b
 MISC metadata.xml 299 RMD160 c421ce3f432ded8e42ed44e567107616be910947 SHA1 d1621e3de10856ea4aa3d9a6caf1f98626a4dd5c SHA256 f2df47e8793acbc859ce7ad3775bd21be711850f3d5bde3910347b195dc46f5a

diff --git a/dev-util/eresi/eresi-0.82_beta2.ebuild b/dev-util/eresi/eresi-0.82_beta2.ebuild
index cba8f858ecccc1075cf46a50d817aee1eb9d7a5d..2ec547a3923a24fd85142d1704d4999376660ec3 100644 (file)
--- a/dev-util/eresi/eresi-0.82_beta2.ebuild
+++ b/dev-util/eresi/eresi-0.82_beta2.ebuild
@@ -30,6 +30,7 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
        epatch "${FILESDIR}"/0.82_beta2-parallel-make.patch
+       epatch "${FILESDIR}"/0.82_beta2-drop-dprintf.patch
        sed -i \
                -e 's: -O2 : :g' \
                -e "s: -g3 : ${CFLAGS} :" \

diff --git a/dev-util/eresi/files/0.82_beta2-drop-dprintf.patch b/dev-util/eresi/files/0.82_beta2-drop-dprintf.patch
new file mode 100644 (file)
index 0000000..bde1a95
--- /dev/null
+++ b/dev-util/eresi/files/0.82_beta2-drop-dprintf.patch
@@ -0,0 +1,25 @@
+Drop conflicting dprintf declaration.
+
+ERESI does declare a prototype for dprintf, which conflicts with the
+declaration in stdio.h, leading to the following compiler error:
+
+../librevm/include/revm.h:604: error: conflicting types for ‘dprintf’
+/usr/include/stdio.h:397: note: previous declaration of ‘dprintf’ was here
+
+As the whole ERESI source code doesn't even mention dprintf in any
+other place, dropping the declaration shouldn't cause any harm at all.
+
+2010-04-07 Martin von Gagern
+
+Index: eresi-0.82_beta2/librevm/include/revm.h
+===================================================================
+--- eresi-0.82_beta2.orig/librevm/include/revm.h
++++ eresi-0.82_beta2/librevm/include/revm.h
+@@ -601,7 +601,6 @@ int                revm_isnbr(char *string);
+ void          revm_workfiles_load();
+ int           revm_implicit(revmcmd_t *actual);
+ int           revm_workfiles_unload();
+-int           dprintf(int fd, char *format, ...);
+ void          revm_pht_print(elfsh_Phdr *phdr, uint16_t num, eresi_Addr base);
+ char          *revm_fetch_sht_typedesc(elfsh_Word typenum);
+ int             revm_sht_print(elfsh_Shdr *shdr, u_int num, char rtflag);