Patchwork [1/3] e2fsprogs: fix multilib header conflict - ext2_types.h

login
register
mail settings
Submitter Ming Liu
Date April 8, 2014, 2:04 a.m.
Message ID <53435947.6050405@windriver.com>
Download mbox | patch
Permalink /patch/70227/
State New
Headers show

Comments

Ming Liu - April 8, 2014, 2:04 a.m.
On 04/08/2014 03:50 AM, Khem Raj wrote:
>
>
> On Apr 7, 2014 1:28 AM, "Ming Liu" <ming.liu@windriver.com 
> <mailto:ming.liu@windriver.com>> wrote:
> >
> > ext2_types.h conflicts between 32-bit and 64-bit versions.
> >
>
> can you explain the conflicts
> may be they can be addressed
>
Yes, of course, see the following diff output of 64bits and 32bits 
ext2_types.h :

ext2_types.h conflicts between 32-bit and 64-bit versions.

//Ming Liu
>
> > Signed-off-by: Ming Liu <ming.liu@windriver.com 
> <mailto:ming.liu@windriver.com>>
> > ---
> >  meta/recipes-devtools/e2fsprogs/e2fsprogs.inc       | 3 +--
> >  meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb 
> <http://e2fsprogs_1.42.9.bb> | 2 ++
> >  2 files changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc 
> b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
> > index a34df37..99447c1 100644
> > --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
> > +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
> > @@ -22,5 +22,4 @@ DEPENDS = "util-linux"
> >  SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
> >             file://mkdir.patch"
> >
> > -inherit autotools gettext pkgconfig
> > -
> > +inherit autotools gettext pkgconfig multilib_header
> > diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb 
> <http://e2fsprogs_1.42.9.bb> 
> b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb 
> <http://e2fsprogs_1.42.9.bb>
> > index 3a5d6ee..2bdd724 100644
> > --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb 
> <http://e2fsprogs_1.42.9.bb>
> > +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb 
> <http://e2fsprogs_1.42.9.bb>
> > @@ -52,6 +52,8 @@ do_install () {
> >                 mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir}
> >                 mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
> >         fi
> > +
> > +       oe_multilib_header ext2fs/ext2_types.h
> >  }
> >
> >  RDEPENDS_e2fsprogs = "e2fsprogs-badblocks"
> > --
> > 1.8.4.1
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org 
> <mailto:Openembedded-core@lists.openembedded.org>
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

Patch

diff -urpN /tmp/64bits/ext2_types.h /tmp/32bits/ext2_types.h
--- /tmp/64bits/ext2_types.h
+++ /tmp/32bits/ext2_types.h
@@ -63,7 +63,7 @@  typedef __U32_TYPEDEF __u32;
  #if (4 == 4)
  typedef    unsigned int    __u32;
  #else
-#if (8 == 4)
+#if (4 == 4)
  typedef    unsigned long    __u32;
  #else
  #if (2 == 4)
@@ -81,7 +81,7 @@  typedef __S32_TYPEDEF __s32;
  #if (4 == 4)
  typedef    int        __s32;
  #else
-#if (8 == 4)
+#if (4 == 4)
  typedef    long        __s32;
  #else
  #if (2 == 4)
@@ -102,7 +102,7 @@  typedef unsigned int    __u64;
  #if (8 == 8)
  typedef unsigned long long    __u64;
  #else
-#if (8 == 8)
+#if (4 == 8)
  typedef unsigned long    __u64;
  #endif /* SIZEOF_LONG_LONG == 8 */
  #endif /* SIZEOF_LONG == 8 */
@@ -122,7 +122,7 @@  typedef __signed__ long long    __s64;
  typedef signed long long    __s64;
  #endif /* __GNUC__ */
  #else
-#if (8 == 8)
+#if (4 == 8)
  typedef long        __s64;
  #endif /* SIZEOF_LONG_LONG == 8 */
  #endif /* SIZEOF_LONG == 8 */