diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2010-05-01 16:53:01 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2010-05-01 16:53:01 -0400 |
| commit | bbea152f1d8702c39003263a0102af9f3a28a034 (patch) | |
| tree | 67d367a8ef59ec53bbe84fc90e4582e8e3ce1f86 /recipes/powervr-drivers | |
| parent | 17768e64cc5c066a49a00f72cc33db03a06ad137 (diff) | |
libgles-omap3: fix 3 build issues with external CSL toolchain
Fix the following 3 build issues:
1. X11ROOT is used by GFX SDK Makefiles as a root of X11 installation and
results in -I$(X11ROOT)/include and -L$(X11ROOT)/lib in CFLAGS/LDFLAGS.
Set it to ${STAGING_DIR_HOST}/usr instead of ${STAGING_INCDIR}. Otherwise
the build fails with the following error messages:
PVRShellOS.h:18:22: error: X11/Xlib.h: No such file or directory
PVRShellOS.h:19:23: error: X11/Xutil.h: No such file or directory
2. Set TOOLCHAIN variable used in GFX SDK Makefiles to point to the toolchain
location. Fixes the following message, among others:
ld: warning: library search path "/lib" is unsafe for cross-compilation
3. Add libXdmcp to the list of linked X11 libraries, in addition to libX11
and libXau. Link stage failure:
ld: warning: libXdmcp.so.6, needed by libX11.so, not found
libX11.so: undefined reference to `XdmcpWrap'
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Diffstat (limited to 'recipes/powervr-drivers')
| -rw-r--r-- | recipes/powervr-drivers/libgles-omap3.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc index ba6677e8c1..e1a28bc855 100644 --- a/recipes/powervr-drivers/libgles-omap3.inc +++ b/recipes/powervr-drivers/libgles-omap3.inc @@ -1,7 +1,7 @@ DESCRIPTION = "libGLES for the omap3" LICENSE = "proprietary-binary" -PR = "r2" +PR = "r3" COMPATIBLE_MACHINE = "(dm3730-am3715-evm|am3517-evm|beagleboard|cm-t35|igep0020|omap3-pandora|omap3-touchbook|omap3evm|omapzoom|omapzoom2|overo|palmpre)" @@ -59,6 +59,7 @@ do_configure() { # Due to recursive make PLAT_* isn't always passed down correctly, so use sed to fix those for mak in $(find ${S} -name "*.mak") ; do sed -i -e s:arm-none-linux-gnueabi-:${TARGET_PREFIX}:g $mak + sed -i -e 's:-lX11 -lXau:-lX11 -lXau -lXdmcp:g' $mak done # clear out old stuff @@ -70,7 +71,8 @@ TARGET_CC_ARCH += " ${TARGET_LINK_HASH_STYLE} -Wl,-rpath-link,${BINLOCATION} -L$ PARALLEL_MAKE = "" do_compile() { - export X11ROOT="${STAGING_INCDIR}" + export X11ROOT="${STAGING_DIR_HOST}/usr" + export TOOLCHAIN="${TOOLCHAIN_PATH}" export PLATFORM="LinuxOMAP3" export PLAT_CC="${CC}" |