From 49e37bec0b7a8cef5ea1f4d63612ea7171096d91 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Tue, 9 Aug 2016 16:58:29 +0200
Subject: meta-openembedded layer bbappends

Move the appends on recipe's which are not in an essential required layer
into a target layer specific directory and add them only if said layer
is active in build/conf/bblayers.conf.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Stefan Agner <stefan.agner@toradex.com>
---
 .../recipes-benchmark/glmark2/glmark2_%.bbappend   |  7 ++
 .../0001-mesa-glut-fix-building-on-arm.patch       | 89 ++++++++++++++++++++++
 .../recipes-graphics/mesa/mesa-glut_%.bbappend     |  3 +
 3 files changed, 99 insertions(+)
 create mode 100644 openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
 create mode 100644 openembedded-layer/recipes-graphics/mesa/mesa-glut/0001-mesa-glut-fix-building-on-arm.patch
 create mode 100644 openembedded-layer/recipes-graphics/mesa/mesa-glut_%.bbappend

(limited to 'openembedded-layer')

diff --git a/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
new file mode 100644
index 0000000..287ef0f
--- /dev/null
+++ b/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
@@ -0,0 +1,7 @@
+# T20/T30: build it only for OpenGL ES on top of X11
+PACKAGECONFIG_tegra = "x11-gles2"
+PACKAGE_ARCH_tegra = "${MACHINE_ARCH}"
+
+# TK1: build it only for OpenGL ES on top of X11
+PACKAGECONFIG_tegra124 = "x11-gl x11-gles2"
+PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}"
diff --git a/openembedded-layer/recipes-graphics/mesa/mesa-glut/0001-mesa-glut-fix-building-on-arm.patch b/openembedded-layer/recipes-graphics/mesa/mesa-glut/0001-mesa-glut-fix-building-on-arm.patch
new file mode 100644
index 0000000..3068af1
--- /dev/null
+++ b/openembedded-layer/recipes-graphics/mesa/mesa-glut/0001-mesa-glut-fix-building-on-arm.patch
@@ -0,0 +1,89 @@
+From 051b05b30dc0fce0585ee16d1d1a7f6f959794a6 Mon Sep 17 00:00:00 2001
+From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Date: Tue, 14 Jun 2016 14:55:48 +0200
+Subject: [PATCH] mesa-glut: fix building on arm
+
+Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+---
+ bin/mklib    | 30 ------------------------------
+ configure.ac |  9 ---------
+ 2 files changed, 39 deletions(-)
+
+diff --git a/bin/mklib b/bin/mklib
+index 2c7ed38..e29a404 100755
+--- a/bin/mklib
++++ b/bin/mklib
+@@ -330,14 +330,6 @@ case $ARCH in
+ 	    ;;
+ 	    esac
+ 
+-	    # Check if objects are 32-bit and we're running in 64-bit
+-	    # environment.  If so, pass -m32 flag to linker.
+-	    set ${OBJECTS}
+-	    ABI32=`file $1 | grep 32-bit`
+-	    if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+-		OPTS="-m32 ${OPTS}"
+-	    fi
+-
+             if [ "${ALTOPTS}" ] ; then
+                 OPTS=${ALTOPTS}
+             fi
+@@ -387,17 +379,6 @@ case $ARCH in
+ 		# exptmp is removed below
+ 	    fi
+ 
+-	    # Check if objects are 32-bit and we're running in 64-bit
+-	    # environment.  If so, pass -m32 flag to linker.
+-	    set ${OBJECTS}
+-	    ABI32=`file $1 | grep 32-bit`
+-	    if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+-		OPTS="-m32 ${OPTS}"
+-	    fi
+-            if [ "${ALTOPTS}" ] ; then
+-                OPTS=${ALTOPTS}
+-            fi
+-
+ 	    if [ x${PATCH} = "x" ] ; then
+ 		VERSION="${MAJOR}.${MINOR}"
+ 	    else
+@@ -457,17 +438,6 @@ case $ARCH in
+ 	    if [ ${LINK} = "ld" -o ${LINK} = "cc" -o ${LINK} = "CC" ] ; then
+ 		# SunOS tools, -G to make shared libs
+ 		OPTS="-G"
+-	    else
+-		# gcc linker
+-		# Check if objects are 32-bit and we're running in 64-bit
+-		# environment.  If so, pass -m32 flag to linker.
+-		set ${OBJECTS}
+-		ABI32=`file $1 | grep 32-bit`
+-		if [ "${ABI32}" ] ; then
+-		    OPTS="-m32 -shared -Wl,-Bdynamic"
+-		else
+-		    OPTS="-m64 -shared -Wl,-Bdynamic"
+-		fi
+ 	    fi
+ 
+ 	    # If using Sun C++ compiler, need to tell it not to add runpaths
+diff --git a/configure.ac b/configure.ac
+index d42b5c6..af40093 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -204,15 +204,6 @@ AC_ARG_ENABLE([32-bit],
+     [enable_32bit="$enableval"],
+     [enable_32bit=auto]
+ )
+-if test "x$enable_32bit" = xyes; then
+-    if test "x$GCC" = xyes; then
+-        CFLAGS="$CFLAGS -m32"
+-        ARCH_FLAGS="$ARCH_FLAGS -m32"
+-    fi
+-    if test "x$GXX" = xyes; then
+-        CXXFLAGS="$CXXFLAGS -m32"
+-    fi
+-fi
+ AC_ARG_ENABLE([64-bit],
+     [AS_HELP_STRING([--enable-64-bit],
+         [build 64-bit libraries @<:@default=auto@:>@])],
+-- 
+2.5.5
+
diff --git a/openembedded-layer/recipes-graphics/mesa/mesa-glut_%.bbappend b/openembedded-layer/recipes-graphics/mesa/mesa-glut_%.bbappend
new file mode 100644
index 0000000..06e17bf
--- /dev/null
+++ b/openembedded-layer/recipes-graphics/mesa/mesa-glut_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/mesa-glut:"
+
+SRC_URI_append_arm = " file://0001-mesa-glut-fix-building-on-arm.patch"
-- 
cgit v1.2.3