diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-08-31 21:39:58 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-09-05 13:30:55 +0200 |
commit | 291946d2501be1dc2549304460e3e288408dfbfe (patch) | |
tree | 88db6752ffa4452973cf81d2ac22d3d92e89a78b /meta-oe/recipes-graphics | |
parent | 0d4f922350d91de97dd20954db3aad43c0b8de98 (diff) | |
download | meta-openembedded-291946d2501be1dc2549304460e3e288408dfbfe.tar.gz |
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,--as-needed -lts -lm conftest.c >&5
/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@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r-- | meta-oe/recipes-graphics/directfb/directfb.inc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc index 46e0838f7..fc272bd28 100644 --- a/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/meta-oe/recipes-graphics/directfb/directfb.inc | |||
@@ -9,7 +9,7 @@ LICENSE = "LGPLv2.1" | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" |
10 | 10 | ||
11 | HOMEPAGE = "http://directfb.org" | 11 | HOMEPAGE = "http://directfb.org" |
12 | DEPENDS = "jpeg libpng freetype zlib tslib sysfsutils" | 12 | DEPENDS = "jpeg libpng freetype zlib sysfsutils" |
13 | 13 | ||
14 | SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.gz \ | 14 | SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.gz \ |
15 | file://configurefix.patch \ | 15 | file://configurefix.patch \ |
@@ -24,7 +24,7 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g | |||
24 | 24 | ||
25 | S = "${WORKDIR}/DirectFB-${PV}" | 25 | S = "${WORKDIR}/DirectFB-${PV}" |
26 | 26 | ||
27 | LDFLAGS_append =" -lts -lm" | 27 | LDFLAGS_append = " -lm" |
28 | 28 | ||
29 | # Workaround for linking issues seen with armv7a + gold | 29 | # Workaround for linking issues seen with armv7a + gold |
30 | LDFLAGS_append_arm = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 30 | LDFLAGS_append_arm = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
@@ -33,11 +33,14 @@ BINCONFIG = "${bindir}/directfb-config" | |||
33 | 33 | ||
34 | inherit autotools binconfig-disabled pkgconfig | 34 | inherit autotools binconfig-disabled pkgconfig |
35 | 35 | ||
36 | PACKAGECONFIG ??= "" | 36 | PACKAGECONFIG ??= "linuxinput" |
37 | PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" | 37 | PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" |
38 | PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm" | 38 | PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm" |
39 | PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" | 39 | PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" |
40 | PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" | 40 | PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" |
41 | PACKAGECONFIG[tslib] = "--with-inputdrivers=tslib,,tslib" | ||
42 | PACKAGECONFIG[linuxinput] = "--with-inputdrivers=linuxinput,," | ||
43 | PACKAGECONFIG[noinput] = "--with-inputdrivers=none,," | ||
41 | 44 | ||
42 | EXTRA_OECONF = "\ | 45 | EXTRA_OECONF = "\ |
43 | --with-gfxdrivers=none \ | 46 | --with-gfxdrivers=none \ |