summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-22 11:53:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-22 20:42:34 +0000
commit8e94bd650c3480dce6d33b7e7b5af0a440757c29 (patch)
tree08ea7426ccb2980b42ea1d994af39f6ad73a9b39
parent070253835c45c9eff7ad045d99277d13f9d03173 (diff)
downloadopenembedded-core-contrib-8e94bd650c3480dce6d33b7e7b5af0a440757c29.tar.gz
openembedded-core-contrib-8e94bd650c3480dce6d33b7e7b5af0a440757c29.tar.bz2
openembedded-core-contrib-8e94bd650c3480dce6d33b7e7b5af0a440757c29.zip
libsdl2: Fix patch after upgrade
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/linkage.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch b/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch
index 08315e7fc8..60185b131f 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch
+++ b/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch
@@ -10,11 +10,11 @@ RP
2016/1/16
-Index: SDL2-2.0.3/configure.in
+Index: SDL2-2.0.4/configure.in
===================================================================
---- SDL2-2.0.3.orig/configure.in
-+++ SDL2-2.0.3/configure.in
-@@ -3136,23 +3136,23 @@ done
+--- SDL2-2.0.4.orig/configure.in
++++ SDL2-2.0.4/configure.in
+@@ -3464,23 +3464,23 @@ done
VERSION_OBJECTS=`echo $VERSION_SOURCES`
VERSION_DEPENDS=`echo $VERSION_SOURCES`
@@ -32,7 +32,7 @@ Index: SDL2-2.0.3/configure.in
SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
-\\$(objects)/\\2.o: \\1/\\2.c\\\\
+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
- \\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
+ \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
@@ -41,6 +41,6 @@ Index: SDL2-2.0.3/configure.in
SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
-\\$(objects)/\\2.o: \\1/\\2.c\\\\
+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
- \\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
+ \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
# Set runtime shared library paths as needed