mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

libsdl-ttf: Update configure.patch

Browse Source 
Update configure.patch to modernise configure.in, in particular passing the
foreign option to automake. The other changes are other modernisations
that were needed to make that.

Also use rm -f so that do_configure can rerun in the prepend.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Richard Purdie
2014-07-17 14:47:00 +01:00
committed by Martin Jansa
parent e129bf3b52
commit 578663d035
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/libsdl-ttf/libsdl-ttf-2.0.10/configure.patch
+42 -3
View File
@@ -1,8 +1,38 @@
Index: SDL_ttf-2.0.10/configure.in
===================================================================
--- SDL_ttf-2.0.10.orig/configure.in 2010-10-15 10:54:51.392730531 +0200
+++ SDL_ttf-2.0.10/configure.in 2010-10-15 10:55:06.382727473 +0200
@@ -25,6 +25,8 @@
--- SDL_ttf-2.0.10.orig/configure.in 2009-10-12 23:06:38.000000000 +0000
+++ SDL_ttf-2.0.10/configure.in 2014-07-17 12:33:34.011662505 +0000
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(README)
dnl Set various version strings - taken gratefully from the GTk sources
@@ -11,12 +10,19 @@
# if backwards compatibility has been broken,
# set BINARY_AGE and INTERFACE_AGE to 0.
-MAJOR_VERSION=2
-MINOR_VERSION=0
-MICRO_VERSION=10
+m4_define([sdlttf_major_version],[2])
+m4_define([sdlttf_minor_version],[0])
+m4_define([sdlttf_micro_version],[10])
+m4_define([sdlttf_version], [sdlttf_major_version.sdlttf_minor_version.sdlttf_micro_version])
+
+AC_INIT([SDL_ttf], [sdlttf_version])
+
+MAJOR_VERSION=sdlttf_major_version
+MINOR_VERSION=sdlttf_minor_version
+MICRO_VERSION=sdlttf_micro_version
INTERFACE_AGE=0
BINARY_AGE=10
-VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
+VERSION=sdlttf_version
AC_SUBST(MAJOR_VERSION)
AC_SUBST(MINOR_VERSION)
@@ -25,6 +31,8 @@
AC_SUBST(BINARY_AGE)
AC_SUBST(VERSION)
@@ -11,3 +41,12 @@ Index: SDL_ttf-2.0.10/configure.in
# libtool versioning
LT_INIT([win32-dll])
@@ -42,7 +50,7 @@
AC_CANONICAL_HOST
dnl Setup for automake
-AM_INIT_AUTOMAKE(SDL_ttf, $VERSION)
+AM_INIT_AUTOMAKE([foreign])
dnl Check for tools
AC_PROG_LIBTOOL
meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb
+1 -1
View File
@@ -24,7 +24,7 @@ do_configure_prepend() {
MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
for i in ${MACROS}; do
rm ${S}/acinclude/$i
rm -f ${S}/acinclude/$i
done
}