Skip to contentSkip to conversation

X32 related Fixes

PATCH Applied [email protected] 4 participants 24 messages Dec 8, 2011 – Dec 12, 2011

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover X32 related Fixes

From: Nitin A Kamble <[email protected]>

These commits fix various recipe building issues with x32 toolchain.

mdadm & gst-fluendo commits are reworked based on the feedback received earlier.

Thanks,
Nitin

The following changes since commit f17e0ae38b2e6c4cbe7f0f9d76c3e1a386335fd1:

conf/machine: Don't poke around providers which aren't machine specific/safe (2011-12-06 22:47:09 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/x32
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/x32

H.J. Lu (3):
mesa: Properly create share library for x32
siteinfo: create a new siteinfo for x32-linux
openssl-1.0.0e: Update x32 Configure

Nitin A Kamble (8):
gst-fluendo.inc: remove unneccessary hack
mdadm: Make custom CC definition conditional
pulseaudio: fix compilation with x32 toolchain
libacpi: Fix libdir for x32
findutils: Fix compilation for x32 toolchain
pax: fix compilation with x32 toolchain
libacpi: Use the cross strip instead of host strip x86 tune: fix TUNE_PKGARCH definition for proper PACKAGE_ARCH

 meta/classes/siteinfo.bbclass                      |    2 +-
 meta/conf/machine/include/ia32/arch-ia32.inc       |    4 +-
 meta/conf/machine/include/tune-core2.inc           |    6 +-
 .../libacpi/files/libacpi_fix_for_x32.patch        |   47 ++++
 .../use_correct_strip_in_cross_environment.patch   |   23 ++
 meta/recipes-bsp/libacpi/libacpi_0.2.bb            |    6 +-
 .../openssl-1.0.0e/openssl_fix_for_x32.patch       |    2 +-
 .../findutils-4.4.2/findutils_fix_for_x32.patch    |   40 ++++
 meta/recipes-extended/findutils/findutils_4.4.2.bb |    5 +-
 .../mdadm/files/mdadm-3.2.2_fix_for_x32.patch      |   25 +++
 meta/recipes-extended/mdadm/mdadm_3.2.2.bb         |    4 +-
 .../pax/pax/pax-3.4_fix_for_x32.patch              |  185 ++++++++++++++++
 meta/recipes-extended/pax/pax_3.4.bb               |    5 +-
 .../mesa/mesa/mesa_fix_for_x32.patch               |   20 ++-
 meta/recipes-multimedia/gstreamer/gst-fluendo.inc  |    4 -
 .../pulseaudio/pulseaudo_fix_for_x32.patch         |  225 ++++++++++++++++++++
 .../pulseaudio/pulseaudio_1.1.bb                   |    3 +-
 meta/site/x32-linux                                |    9 +
 18 files changed, 592 insertions(+), 23 deletions(-)
 create mode 100644 meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
 create mode 100644 meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch
 create mode 100644 meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_x32.patch
 create mode 100644 meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch
 create mode 100644 meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch
 create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudo_fix_for_x32.patch
 create mode 100644 meta/site/x32-linux
Signature · 1 line
1.7.6.4
author
#1 lore raw

PATCH 1/11 gst-fluendo.inc: remove unneccessary hack

From: Nitin A Kamble <[email protected]>

This fixes bug: [YOCTO #1403]

the custom definition of CC was causing build isuses with x32 toolchain. And also I found out that the hack is not neccessary anymore. the affected gst-fluendo-mpegdemux recipe builds fine without the CC hack.

Signed-off-by Nitin A Kamble <[email protected]>
---
 meta/recipes-multimedia/gstreamer/gst-fluendo.inc |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
meta/recipes-multimedia/gstreamer/gst-fluendo.inc +0 -4
index 203bdba..8b24cf7 100644
@@ -12,7 +12,3 @@ FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
 FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
 
 EXTRA_OECONF = "--disable-debug --disable-valgrind"
-
-# Hack to get STAGING_LIBDIR into the linker path when building
-CC = "${CCACHE} ${HOST_PREFIX}gcc -L${STAGING_LIBDIR}"
-
Signature · 1 line
1.7.6.4
author
#2 lore raw

PATCH 2/11 mdadm: Make custom CC definition conditional

From: Nitin A Kamble <[email protected]>

By hardcoding CC's definition in the Makefile, all the gcc parameters set by tune settings are lost. Causing compile failure with x32 toolchain

As the bitbake defined CC is good, there is no need to redfine CC in the make file, hence making the CC definition in the Makefile conditional.

This fixes bug: [YOCTO #1414]

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../mdadm/files/mdadm-3.2.2_fix_for_x32.patch      |   25 ++++++++++++++++++++
 meta/recipes-extended/mdadm/mdadm_3.2.2.bb         |    4 +-
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch
meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch new file +25 -0
new file mode 100644
index 0000000..ccc1078
@@ -0,0 +1,25 @@
+UpstreamStatus: pending
+
+By hardcoding CC's definition in the Makefile, all the gcc parameters 
+set by tune settings are lost. Causing compile failure with x32 toolchain
+
+As the bitbake defined CC is good, there is no need to redfine CC in the 
+make file, hence making the CC definition in the Makefile conditional.
+
+Signed-Off-By: Nitin A Kamble <[email protected]> 2011/12/07
+
+Index: mdadm-3.2.2/Makefile
+===================================================================
+--- mdadm-3.2.2.orig/Makefile
++++ mdadm-3.2.2/Makefile
+@@ -40,7 +40,10 @@ KLIBC=/home/src/klibc/klibc-0.77
+ 
+ KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32
+ 
++ifndef CC
+ CC = $(CROSS_COMPILE)gcc
++endif
++
+ CXFLAGS = -ggdb
+ CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
+ ifdef WARN_UNUSED
meta/recipes-extended/mdadm/mdadm_3.2.2.bb +2 -2
index 97878ed..02109e3 100644
@@ -8,10 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \
                     file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \
 	    file://0001-mdadm-fix-build-failures-ppc64.patch \
+	    file://mdadm-3.2.2_fix_for_x32.patch \
 	  "
 
 SRC_URI[md5sum] = "12ee2fbf3beddb60601fb7a4c4905651"

@@ -22,7 +23,6 @@ CFLAGS += "-fno-strict-aliasing"
 inherit autotools
 
 do_compile() {
-	export CROSS_COMPILE="${TARGET_PREFIX}"
 	oe_runmake
 }
Signature · 1 line
1.7.6.4
#3 lore raw

Re: [PATCH 02/11] mdadm: Make custom CC definition conditional

Quoted 5 lines · On Wed, Dec 7, 2011 at 9:48 PM, <[email protected]> wrote:

+
++ifndef CC
+ CC = $(CROSS_COMPILE)gcc
++endif
++

may be you could do

CC ?= $(CROSS_COMPILE)gcc
here instead

author
#4 lore raw

Re: [PATCH 02/11] mdadm: Make custom CC definition conditional

Quoted 19 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Khem Raj
Sent: Wednesday, December 07, 2011 11:20 PM
To: Patches and discussions about the oe-core layer
Cc: [email protected]
Subject: Re: [OE-core] [PATCH 02/11] mdadm: Make custom CC definition conditional

Quoted 5 lines · On Wed, Dec 7, 2011 at 9:48 PM, <[email protected]> wrote:

+
++ifndef CC
+ CC = $(CROSS_COMPILE)gcc
++endif
++

Quoted 4 lines

may be you could do

CC ?= $(CROSS_COMPILE)gcc
here instead

Yes, This way also works the same, I changed the commit accordingly.

Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

author
#5 lore raw

Re: [PATCH 02/11] mdadm: Make custom CC definition conditional

I updated the mdadm commit on contrib branch. So the pull of nitin/x32 branch will get the right commit.

Thanks,
Nitin

Quoted 47 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Kamble, Nitin A
Sent: Thursday, December 08, 2011 10:36 AM
To: Patches and discussions about the oe-core layer
Cc: [email protected]
Subject: Re: [OE-core] [PATCH 02/11] mdadm: Make custom CC definition conditional

Quoted 3 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf

Of

Quoted 14 lines

Khem Raj
Sent: Wednesday, December 07, 2011 11:20 PM
To: Patches and discussions about the oe-core layer
Cc: [email protected]
Subject: Re: [OE-core] [PATCH 02/11] mdadm: Make custom CC definition conditional

Quoted 5 lines · On Wed, Dec 7, 2011 at 9:48 PM, <[email protected]> wrote:

+
++ifndef CC
+ CC = $(CROSS_COMPILE)gcc
++endif
++

Quoted 4 lines

may be you could do

CC ?= $(CROSS_COMPILE)gcc
here instead

Yes, This way also works the same, I changed the commit accordingly.

Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

author
#6 lore raw

PATCH 3/11 pulseaudio: fix compilation with x32 toolchain

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

This commit makes assembly syntax compatible with x32 toolchain to avoid x32 gcc errors.

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../pulseaudio/pulseaudo_fix_for_x32.patch         |  225 ++++++++++++++++++++
 .../pulseaudio/pulseaudio_1.1.bb                   |    3 +-
 2 files changed, 227 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudo_fix_for_x32.patch
meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudo_fix_for_x32.patch new file +225 -0
new file mode 100644
index 0000000..22fe2e7
@@ -0,0 +1,225 @@
+UpstreamStatus: Pending
+
+This patch makes assembly syntax compatible to the x32 toolchain.
+
+This fixes compilations errors with x32 gcc.
+
+Signed-Off-By: Nitin A Kamble <[email protected]> 2011/12/03
+Index: pulseaudio-1.1/src/pulsecore/svolume_mmx.c
+===================================================================
+--- pulseaudio-1.1.orig/src/pulsecore/svolume_mmx.c
++++ pulseaudio-1.1/src/pulsecore/svolume_mmx.c
+@@ -107,7 +107,7 @@ static void pa_volume_s16ne_mmx(int16_t 
+         " test $1, %2                   \n\t" /* check for odd samples */
+         " je 2f                         \n\t"
+ 
+-        " movd (%1, %3, 4), %%mm0       \n\t" /* |  v0h  |  v0l  | */
++        " movd (%q1, %3, 4), %%mm0       \n\t" /* |  v0h  |  v0l  | */
+         " movw (%0), %w4                \n\t" /*     ..  |  p0   | */
+         " movd %4, %%mm1                \n\t"
+         VOLUME_32x16 (%%mm1, %%mm0)
+@@ -122,7 +122,7 @@ static void pa_volume_s16ne_mmx(int16_t 
+         " je 4f                         \n\t"
+ 
+         "3:                             \n\t" /* do samples in groups of 2 */
+-        " movq (%1, %3, 4), %%mm0       \n\t" /* |  v1h  |  v1l  |  v0h  |  v0l  | */
++        " movq (%q1, %3, 4), %%mm0       \n\t" /* |  v1h  |  v1l  |  v0h  |  v0l  | */
+         " movd (%0), %%mm1              \n\t" /*              .. |   p1  |  p0   | */
+         VOLUME_32x16 (%%mm1, %%mm0)
+         " movd %%mm0, (%0)              \n\t" /*              .. | p1*v1 | p0*v0 | */
+@@ -135,8 +135,8 @@ static void pa_volume_s16ne_mmx(int16_t 
+         " je 6f                         \n\t"
+ 
+         "5:                             \n\t" /* do samples in groups of 4 */
+-        " movq (%1, %3, 4), %%mm0       \n\t" /* |  v1h  |  v1l  |  v0h  |  v0l  | */
+-        " movq 8(%1, %3, 4), %%mm2      \n\t" /* |  v3h  |  v3l  |  v2h  |  v2l  | */
++        " movq (%q1, %3, 4), %%mm0       \n\t" /* |  v1h  |  v1l  |  v0h  |  v0l  | */
++        " movq 8(%q1, %3, 4), %%mm2      \n\t" /* |  v3h  |  v3l  |  v2h  |  v2l  | */
+         " movd (%0), %%mm1              \n\t" /*              .. |   p1  |  p0   | */
+         " movd 4(%0), %%mm3             \n\t" /*              .. |   p3  |  p2   | */
+         VOLUME_32x16 (%%mm1, %%mm0)
+@@ -180,7 +180,7 @@ static void pa_volume_s16re_mmx(int16_t 
+         " test $1, %2                   \n\t" /* check for odd samples */
+         " je 2f                         \n\t"
+ 
+-        " movd (%1, %3, 4), %%mm0       \n\t" /* |  v0h  |  v0l  | */
++        " movd (%q1, %3, 4), %%mm0       \n\t" /* |  v0h  |  v0l  | */
+         " movw (%0), %w4                \n\t" /*     ..  |  p0   | */
+         " rorw $8, %w4                  \n\t"
+         " movd %4, %%mm1                \n\t"
+@@ -197,7 +197,7 @@ static void pa_volume_s16re_mmx(int16_t 
+         " je 4f                         \n\t"
+ 
+         "3:                             \n\t" /* do samples in groups of 2 */
+-        " movq (%1, %3, 4), %%mm0       \n\t" /* |  v1h  |  v1l  |  v0h  |  v0l  | */
++        " movq (%q1, %3, 4), %%mm0       \n\t" /* |  v1h  |  v1l  |  v0h  |  v0l  | */
+         " movd (%0), %%mm1              \n\t" /*              .. |   p1  |  p0   | */
+         SWAP_16 (%%mm1)
+         VOLUME_32x16 (%%mm1, %%mm0)
+@@ -212,8 +212,8 @@ static void pa_volume_s16re_mmx(int16_t 
+         " je 6f                         \n\t"
+ 
+         "5:                             \n\t" /* do samples in groups of 4 */
+-        " movq (%1, %3, 4), %%mm0       \n\t" /* |  v1h  |  v1l  |  v0h  |  v0l  | */
+-        " movq 8(%1, %3, 4), %%mm2      \n\t" /* |  v3h  |  v3l  |  v2h  |  v2l  | */
++        " movq (%q1, %3, 4), %%mm0       \n\t" /* |  v1h  |  v1l  |  v0h  |  v0l  | */
++        " movq 8(%q1, %3, 4), %%mm2      \n\t" /* |  v3h  |  v3l  |  v2h  |  v2l  | */
+         " movd (%0), %%mm1              \n\t" /*              .. |   p1  |  p0   | */
+         " movd 4(%0), %%mm3             \n\t" /*              .. |   p3  |  p2   | */
+         SWAP_16_2 (%%mm1, %%mm3)
+Index: pulseaudio-1.1/src/pulsecore/svolume_sse.c
+===================================================================
+--- pulseaudio-1.1.orig/src/pulsecore/svolume_sse.c
++++ pulseaudio-1.1/src/pulsecore/svolume_sse.c
+@@ -92,7 +92,7 @@ static void pa_volume_s16ne_sse2(int16_t
+         " test $1, %2                   \n\t" /* check for odd samples */
+         " je 2f                         \n\t"
+ 
+-        " movd (%1, %3, 4), %%xmm0      \n\t" /* |  v0h  |  v0l  | */
++        " movd (%q1, %3, 4), %%xmm0      \n\t" /* |  v0h  |  v0l  | */
+         " movw (%0), %w4                \n\t" /*     ..  |   p0  | */
+         " movd %4, %%xmm1               \n\t"
+         VOLUME_32x16 (%%xmm1, %%xmm0)
+@@ -107,7 +107,7 @@ static void pa_volume_s16ne_sse2(int16_t
+         " je 4f                         \n\t"
+ 
+         "3:                             \n\t" /* do samples in groups of 2 */
+-        " movq (%1, %3, 4), %%xmm0      \n\t" /* |  v1h  |  v1l  |  v0h  |  v0l  | */
++        " movq (%q1, %3, 4), %%xmm0      \n\t" /* |  v1h  |  v1l  |  v0h  |  v0l  | */
+         " movd (%0), %%xmm1             \n\t" /*              .. |   p1  |  p0   | */
+         VOLUME_32x16 (%%xmm1, %%xmm0)
+         " movd %%xmm0, (%0)             \n\t" /*              .. | p1*v1 | p0*v0 | */
+@@ -123,7 +123,7 @@ static void pa_volume_s16ne_sse2(int16_t
+          * that the array is 16 bytes aligned, we probably have to do the odd values
+          * after this then. */
+         "5:                             \n\t" /* do samples in groups of 4 */
+-        " movdqu (%1, %3, 4), %%xmm0    \n\t" /* |  v3h  |  v3l  ..  v0h  |  v0l  | */
++        " movdqu (%q1, %3, 4), %%xmm0    \n\t" /* |  v3h  |  v3l  ..  v0h  |  v0l  | */
+         " movq (%0), %%xmm1             \n\t" /*              .. |   p3  ..  p0   | */
+         VOLUME_32x16 (%%xmm1, %%xmm0)
+         " movq %%xmm0, (%0)             \n\t" /*              .. | p3*v3 .. p0*v0 | */
+@@ -136,8 +136,8 @@ static void pa_volume_s16ne_sse2(int16_t
+         " je 8f                         \n\t"
+ 
+         "7:                             \n\t" /* do samples in groups of 8 */
+-        " movdqu (%1, %3, 4), %%xmm0    \n\t" /* |  v3h  |  v3l  ..  v0h  |  v0l  | */
+-        " movdqu 16(%1, %3, 4), %%xmm2  \n\t" /* |  v7h  |  v7l  ..  v4h  |  v4l  | */
++        " movdqu (%q1, %3, 4), %%xmm0    \n\t" /* |  v3h  |  v3l  ..  v0h  |  v0l  | */
++        " movdqu 16(%q1, %3, 4), %%xmm2  \n\t" /* |  v7h  |  v7l  ..  v4h  |  v4l  | */
+         " movq (%0), %%xmm1             \n\t" /*              .. |   p3  ..  p0   | */
+         " movq 8(%0), %%xmm3            \n\t" /*              .. |   p7  ..  p4   | */
+         VOLUME_32x16 (%%xmm1, %%xmm0)
+@@ -176,7 +176,7 @@ static void pa_volume_s16re_sse2(int16_t
+         " test $1, %2                   \n\t" /* check for odd samples */
+         " je 2f                         \n\t"
+ 
+-        " movd (%1, %3, 4), %%xmm0      \n\t" /* |  v0h  |  v0l  | */
++        " movd (%q1, %3, 4), %%xmm0      \n\t" /* |  v0h  |  v0l  | */
+         " movw (%0), %w4                \n\t" /*     ..  |   p0  | */
+         " rorw $8, %w4                  \n\t"
+         " movd %4, %%xmm1               \n\t"
+@@ -193,7 +193,7 @@ static void pa_volume_s16re_sse2(int16_t
+         " je 4f                         \n\t"
+ 
+         "3:                             \n\t" /* do samples in groups of 2 */
+-        " movq (%1, %3, 4), %%xmm0      \n\t" /* |  v1h  |  v1l  |  v0h  |  v0l  | */
++        " movq (%q1, %3, 4), %%xmm0      \n\t" /* |  v1h  |  v1l  |  v0h  |  v0l  | */
+         " movd (%0), %%xmm1             \n\t" /*              .. |   p1  |  p0   | */
+         SWAP_16 (%%xmm1)
+         VOLUME_32x16 (%%xmm1, %%xmm0)
+@@ -211,7 +211,7 @@ static void pa_volume_s16re_sse2(int16_t
+          * that the array is 16 bytes aligned, we probably have to do the odd values
+          * after this then. */
+         "5:                             \n\t" /* do samples in groups of 4 */
+-        " movdqu (%1, %3, 4), %%xmm0    \n\t" /* |  v3h  |  v3l  ..  v0h  |  v0l  | */
++        " movdqu (%q1, %3, 4), %%xmm0    \n\t" /* |  v3h  |  v3l  ..  v0h  |  v0l  | */
+         " movq (%0), %%xmm1             \n\t" /*              .. |   p3  ..  p0   | */
+         SWAP_16 (%%xmm1)
+         VOLUME_32x16 (%%xmm1, %%xmm0)
+@@ -226,8 +226,8 @@ static void pa_volume_s16re_sse2(int16_t
+         " je 8f                         \n\t"
+ 
+         "7:                             \n\t" /* do samples in groups of 8 */
+-        " movdqu (%1, %3, 4), %%xmm0    \n\t" /* |  v3h  |  v3l  ..  v0h  |  v0l  | */
+-        " movdqu 16(%1, %3, 4), %%xmm2  \n\t" /* |  v7h  |  v7l  ..  v4h  |  v4l  | */
++        " movdqu (%q1, %3, 4), %%xmm0    \n\t" /* |  v3h  |  v3l  ..  v0h  |  v0l  | */
++        " movdqu 16(%q1, %3, 4), %%xmm2  \n\t" /* |  v7h  |  v7l  ..  v4h  |  v4l  | */
+         " movq (%0), %%xmm1             \n\t" /*              .. |   p3  ..  p0   | */
+         " movq 8(%0), %%xmm3            \n\t" /*              .. |   p7  ..  p4   | */
+         SWAP_16_2 (%%xmm1, %%xmm3)
+Index: pulseaudio-1.1/src/pulsecore/sconv_sse.c
+===================================================================
+--- pulseaudio-1.1.orig/src/pulsecore/sconv_sse.c
++++ pulseaudio-1.1/src/pulsecore/sconv_sse.c
+@@ -54,8 +54,8 @@ static void pa_sconv_s16le_from_f32ne_ss
+         " je 2f                         \n\t"
+ 
+         "1:                             \n\t"
+-        " movups (%2, %0, 2), %%xmm0    \n\t" /* read 8 floats */
+-        " movups 16(%2, %0, 2), %%xmm2  \n\t"
++        " movups (%q2, %0, 2), %%xmm0    \n\t" /* read 8 floats */
++        " movups 16(%q2, %0, 2), %%xmm2  \n\t"
+         " minps  %%xmm5, %%xmm0         \n\t" /* clamp to 1.0 */
+         " minps  %%xmm5, %%xmm2         \n\t"
+         " maxps  %%xmm6, %%xmm0         \n\t" /* clamp to -1.0 */
+@@ -72,8 +72,8 @@ static void pa_sconv_s16le_from_f32ne_ss
+ 
+         " packssdw %%mm1, %%mm0         \n\t" /* pack parts */
+         " packssdw %%mm3, %%mm2         \n\t"
+-        " movq     %%mm0, (%3, %0)      \n\t"
+-        " movq    %%mm2, 8(%3, %0)     \n\t"
++        " movq     %%mm0, (%q3, %0)      \n\t"
++        " movq    %%mm2, 8(%q3, %0)     \n\t"
+ 
+         " add $16, %0                   \n\t"
+         " dec %1                        \n\t"
+@@ -85,12 +85,12 @@ static void pa_sconv_s16le_from_f32ne_ss
+         " je 4f                         \n\t"
+ 
+         "3:                             \n\t"
+-        " movss (%2, %0, 2), %%xmm0     \n\t"
++        " movss (%q2, %0, 2), %%xmm0     \n\t"
+         " minss  %%xmm5, %%xmm0         \n\t"
+         " maxss  %%xmm6, %%xmm0         \n\t"
+         " mulss  %%xmm7, %%xmm0         \n\t"
+         " cvtss2si %%xmm0, %4           \n\t"
+-        " movw  %w4, (%3, %0)           \n\t"
++        " movw  %w4, (%q3, %0)           \n\t"
+         " add $2, %0                    \n\t"
+         " dec %1                        \n\t"
+         " jne 3b                        \n\t"
+@@ -119,8 +119,8 @@ static void pa_sconv_s16le_from_f32ne_ss
+         " je 2f                         \n\t"
+ 
+         "1:                             \n\t"
+-        " movups (%2, %0, 2), %%xmm0    \n\t" /* read 8 floats */
+-        " movups 16(%2, %0, 2), %%xmm2  \n\t"
++        " movups (%q2, %0, 2), %%xmm0    \n\t" /* read 8 floats */
++        " movups 16(%q2, %0, 2), %%xmm2  \n\t"
+         " minps  %%xmm5, %%xmm0         \n\t" /* clamp to 1.0 */
+         " minps  %%xmm5, %%xmm2         \n\t"
+         " maxps  %%xmm6, %%xmm0         \n\t" /* clamp to -1.0 */
+@@ -132,7 +132,7 @@ static void pa_sconv_s16le_from_f32ne_ss
+         " cvtps2dq %%xmm2, %%xmm2       \n\t"
+ 
+         " packssdw %%xmm2, %%xmm0       \n\t"
+-        " movdqu   %%xmm0, (%3, %0)     \n\t"
++        " movdqu   %%xmm0, (%q3, %0)     \n\t"
+ 
+         " add $16, %0                   \n\t"
+         " dec %1                        \n\t"
+@@ -144,12 +144,12 @@ static void pa_sconv_s16le_from_f32ne_ss
+         " je 4f                         \n\t"
+ 
+         "3:                             \n\t"
+-        " movss (%2, %0, 2), %%xmm0     \n\t"
++        " movss (%q2, %0, 2), %%xmm0     \n\t"
+         " minss  %%xmm5, %%xmm0         \n\t"
+         " maxss  %%xmm6, %%xmm0         \n\t"
+         " mulss  %%xmm7, %%xmm0         \n\t"
+         " cvtss2si %%xmm0, %4           \n\t"
+-        " movw  %w4, (%3, %0)           \n\t"
++        " movw  %w4, (%q3, %0)           \n\t"
+         " add $2, %0                    \n\t"
+         " dec %1                        \n\t"
+         " jne 3b                        \n\t"
meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb +2 -1
index 4c8b46f..93db782 100644
@@ -1,6 +1,6 @@
 require pulseaudio.inc
 
-PR = "r4"
+PR = "r5"
 
 DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
 

@@ -8,6 +8,7 @@ inherit gettext perlnative
 
 SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \
   file://volatiles.04_pulse \
+  file://pulseaudo_fix_for_x32.patch \
 "
 
 SRC_URI[md5sum] = "17d21df798cee407b769c6355fae397a"
Signature · 1 line
1.7.6.4
author
#7 lore raw

PATCH 4/11 libacpi: Fix libdir for x32

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

libacpi doesn't use base_libdir for install. This patch adds base_libdir support so that x32 libraries are installed properly.

Signed-off-by Nitin A Kamble <[email protected]>
Signed-off-by H.J. Lu <[email protected]>
---
 .../libacpi/files/libacpi_fix_for_x32.patch        |   47 ++++++++++++++++++++
 meta/recipes-bsp/libacpi/libacpi_0.2.bb            |    5 +-
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch new file +47 -0
new file mode 100644
index 0000000..5f2d034
@@ -0,0 +1,47 @@
+UpstreamStatus: Pending
+
+Fix libacpi for x32
+    
+    libacpi doesn't use base_libdir for install.  This patch adds
+    base_libdir support so that x32 libraries are installed properly.
+
+Patch Received from:  H.J. Lu <[email protected]>
+
+Signed-Off-By: Nitin A Kamble <[email protected]> 2011/12/05
+
+Index: libacpi-0.2/Makefile
+===================================================================
+--- libacpi-0.2.orig/Makefile
++++ libacpi-0.2/Makefile
+@@ -8,6 +8,10 @@ SRC_test = test-libacpi.c libacpi.c list
+ OBJ = ${SRC:.c=.o}
+ OBJ_test = ${SRC_test:.c=.o}
+ 
++ifndef base_libdir
++base_libdir=/lib
++endif
++
+ all: options libacpi.a libacpi.so test-libacpi
+ 
+ options:
+@@ -42,13 +46,13 @@ install: all
+ 	@mkdir -p ${DESTDIR}${PREFIX}/include
+ 	@cp -f libacpi.h ${DESTDIR}${PREFIX}/include
+ 	@chmod 644 ${DESTDIR}${PREFIX}/include/libacpi.h
+-	@echo installing library to ${DESTDIR}${PREFIX}/lib
+-	@mkdir -p ${DESTDIR}${PREFIX}/lib
+-	@cp -f libacpi.a ${DESTDIR}${PREFIX}/lib
+-	@chmod 644 ${DESTDIR}${PREFIX}/lib/libacpi.a
+-	@cp -f ${SONAME} ${DESTDIR}${PREFIX}/lib/
+-	@chmod 644 ${DESTDIR}${PREFIX}/lib/${SONAME}
+-	@ln -s ${SONAME} ${DESTDIR}${PREFIX}/lib/libacpi.so
++	@echo installing library to ${DESTDIR}${PREFIX}${base_libdir}
++	@mkdir -p ${DESTDIR}${PREFIX}${base_libdir}
++	@cp -f libacpi.a ${DESTDIR}${PREFIX}${base_libdir}
++	@chmod 644 ${DESTDIR}${PREFIX}${base_libdir}/libacpi.a
++	@cp -f ${SONAME} ${DESTDIR}${PREFIX}${base_libdir}/
++	@chmod 644 ${DESTDIR}${PREFIX}${base_libdir}/${SONAME}
++	@ln -s ${SONAME} ${DESTDIR}${PREFIX}${base_libdir}/libacpi.so
+ 	@echo installing test-libacpi to ${DESTDIR}${PREFIX}/bin
+ 	@mkdir -p ${DESTDIR}${PREFIX}/bin
+ 	@cp -f test-libacpi ${DESTDIR}${PREFIX}/bin
meta/recipes-bsp/libacpi/libacpi_0.2.bb +3 -2
index 7c5095d..82fe8f8 100644
@@ -5,10 +5,11 @@ SECTION = "base"
 HOMEPAGE = "http://www.ngolde.de/libacpi.html"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fec17f82f16630adf2dfb7d2a46f21c5"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \
-	   file://makefile-fix.patch "
+	   file://makefile-fix.patch \
+	   file://libacpi_fix_for_x32.patch "
 
 SRC_URI[md5sum] = "05b53dd7bead66dda35fec502b91066c"
 SRC_URI[sha256sum] = "13086e31d428b9c125954d48ac497b754bbbce2ef34ea29ecd903e82e25bad29"
Signature · 1 line
1.7.6.4
author
#8 lore raw

PATCH 5/11 findutils: Fix compilation for x32 toolchain

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

Work around gnulib time_t assumption in findutils for x32

time_t is 64bit and long int is 32bit on x32. But gnulib used in findutils assumes time_t values fit into long int. Such assumption is invalid for x32 and should be removed.

This patch is a workaround to compile gnulib for x32.

Signed-off-by Nitin A Kamble <[email protected]>
Signed-off-by H.J. Lu <[email protected]>
---
 .../findutils-4.4.2/findutils_fix_for_x32.patch    |   40 ++++++++++++++++++++
 meta/recipes-extended/findutils/findutils_4.4.2.bb |    5 +-
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_x32.patch
meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_x32.patch new file +40 -0
new file mode 100644
index 0000000..dd2ab0e
@@ -0,0 +1,40 @@
+UpstreamStatus: Pending
+
+Author: H.J. Lu <[email protected]>
+
+Work around gnulib time_t assumption in findutils for x32
+
+time_t is 64bit and long int is 32bit on x32.  But gnulib used in
+findutils assumes time_t values fit into long int.  Such assumption is
+invalid for x32 and should be removed.
+
+This patch is a workaround to compile gnulib for x32.
+
+Signed-Off-By: Nitin A Kamble <[email protected]> 2011/12/05
+
+
+Index: findutils-4.4.2/gnulib/lib/getdate.y
+===================================================================
+--- findutils-4.4.2.orig/gnulib/lib/getdate.y
++++ findutils-4.4.2/gnulib/lib/getdate.y
+@@ -114,7 +114,6 @@
+    wraps around, but there's no portable way to check for that at
+    compile-time.  */
+ verify (TYPE_IS_INTEGER (time_t));
+-verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX);
+ 
+ /* An integer value, and the number of digits in its textual
+    representation.  */
+Index: findutils-4.4.2/gnulib/lib/mktime.c
+===================================================================
+--- findutils-4.4.2.orig/gnulib/lib/mktime.c
++++ findutils-4.4.2/gnulib/lib/mktime.c
+@@ -166,7 +166,7 @@ ydhms_diff (long int year1, long int yda
+ {
+   verify (C99_integer_division, -1 / 2 == 0);
+   verify (long_int_year_and_yday_are_wide_enough,
+-	  INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX);
++	  INT_MAX <= TIME_T_MAX / 2 || TIME_T_MAX <= UINT_MAX);
+ 
+   /* Compute intervening leap days correctly even if year is negative.
+      Take care to avoid integer overflow here.  */
meta/recipes-extended/findutils/findutils_4.4.2.bb +3 -2
index cfc6546..c25ba4c 100644
@@ -1,10 +1,11 @@
 require findutils.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://01-27017.patch \
             file://02-28824.patch \
-            file://03-28872.patch"
+            file://03-28872.patch \
+            file://findutils_fix_for_x32.patch "
 
 SRC_URI[md5sum] = "351cc4adb07d54877fa15f75fb77d39f"
 SRC_URI[sha256sum] = "434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a"
Signature · 1 line
1.7.6.4
#9 lore raw

Re: [PATCH 05/11] findutils: Fix compilation for x32 toolchain

Quoted 3 lines · On Wed, Dec 7, 2011 at 9:48 PM, <[email protected]> wrote:

From: Nitin A Kamble <[email protected]>

Work around gnulib time_t assumption in findutils for x32

if its a workaround can it be applied only to x32 with help of overrides please

Quoted 87 lines

time_t is 64bit and long int is 32bit on x32.  But gnulib used in findutils assumes time_t values fit into long int.  Such assumption is invalid for x32 and should be removed.

This patch is a workaround to compile gnulib for x32.

Signed-off-by Nitin A Kamble <[email protected]>
Signed-off-by H.J. Lu <[email protected]>

---
 .../findutils-4.4.2/findutils_fix_for_x32.patch    |   40 ++++++++++++++++++++ meta/recipes-extended/findutils/findutils_4.4.2.bb |    5 +-

 2 files changed, 43 insertions(+), 2 deletions(-)

 create mode 100644 meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_x32.patch

meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_x32.patch new file +40 -0
new file mode 100644
index 0000000..dd2ab0e
@@ -0,0 +1,40 @@
+UpstreamStatus: Pending
+
+Author: H.J. Lu <[email protected]>
+
+Work around gnulib time_t assumption in findutils for x32
+
+time_t is 64bit and long int is 32bit on x32.  But gnulib used in
+findutils assumes time_t values fit into long int.  Such assumption is
+invalid for x32 and should be removed.
+
+This patch is a workaround to compile gnulib for x32.
+
+Signed-Off-By: Nitin A Kamble <[email protected]> 2011/12/05
+
+
+Index: findutils-4.4.2/gnulib/lib/getdate.y
+===================================================================
+--- findutils-4.4.2.orig/gnulib/lib/getdate.y
++++ findutils-4.4.2/gnulib/lib/getdate.y
+@@ -114,7 +114,6 @@
+    wraps around, but there's no portable way to check for that at
+    compile-time.  */
+ verify (TYPE_IS_INTEGER (time_t));
+-verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX);
+
+ /* An integer value, and the number of digits in its textual
+    representation.  */
+Index: findutils-4.4.2/gnulib/lib/mktime.c
+===================================================================
+--- findutils-4.4.2.orig/gnulib/lib/mktime.c
++++ findutils-4.4.2/gnulib/lib/mktime.c
+@@ -166,7 +166,7 @@ ydhms_diff (long int year1, long int yda
+ {
+   verify (C99_integer_division, -1 / 2 == 0);
+   verify (long_int_year_and_yday_are_wide_enough,
+-        INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX);
++        INT_MAX <= TIME_T_MAX / 2 || TIME_T_MAX <= UINT_MAX);
+
+   /* Compute intervening leap days correctly even if year is negative.
+      Take care to avoid integer overflow here.  */
meta/recipes-extended/findutils/findutils_4.4.2.bb +0 -0
index cfc6546..c25ba4c 100644
@@ -1,10 +1,11 @@

 require findutils.inc

meta/recipes-extended/findutils/findutils_4.4.2.bb +1 -1
-PR = "r0"
+PR = "r1"

 SRC_URI += "file://01-27017.patch \
            file://02-28824.patch \
-            file://03-28872.patch"
+            file://03-28872.patch \
+            file://findutils_fix_for_x32.patch "

 SRC_URI[md5sum] = "351cc4adb07d54877fa15f75fb77d39f"
 SRC_URI[sha256sum] = "434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a" --
1.7.6.4

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#10 lore raw

Re: [PATCH 05/11] findutils: Fix compilation for x32 toolchain

Quoted 6 lines · Khem Raj
Quoted 3 lines · On Wed, Dec 7, 2011 at 9:48 PM, <[email protected]> wrote:

From: Nitin A Kamble <[email protected]>

Work around gnulib time_t assumption in findutils for x32

if its a workaround can it be applied only to x32 with help of overrides please

Its not a workaround, the patch looks like a generic reasonable fix to correct assumptions made by the program that aren't true?

Cheers,

Richard

author
#11 lore raw

Re: [PATCH 05/11] findutils: Fix compilation for x32 toolchain

Quoted 16 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Richard Purdie
Sent: Thursday, December 08, 2011 1:08 AM
To: Patches and discussions about the oe-core layer
Cc: [email protected]
Subject: Re: [OE-core] [PATCH 05/11] findutils: Fix compilation for x32 toolchain

Quoted 3 lines · Khem Raj
Quoted 2 lines · On Wed, Dec 7, 2011 at 9:48 PM, <[email protected]> wrote:

From: Nitin A Kamble <[email protected]>

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Work around gnulib time_t assumption in findutils for x32

if its a workaround can it be applied only to x32 with help of

overrides please

Its not a workaround, the patch looks like a generic reasonable fix to correct assumptions made by the program that aren't true?

Even though x32 caught the issue, the issue is not x32 specific. And also other arches are building fine with the change. So I think it is better to keep this patch in oecore.

Nitin

Quoted 11 lines

Cheers,

Richard

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#12 lore raw

Re: [PATCH 05/11] findutils: Fix compilation for x32 toolchain

Quoted 21 lines · Nitin A
Quoted 21 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Richard Purdie
Sent: Thursday, December 08, 2011 1:08 AM
To: Patches and discussions about the oe-core layer
Cc: [email protected]
Subject: Re: [OE-core] [PATCH 05/11] findutils: Fix compilation for x32 toolchain

Quoted 6 lines · Khem Raj
Quoted 3 lines · On Wed, Dec 7, 2011 at 9:48 PM,  <[email protected]> wrote:

From: Nitin A Kamble <[email protected]>

Work around gnulib time_t assumption in findutils for x32

if its a workaround can it be applied only to x32 with help of

overrides please

Quoted 7 lines
Quoted 2 lines

Its not a workaround, the patch looks like a generic reasonable fix to correct assumptions made by the program that aren't true?

Even though x32 caught the issue, the issue is not x32 specific. And also other arches are building fine with the change. So I think it is better to keep this patch in oecore.

OK then change the commit message its confusing.

author
#13 lore raw

Re: [PATCH 05/11] findutils: Fix compilation for x32 toolchain

Quoted 42 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Khem Raj
Sent: Thursday, December 08, 2011 12:45 PM
To: Patches and discussions about the oe-core layer
Cc: [email protected]
Subject: Re: [OE-core] [PATCH 05/11] findutils: Fix compilation for x32 toolchain

Quoted 5 lines · Nitin A
Quoted 5 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf

Of

Quoted 5 lines
Quoted 5 lines

Richard Purdie
Sent: Thursday, December 08, 2011 1:08 AM
To: Patches and discussions about the oe-core layer
Cc: [email protected]
Subject: Re: [OE-core] [PATCH 05/11] findutils: Fix compilation for

x32

Quoted 4 lines
Quoted 4 lines

toolchain

Quoted 1 line · Khem Raj

On Wed, Dec 7, 2011 at 9:48 PM,  <[email protected]> wrote:

Quoted 8 lines
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

From: Nitin A Kamble <[email protected]>

Work around gnulib time_t assumption in findutils for x32

if its a workaround can it be applied only to x32 with help of

overrides please

Its not a workaround, the patch looks like a generic reasonable fix

to

Quoted 3 lines
Quoted 1 line

correct assumptions made by the program that aren't true?

Quoted 7 lines
Quoted 1 line

Even though x32 caught the issue, the issue is not x32 specific. And

also

Quoted 1 line

other arches are building fine with the change. So I think it is

better

Quoted 1 line

to keep this patch in oecore.

OK then change the commit message its confusing.

Ok, I changed the commit message in the contrib. branch nitin/x32. Nitin

Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

author
#14 lore raw

PATCH 6/11 mesa: Properly create share library for x32

In reply to [email protected]

From: "H.J. Lu" <[email protected]>

Also pass -mx32 parameter to gcc to create create share library for x32.

Signed-off-by Nitin A Kamble <[email protected]>
Signed-off-by H.J. Lu <[email protected]>
---
 .../mesa/mesa/mesa_fix_for_x32.patch               |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)
meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch +17 -3
index 22a2339..dfd67fe 100644
@@ -4,10 +4,10 @@ get correct compiler options for x32 gcc.
 
 Received this patch from H.J. Lu <[email protected]>
 
-Signed-Off-By: Nitin A Kamble <[email protected]> 2011/12/01
+Signed-Off-By: Nitin A Kamble <[email protected]> 2011/12/06
 
---- Mesa-7.11/bin/mklib.x32	2011-11-30 14:29:14.976465283 -0800
-+++ Mesa-7.11/bin/mklib	2011-11-30 14:32:48.591525193 -0800
+--- Mesa-7.11/bin/mklib.x32	2011-12-06 13:15:17.968695114 -0800
++++ Mesa-7.11/bin/mklib	2011-12-06 13:17:13.872152249 -0800
 @@ -335,7 +335,12 @@ case $ARCH in
  	    set ${OBJECTS}
  	    ABI32=`file $1 | grep 32-bit`

@@ -22,3 +22,17 @@ Signed-Off-By: Nitin A Kamble <[email protected]> 2011/12/01
  	    fi
  
              if [ "${ALTOPTS}" ] ; then
+@@ -392,7 +397,12 @@ case $ARCH in
+ 	    set ${OBJECTS}
+ 	    ABI32=`file $1 | grep 32-bit`
+ 	    if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+-		OPTS="-m32 ${OPTS}"
++		ABIX32=`file $1 | grep x86-64`
++		if [ "${ABI32}" ]; then
++		    OPTS="-mx32 ${OPTS}"
++		else
++		    OPTS="-m32 ${OPTS}"
++		fi
+ 	    fi
+             if [ "${ALTOPTS}" ] ; then
+                 OPTS=${ALTOPTS}
Signature · 1 line
1.7.6.4
author
#15 lore raw

PATCH 7/11 pax: fix compilation with x32 toolchain

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

off_t is 8byte for x32. We need to check both _FILE_OFFSET_BITS and size of off_t to see if file offset is 64bit. This patch adds AC_CHECK_SIZEOF(off_t) and checks SIZEOF_OFF_T == 8.

Signed-off-by H.J. Lu <[email protected]>
Signed-off-by Nitin A Kamble <[email protected]>
---
 .../pax/pax/pax-3.4_fix_for_x32.patch              |  185 ++++++++++++++++++++
 meta/recipes-extended/pax/pax_3.4.bb               |    5 +-
 2 files changed, 188 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch
meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch new file +185 -0
new file mode 100644
index 0000000..11dfa0f
@@ -0,0 +1,185 @@
+UpstreamStatus: Pending
+
+Author: H.J. Lu <[email protected]>
+Date:   Tue Dec 6 10:34:53 2011 -0800
+
+    Fix pax-3.4 build for x32
+    
+    off_t is 8byte for x32.  We need to check both _FILE_OFFSET_BITS and
+    size of off_t to see if file offset is 64bit.  This patch adds
+    AC_CHECK_SIZEOF(off_t) and checks SIZEOF_OFF_T == 8.
+
+Signed-Off-By: Nitin A Kamble <[email protected]> 2011/12/06
+
+Index: pax-3.4/configure.in
+===================================================================
+--- pax-3.4.orig/configure.in
++++ pax-3.4/configure.in
+@@ -33,4 +33,7 @@ dnl Checks for header files.
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ 
++AC_CHECK_SIZEOF(off_t)
++AC_CHECK_SIZEOF(long)
++
+ AC_OUTPUT([Makefile lib/Makefile src/Makefile])
+Index: pax-3.4/src/ar_io.c
+===================================================================
+--- pax-3.4.orig/src/ar_io.c
++++ pax-3.4/src/ar_io.c
+@@ -378,7 +378,8 @@ ar_close(void)
+ 	 * could have written anything yet.
+ 	 */
+ 	if (frmt == NULL) {
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ 		(void)fprintf(listf, "%s: unknown format, %qu bytes skipped.\n",
+ #else
+ 		(void)fprintf(listf, "%s: unknown format, %lu bytes skipped.\n",
+@@ -391,7 +392,8 @@ ar_close(void)
+ 
+ 	if (strcmp(NM_CPIO, argv0) == 0)
+ 		(void)fprintf(listf,
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ 		    "%qu blocks\n",
+ #else
+ 		    "%lu blocks\n",
+@@ -399,7 +401,8 @@ ar_close(void)
+ 			(rdcnt ? rdcnt : wrcnt) / 5120);
+ 	else if (strcmp(NM_TAR, argv0) != 0)
+ 		(void)fprintf(listf,
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ 		    "%s: %s vol %d, %lu files, %qu bytes read, %qu bytes written.\n",
+ #else
+ 		    "%s: %s vol %d, %lu files, %lu bytes read, %lu bytes written.\n",
+Index: pax-3.4/src/cpio.c
+===================================================================
+--- pax-3.4.orig/src/cpio.c
++++ pax-3.4/src/cpio.c
+@@ -218,7 +218,8 @@ rd_ln_nm (ARCHD *arcn)
+ 	 */
+ 	if ((arcn->sb.st_size == 0) ||
+ 	    (arcn->sb.st_size >= (off_t) sizeof(arcn->ln_name))) {
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ 		paxwarn (1, "Cpio link name length is invalid: %qu",
+ 			 arcn->sb.st_size);
+ #else
+Index: pax-3.4/src/gen_subs.c
+===================================================================
+--- pax-3.4.orig/src/gen_subs.c
++++ pax-3.4/src/gen_subs.c
+@@ -133,7 +133,8 @@ ls_list (ARCHD *arcn, time_t now, FILE *
+    * print device id's for devices, or sizes for other nodes
+    */
+   if ((arcn->type == PAX_CHR) || (arcn->type == PAX_BLK))
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+     (void) fprintf (fp, "%4lu,%4lu ", (unsigned long) MAJOR (sbp->st_rdev),
+ 		    (unsigned long) MINOR (sbp->st_rdev));
+ #else
+@@ -142,7 +143,8 @@ ls_list (ARCHD *arcn, time_t now, FILE *
+ #endif
+   else
+     {
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+       (void) fprintf (fp, "%9qu ", sbp->st_size);
+ #else
+       (void) fprintf (fp, "%9lu ", sbp->st_size);
+@@ -334,7 +336,8 @@ ul_asc (u_long val, char *str, int len, 
+   return (0);
+ }
+ 
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ /*
+  * asc_uqd()
+  *	convert hex/octal character string into a u_quad_t. We do not have to
+Index: pax-3.4/src/options.c
+===================================================================
+--- pax-3.4.orig/src/options.c
++++ pax-3.4/src/options.c
+@@ -1545,7 +1545,8 @@ str_offt (char *val)
+   char *expr;
+   off_t num, t;
+ 
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+   num = strtoq (val, &expr, 0);
+   if ((num == LONG_LONG_MAX) || (num <= 0) || (expr == val))
+ #else
+Index: pax-3.4/src/tar.c
+===================================================================
+--- pax-3.4.orig/src/tar.c
++++ pax-3.4/src/tar.c
+@@ -58,7 +58,8 @@
+ static unsigned long tar_chksm (char *, int);
+ static char *name_split (char *, int);
+ static int ul_oct (u_long, char *, int, int);
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ static int uqd_oct (u_quad_t, char *, int, int);
+ #endif
+ 
+@@ -196,7 +197,8 @@ ul_oct (u_long val, register char *str, 
+   return (0);
+ }
+ 
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ /*
+  * uqd_oct()
+  *	convert an u_quad_t to an octal string. one of many oddball field
+@@ -427,7 +429,8 @@ tar_rd (ARCHD *arcn, char *buf)
+ 			       0xfff);
+   arcn->sb.st_uid = (uid_t) asc_ul (hd->uid, sizeof (hd->uid), OCT);
+   arcn->sb.st_gid = (gid_t) asc_ul (hd->gid, sizeof (hd->gid), OCT);
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+   arcn->sb.st_size = (off_t) asc_uqd (hd->size, sizeof (hd->size), OCT);
+ #else
+   arcn->sb.st_size = (off_t) asc_ul (hd->size, sizeof (hd->size), OCT);
+@@ -659,7 +662,8 @@ tar_wr (register ARCHD * arcn)
+        * data follows this file, so set the pad
+        */
+       hd->linkflag = AREGTYPE;
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+       if (uqd_oct ((u_quad_t) arcn->sb.st_size, hd->size,
+ 		   sizeof (hd->size), 1))
+ #else
+@@ -834,7 +838,8 @@ ustar_rd (ARCHD *arcn, char *buf)
+    */
+   arcn->sb.st_mode = (mode_t) (asc_ul (hd->mode, sizeof (hd->mode), OCT) &
+ 			       0xfff);
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+   arcn->sb.st_size = (off_t) asc_uqd (hd->size, sizeof (hd->size), OCT);
+ #else
+   arcn->sb.st_size = (off_t) asc_ul (hd->size, sizeof (hd->size), OCT);
+@@ -1081,7 +1086,8 @@ ustar_wr (register ARCHD * arcn)
+       else
+ 	hd->typeflag = REGTYPE;
+       arcn->pad = TAR_PAD (arcn->sb.st_size);
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++    || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+       if (uqd_oct ((u_quad_t) arcn->sb.st_size, hd->size,
+ 		   sizeof (hd->size), 3))
+ 	{
meta/recipes-extended/pax/pax_3.4.bb +3 -2
index e9c70d6..0c10688 100644
@@ -10,10 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4b0b674dfdc56daa3832d4069b820ea0 \
                     file://lib/vis.h;endline=40;md5=b283f759abd4a5ad7e014b80f51fc053"
 
 SECTION = "base"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.suse.com/pub/people/kukuk/pax/pax-${PV}.tar.bz2 \
-	file://fix_for_compile_with_gcc-4.6.0.patch"
+	file://fix_for_compile_with_gcc-4.6.0.patch \
+	file://pax-3.4_fix_for_x32.patch"
 
 SRC_URI[md5sum] = "fbd9023b590b45ac3ade95870702a0d6"
 SRC_URI[sha256sum] = "ac3c06048e02828077cf7757d3d142241429238893b91d529af29a2e8cc5623b"
Signature · 1 line
1.7.6.4
author
#16 lore raw

PATCH 8/11 siteinfo: create a new siteinfo for x32-linux

In reply to [email protected]

From: "H.J. Lu" <[email protected]>

X32 has different sizes for many types:

1. off_t and ino_t are 8 byte, instead of 4 byte.
2. pthread_mutex_t is 32byte, instead of 24 byte.

Signed-off-by Nitin A Kamble <[email protected]>
Signed-off-by H.J. Lu <[email protected]>
---
 meta/classes/siteinfo.bbclass |    2 +-
 meta/site/x32-linux           |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletions(-)
 create mode 100644 meta/site/x32-linux
meta/classes/siteinfo.bbclass +1 -1
index 604c6ba..bf6af2b 100644
@@ -76,7 +76,7 @@ def siteinfo_data(d):
         "x86_64-linux": "bit-64",
         "x86_64-linux-uclibc": "bit-64",
         "x86_64-linux-gnu": "bit-64 x86_64-linux",
-        "x86_64-linux-gnux32": "bit-32 ix86-common",
+        "x86_64-linux-gnux32": "bit-32 ix86-common x32-linux",
         "x86_64-mingw32": "bit-64",
     }
meta/site/x32-linux new file +9 -0
new file mode 100644
index 0000000..7ce6551
@@ -0,0 +1,9 @@
+# general
+ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=16}
+ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=8}
+ac_cv_sizeof_ino_t=${ac_cv_sizeof_ino_t=8}
+ac_cv_sizeof_dev_t=${ac_cv_sizeof_dev_t=8}
+ac_cv_sys_file_offset_bits=${ac_cv_sys_file_offset_bits=64}
+
+# glib
+glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=32}
Signature · 1 line
1.7.6.4
author
#17 lore raw

PATCH 9/11 libacpi: Use the cross strip instead of host strip

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

to avoid this build error on x32:

| strip: Unable to recognise the format of the input file `test-libacpi'
| make: *** [test-libacpi] Error 1
| ERROR: oe_runmake failed
Signed-off-by Nitin A Kamble <[email protected]>
---
 .../use_correct_strip_in_cross_environment.patch   |   23 ++++++++++++++++++++
 meta/recipes-bsp/libacpi/libacpi_0.2.bb            |    5 ++-
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch
meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch new file +23 -0
new file mode 100644
index 0000000..c9ad668
@@ -0,0 +1,23 @@
+UpstreamStatus: Pending
+
+Used the cross strip instead of host strip to avoid this build error:
+
+| strip: Unable to recognise the format of the input file `test-libacpi'
+| make: *** [test-libacpi] Error 1
+| ERROR: oe_runmake failed
+
+Signed-Off-By: Nitin A Kamble <[email protected]> 2011/12/07
+
+Index: libacpi-0.2/Makefile
+===================================================================
+--- libacpi-0.2.orig/Makefile
++++ libacpi-0.2/Makefile
+@@ -39,7 +39,7 @@ libacpi.so: ${OBJ}
+ test-libacpi: ${OBJ_test}
+ 	@echo LD $@
+ 	@${CC} -o $@ ${OBJ_test} ${LDFLAGS}
+-	@strip $@
++	@${STRIP} $@
+ 
+ install: all
+ 	@echo installing header to ${DESTDIR}${PREFIX}/include
meta/recipes-bsp/libacpi/libacpi_0.2.bb +3 -2
index 82fe8f8..2d98fae 100644
@@ -5,11 +5,12 @@ SECTION = "base"
 HOMEPAGE = "http://www.ngolde.de/libacpi.html"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fec17f82f16630adf2dfb7d2a46f21c5"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \
 	   file://makefile-fix.patch \
-	   file://libacpi_fix_for_x32.patch "
+	   file://libacpi_fix_for_x32.patch \
+	   file://use_correct_strip_in_cross_environment.patch"
 
 SRC_URI[md5sum] = "05b53dd7bead66dda35fec502b91066c"
 SRC_URI[sha256sum] = "13086e31d428b9c125954d48ac497b754bbbce2ef34ea29ecd903e82e25bad29"
Signature · 1 line
1.7.6.4
author
#18 lore raw

PATCH 10/11 openssl-1.0.0e: Update x32 Configure

In reply to [email protected]

From: "H.J. Lu" <[email protected]>

Make linux-x32 as close to linux-x86_64 as possible:

1. Add -mx32 -DMD32_REG_T=int.
2. Changed to -O3.
3. Remove -pipe -g -feliminate-unused-debug-types.
4. Remove -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS.
5. Add :::x32 for multilib.

Signed-off-by Nitin A Kamble <[email protected]>
Signed-off-by H.J. Lu <[email protected]>
---
 .../openssl-1.0.0e/openssl_fix_for_x32.patch       |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-connectivity/openssl/openssl-1.0.0e/openssl_fix_for_x32.patch +1 -1
index 10de986..2dbcd01 100644
@@ -14,7 +14,7 @@ Index: openssl-1.0.0e/Configure
  "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "linux-x86_64",	"gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-+"linux-x32",	"gcc:-DL_ENDIAN 	-DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-x32", "gcc:-mx32 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32",
  "linux-s390x",	"gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
  #### SPARC Linux setups
  # Ray Miller <[email protected]> has patiently
Signature · 1 line
1.7.6.4
author
#19 lore raw

PATCH 11/11 x86 tune: fix TUNE_PKGARCH definition for proper PACKAGE_ARCH

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

rpmbuild can not handle the PACKAGE_ARCH of these kinds:

	x86_64-x32, core2-64, core2-64-x32

With these kinds of PACKAGE_ARCH the --target parameter of rpmbuild becomes like: core2-64-x32-poky-linux-gnux32 ; And rpmbuild extracts %_target (arch) wrongly as core2 generating these kinds of rpms with incorrect filenames: zip-3.0-r0.core2.rpm

So this commit fixes the issue by making PACKAGE_ARCH like this:

	x86_64_x32, core2_64, core2_64_x32

Now --target parameter of rpmbuild becomes like:
core2_64_x32-poky-linux-gnux32 ; And rpmbuild extracts %_target (arch) correctly as core2_64_x32 generating these kinds of rpms with correct
filenames: zip-3.0-r0.core2_64_x32.rpm

Signed-off-by Nitin A Kamble <[email protected]>
---
 meta/conf/machine/include/ia32/arch-ia32.inc |    4 ++--
 meta/conf/machine/include/tune-core2.inc     |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
meta/conf/machine/include/ia32/arch-ia32.inc +2 -2
index ee91983..0931c26 100644
@@ -45,5 +45,5 @@ PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86_64"
 AVAILTUNES += "x86-64-x32"
 TUNE_FEATURES_tune-x86-64-x32 ?= "mx32"
 BASE_LIB_tune-x86-64-x32 ?= "libx32"
-PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64-x32"
-TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}"
+PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64_x32"
+TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "_x32", "", d)}"
meta/conf/machine/include/tune-core2.inc +3 -3
index 565a39c..7cde511 100644
@@ -1,5 +1,5 @@
 DEFAULTTUNE ?= "core2"
-TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "core2", "core2-64", d)}"
+TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "core2", "core2_64", d)}"
 
 require conf/machine/include/tune-i586.inc
 

@@ -16,9 +16,9 @@ PACKAGE_EXTRA_ARCHS_tune-core2 = "${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486 i586
 AVAILTUNES += "core2-64"
 TUNE_FEATURES_tune-core2-64 ?= "${TUNE_FEATURES_tune-x86-64} core2"
 BASE_LIB_tune-core2-64 ?= "lib64"
-PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2-64"
+PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2_64"
 
 AVAILTUNES += "core2-64-x32"
 TUNE_FEATURES_tune-core2-64-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} core2"
 BASE_LIB_tune-core2-64-x32 ?= "libx32"
-PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-64-x32"
+PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2_64_x32"
Signature · 1 line
1.7.6.4
#20 lore raw

Re: [PATCH 01/11] gst-fluendo.inc: remove unneccessary hack

In reply to [email protected]
Quoted 21 lines · On Wed, Dec 7, 2011 at 9:48 PM, <[email protected]> wrote:

From: Nitin A Kamble <[email protected]>

This fixes bug: [YOCTO #1403]

the custom definition of CC was causing build isuses with x32 toolchain. And also I found out that the hack is not neccessary anymore. the affected gst-fluendo-mpegdemux recipe builds fine without the CC hack.

Signed-off-by Nitin A Kamble <[email protected]>

---
 meta/recipes-multimedia/gstreamer/gst-fluendo.inc |    4 ----

 1 files changed, 0 insertions(+), 4 deletions(-)
meta/recipes-multimedia/gstreamer/gst-fluendo.inc +0 -0
index 203bdba..8b24cf7 100644
@@ -12,7 +12,3 @@ FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"

 FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"

 EXTRA_OECONF = "--disable-debug --disable-valgrind"

meta/recipes-multimedia/gstreamer/gst-fluendo.inc FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" · line 18

Quoted 4 lines
meta/recipes-multimedia/gstreamer/gst-fluendo.inc +0 -4
-
-# Hack to get STAGING_LIBDIR into the linker path when building
-CC = "${CCACHE} ${HOST_PREFIX}gcc -L${STAGING_LIBDIR}"
-

this needs a PR bump

author
#21 lore raw

Re: [PATCH 01/11] gst-fluendo.inc: remove unneccessary hack

Quoted 38 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Khem Raj
Sent: Wednesday, December 07, 2011 11:37 PM
To: Patches and discussions about the oe-core layer
Cc: [email protected]
Subject: Re: [OE-core] [PATCH 01/11] gst-fluendo.inc: remove unneccessary hack

Quoted 5 lines · On Wed, Dec 7, 2011 at 9:48 PM, <[email protected]> wrote:

From: Nitin A Kamble <[email protected]>

This fixes bug: [YOCTO #1403]

the custom definition of CC was causing build isuses with x32

toolchain.

Quoted 2 lines

And also I found out that the hack is not neccessary anymore. the affected gst-fluendo-mpegdemux recipe builds fine without the CC

hack.

Review

Quoted 7 lines
Signed-off-by Nitin A Kamble <[email protected]>

---
 meta/recipes-multimedia/gstreamer/gst-fluendo.inc |    4 ----

 1 files changed, 0 insertions(+), 4 deletions(-)
(quoted diff) +0 -0

b/meta/recipes-multimedia/gstreamer/gst-fluendo.inc

meta/recipes-multimedia/gstreamer/gst-fluendo.inc FILES_${PN}-dbg += "${libdir}/gstreamer-

Quoted 4 lines

index 203bdba..8b24cf7 100644

meta/recipes-multimedia/gstreamer/gst-fluendo.inc +0 -0
@@ -12,7 +12,3 @@ FILES_${PN}-dbg += "${libdir}/gstreamer-

0.10/.debug"

Quoted 1 line

 FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la

${libdir}/gstreamer-0.10/*.a"

Quoted 1 line
Quoted 7 lines

meta/recipes-multimedia/gstreamer/gst-fluendo.inc FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" · line 18

Quoted 5 lines

 EXTRA_OECONF = "--disable-debug --disable-valgrind"

meta/recipes-multimedia/gstreamer/gst-fluendo.inc +0 -4
-
-# Hack to get STAGING_LIBDIR into the linker path when building
-CC = "${CCACHE} ${HOST_PREFIX}gcc -L${STAGING_LIBDIR}"
-

this needs a PR bump

I purposely did not bump PR here, because it does not change output of the recipe.

Nitin

Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#22 lore raw

Re: [PATCH 01/11] gst-fluendo.inc: remove unneccessary hack

Quoted 46 lines · Nitin A
Quoted 38 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Khem Raj
Sent: Wednesday, December 07, 2011 11:37 PM
To: Patches and discussions about the oe-core layer
Cc: [email protected]
Subject: Re: [OE-core] [PATCH 01/11] gst-fluendo.inc: remove unneccessary hack

Quoted 5 lines · On Wed, Dec 7, 2011 at 9:48 PM,  <[email protected]> wrote:

From: Nitin A Kamble <[email protected]>

This fixes bug: [YOCTO #1403]

the custom definition of CC was causing build isuses with x32

toolchain.

Quoted 2 lines

And also I found out that the hack is not neccessary anymore. the affected gst-fluendo-mpegdemux recipe builds fine without the CC

hack.

Review

Quoted 7 lines
Signed-off-by Nitin A Kamble <[email protected]>

---
 meta/recipes-multimedia/gstreamer/gst-fluendo.inc |    4 ----

 1 files changed, 0 insertions(+), 4 deletions(-)
(quoted diff) +0 -0

b/meta/recipes-multimedia/gstreamer/gst-fluendo.inc

meta/recipes-multimedia/gstreamer/gst-fluendo.inc FILES_${PN}-dbg += "${libdir}/gstreamer-

Quoted 4 lines

index 203bdba..8b24cf7 100644

meta/recipes-multimedia/gstreamer/gst-fluendo.inc +0 -0
@@ -12,7 +12,3 @@ FILES_${PN}-dbg += "${libdir}/gstreamer-

0.10/.debug"

Quoted 1 line

 FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la

${libdir}/gstreamer-0.10/*.a"

Quoted 1 line
Quoted 7 lines

meta/recipes-multimedia/gstreamer/gst-fluendo.inc FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" · line 18

Quoted 5 lines

 EXTRA_OECONF = "--disable-debug --disable-valgrind"

meta/recipes-multimedia/gstreamer/gst-fluendo.inc +0 -4
-
-# Hack to get STAGING_LIBDIR into the linker path when building
-CC = "${CCACHE} ${HOST_PREFIX}gcc -L${STAGING_LIBDIR}"
-

this needs a PR bump

Quoted 2 lines

I purposely did not bump PR here, because it does not change output of the recipe.

hmmm whole CC is changed if that was used before then package will compile with different flags
wont that change the content?

Applied
#23 lore raw
In reply to [email protected]
Quoted 51 lines · On 12/07/2011 09:48 PM, [email protected] wrote:

From: Nitin A Kamble<[email protected]>

These commits fix various recipe building issues with x32 toolchain.

mdadm& gst-fluendo commits are reworked based on the feedback received earlier.

Thanks,
Nitin

The following changes since commit f17e0ae38b2e6c4cbe7f0f9d76c3e1a386335fd1:

   conf/machine: Don't poke around providers which aren't machine specific/safe (2011-12-06 22:47:09 +0000)

are available in the git repository at:

   git://git.pokylinux.org/poky-contrib nitin/x32
   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/x32

H.J. Lu (3):
mesa: Properly create share library for x32
siteinfo: create a new siteinfo for x32-linux
openssl-1.0.0e: Update x32 Configure

Nitin A Kamble (8):
gst-fluendo.inc: remove unneccessary hack
mdadm: Make custom CC definition conditional
pulseaudio: fix compilation with x32 toolchain
libacpi: Fix libdir for x32
findutils: Fix compilation for x32 toolchain
pax: fix compilation with x32 toolchain
libacpi: Use the cross strip instead of host strip x86 tune: fix TUNE_PKGARCH definition for proper PACKAGE_ARCH

  meta/classes/siteinfo.bbclass                      |    2 +-
  meta/conf/machine/include/ia32/arch-ia32.inc       |    4 +-
  meta/conf/machine/include/tune-core2.inc           |    6 +-
  .../libacpi/files/libacpi_fix_for_x32.patch        |   47 ++++
  .../use_correct_strip_in_cross_environment.patch   |   23 ++
  meta/recipes-bsp/libacpi/libacpi_0.2.bb            |    6 +-
  .../openssl-1.0.0e/openssl_fix_for_x32.patch       |    2 +-
  .../findutils-4.4.2/findutils_fix_for_x32.patch    |   40 ++++
  meta/recipes-extended/findutils/findutils_4.4.2.bb |    5 +-
  .../mdadm/files/mdadm-3.2.2_fix_for_x32.patch      |   25 +++
  meta/recipes-extended/mdadm/mdadm_3.2.2.bb         |    4 +-
  .../pax/pax/pax-3.4_fix_for_x32.patch              |  185 ++++++++++++++++
  meta/recipes-extended/pax/pax_3.4.bb               |    5 +-
  .../mesa/mesa/mesa_fix_for_x32.patch               |   20 ++-
  meta/recipes-multimedia/gstreamer/gst-fluendo.inc  |    4 -
  .../pulseaudio/pulseaudo_fix_for_x32.patch         |  225 ++++++++++++++++++++
  .../pulseaudio/pulseaudio_1.1.bb                   |    3 +-
  meta/site/x32-linux                                |    9 +
  18 files changed, 592 insertions(+), 23 deletions(-)
Quoted 8 lines

create mode 100644 meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch create mode 100644 meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch create mode 100644 meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_x32.patch create mode 100644 meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch create mode 100644 meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudo_fix_for_x32.patch create mode 100644 meta/site/x32-linux

Merged into OE-Core (from updated branch)

Thanks
Sau!