From 9fd5a8cb38a376633eb0bd7981548179b6bea25d Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 15 Jul 2010 21:27:50 -0400 Subject: libgles-omap3: pass rpath-link properly instead of adding more -lX libs As it now needs to link against xcb as part of X server libs. Signed-off-by: Denys Dmytriyenko --- recipes/powervr-drivers/libgles-omap3.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes/powervr-drivers') diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc index f250de0230..0b5ffee04b 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 = "r5" +PR = "r6" COMPATIBLE_MACHINE = "(dm3730-am3715-evm|am3517-evm|beagleboard|cm-t35|igep0020|omap3-pandora|omap3-touchbook|omap3evm|omapzoom|omapzoom2|overo|palmpre)" @@ -61,7 +61,6 @@ 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 @@ -69,7 +68,8 @@ do_configure() { } # Force in GNU_HASH and paths to libs -TARGET_CC_ARCH += " ${TARGET_LINK_HASH_STYLE} -Wl,-rpath-link,${BINLOCATION} -L${BINLOCATION}" +TARGET_CC_ARCH += " ${TARGET_LINK_HASH_STYLE} -Wl,-rpath-link,${BINLOCATION} -L${BINLOCATION} \ +-L${STAGING_DIR_TARGET}${libdir} -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir}" PARALLEL_MAKE = "" do_compile() { -- cgit 1.2.3-korg