mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-17 04:37:19 +00:00
Code Issues Projects Releases Wiki Activity

libsdl2-ttf: Check for x11 and opengl in distro features

Browse Source 
when X11 is not in distro features it tries to link with
libGL which does not exist and compile fails

Add a patch to add foreign option to AUTOMAKE_OPTIONS
which lets it configure and relax automake rules to not
check for some GNU specific files

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2017-05-09 00:57:10 -07:00
committed by Martin Jansa
parent c804426102
commit c9a07b63e3
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch
+13
View File
@@ -0,0 +1,13 @@
Index: SDL2_ttf-2.0.14/Makefile.am
===================================================================
--- SDL2_ttf-2.0.14.orig/Makefile.am
+++ SDL2_ttf-2.0.14/Makefile.am
@@ -1,6 +1,8 @@
# Makefile.am for the SDL truetype font loading library and viewer
lib_LTLIBRARIES = libSDL2_ttf.la
+AUTOMAKE_OPTIONS = foreign
+
libSDL2_ttfincludedir = $(includedir)/SDL2
libSDL2_ttfinclude_HEADERS = \
SDL_ttf.h
meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb
+7 -4
View File
@@ -1,23 +1,25 @@
SUMMARY = "Simple DirectMedia Layer truetype font library" SUMMARY = "Simple DirectMedia Layer truetype font library"
SECTION = "libs" SECTION = "libs"
DEPENDS = "virtual/libsdl2 freetype" DEPENDS = "virtual/libsdl2 freetype virtual/libgl"
LICENSE = "Zlib" LICENSE = "Zlib"
LIC_FILES_CHKSUM = "file://COPYING.txt;md5=cb33e7c4df9fbde389f149ad6bc93ce5" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=cb33e7c4df9fbde389f149ad6bc93ce5"
SRC_URI = " \ SRC_URI = " \
http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz \ http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz \
file://use.pkg-config.for.freetype2.patch \ file://use.pkg-config.for.freetype2.patch \
file://automake_foreign.patch \
" "
SRC_URI[md5sum] = "e53c05e1e7f1382c316afd6c763388b1" SRC_URI[md5sum] = "e53c05e1e7f1382c316afd6c763388b1"
SRC_URI[sha256sum] = "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276" SRC_URI[sha256sum] = "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276"
S = "${WORKDIR}/SDL2_ttf-${PV}" S = "${WORKDIR}/SDL2_ttf-${PV}"
inherit autotools pkgconfig inherit autotools pkgconfig distro_features_check
# links to libGL.so
REQUIRED_DISTRO_FEATURES += "x11 opengl"
do_configure_prepend() { do_configure_prepend() {
touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog
# Removing these files fixes a libtool version mismatch. # Removing these files fixes a libtool version mismatch.
MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
@@ -25,3 +27,4 @@ do_configure_prepend() {
rm -f ${S}/acinclude/$i rm -f ${S}/acinclude/$i
done done
} }
ASNEEDED = ""