[oe-commits] [meta-openembedded] 51/51: directfb: add PACKAGECONFIG for inputdrivers

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master
in repository meta-openembedded.

commit 291946d2501be1dc2549304460e3e288408dfbfe
Author: Martin Jansa <Martin.Jansa at gmail.com>
AuthorDate: Wed Aug 31 21:39:58 2016 +0200

    directfb: add PACKAGECONFIG for inputdrivers
    
    * move tslib dependency to PACKAGECONFIG and don't add it explicitly
      through LDFLAGS, because it breaks the build now when tslib was removed
      from oe-core:
    configure:4543: checking whether the C compiler works
    configure:4565: x86_64-oe-linux-gcc  -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/OE/build/shr-core/tmp-glibc/sysroots/qemux86-64 -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/OE/build/shr-core/tmp-glibc/work/core2-64-oe-linux/directfb/1.7.7-r0=/usr/src/debug/directfb/1.7.7-r0 -fdebug-prefix-map=/OE/build/shr-core/tmp-glibc/sysroots/x86_64-linux= -fdebug-prefix-map=/OE/build/shr-core/tmp-glibc/sysroots/qemux86-64=  -Wl,-O1 -Wl,--hash-style=gnu -Wl,-- [...]
    /OE/build/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/6.2.0/ld: cannot find -lts
    collect2: error: ld returned 1 exit status
    configure:4569: $? = 1
    configure:4607: result: no
    configure: failed program was:
    | /* confdefs.h */
    | #define PACKAGE_NAME ""
    | #define PACKAGE_TARNAME ""
    | #define PACKAGE_VERSION ""
    | #define PACKAGE_STRING ""
    | #define PACKAGE_BUGREPORT ""
    | #define PACKAGE_URL ""
    | #define DIRECTFB_VERSION "1.7.7"
    | #define DIRECTFB_VERSION_VENDOR ""
    | /* end confdefs.h.  */
    |
    | int
    | main ()
    | {
    |
    |   ;
    |   return 0;
    | }
    configure:4612: error: in `/OE/build/shr-core/tmp-glibc/work/core2-64-oe-linux/directfb/1.7.7-r0/build':
    configure:4614: error: C compiler cannot create executables
    See `config.log' for more details
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-oe/recipes-graphics/directfb/directfb.inc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc
index 46e0838..fc272bd 100644
--- a/meta-oe/recipes-graphics/directfb/directfb.inc
+++ b/meta-oe/recipes-graphics/directfb/directfb.inc
@@ -9,7 +9,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589"
 
 HOMEPAGE = "http://directfb.org"
-DEPENDS = "jpeg libpng freetype zlib tslib sysfsutils"
+DEPENDS = "jpeg libpng freetype zlib sysfsutils"
 
 SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.gz \
            file://configurefix.patch \
@@ -24,7 +24,7 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g
 
 S = "${WORKDIR}/DirectFB-${PV}"
 
-LDFLAGS_append =" -lts -lm"
+LDFLAGS_append = " -lm"
 
 # Workaround for linking issues seen with armv7a + gold
 LDFLAGS_append_arm = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
@@ -33,11 +33,14 @@ BINCONFIG = "${bindir}/directfb-config"
 
 inherit autotools binconfig-disabled pkgconfig
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "linuxinput"
 PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper"
 PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm"
 PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff"
 PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
+PACKAGECONFIG[tslib] = "--with-inputdrivers=tslib,,tslib"
+PACKAGECONFIG[linuxinput] = "--with-inputdrivers=linuxinput,,"
+PACKAGECONFIG[noinput] = "--with-inputdrivers=none,,"
 
 EXTRA_OECONF = "\
   --with-gfxdrivers=none \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.