libsdl2: Fix patch after upgrade

(From OE-Core rev: 8e94bd650c3480dce6d33b7e7b5af0a440757c29) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
author: Richard Purdie <richard.purdie@linuxfoundation.org> 2016-02-22 11:53:59 +0000
committer: Richard Purdie <richard.purdie@linuxfoundation.org> 2016-02-22 20:42:47 +0000
commit: b879aed6aadc9d2f55e5cf79b899a5f8fa01d56d (patch)
tree: 617784623cc38250b3ca8e34a71d76d9d929ad75
parent: 3d4f71d2d9106f436b7aa48001631d4021d799c3 (diff)
download: poky-b879aed6aadc9d2f55e5cf79b899a5f8fa01d56d.tar.gz
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.4.orig/configure.in
-+++ SDL2-2.0.3/configure.in
+++ SDL2-2.0.4/configure.in
-@@ -3136,23 +3136,23 @@ done
+@@ -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
author	Richard Purdie <richard.purdie@linuxfoundation.org>	2016-02-22 11:53:59 +0000
committer	Richard Purdie <richard.purdie@linuxfoundation.org>	2016-02-22 20:42:47 +0000
commit	b879aed6aadc9d2f55e5cf79b899a5f8fa01d56d (patch)
tree	617784623cc38250b3ca8e34a71d76d9d929ad75
parent	3d4f71d2d9106f436b7aa48001631d4021d799c3 (diff)
download	poky-b879aed6aadc9d2f55e5cf79b899a5f8fa01d56d.tar.gz

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
10	2016/1/16	10	2016/1/16
11		11
12		12
13	Index: SDL2-2.0.3/configure.in	13	Index: SDL2-2.0.4/configure.in
14	===================================================================	14	===================================================================
15	--- SDL2-2.0.3.orig/configure.in	15	--- SDL2-2.0.4.orig/configure.in
16	+++ SDL2-2.0.3/configure.in	16	+++ SDL2-2.0.4/configure.in
17	@@ -3136,23 +3136,23 @@ done	17	@@ -3464,23 +3464,23 @@ done
18		18
19	VERSION_OBJECTS=`echo $VERSION_SOURCES`	19	VERSION_OBJECTS=`echo $VERSION_SOURCES`
20	VERSION_DEPENDS=`echo $VERSION_SOURCES`	20	VERSION_DEPENDS=`echo $VERSION_SOURCES`
@@ -32,7 +32,7 @@ Index: SDL2-2.0.3/configure.in
32	SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" \| sed "s,\\([[^ ]]\\)/\\([[^ ]]\\)\\.c,\\\\	32	SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" \| sed "s,\\([[^ ]]\\)/\\([[^ ]]\\)\\.c,\\\\
33	-\\$(objects)/\\2.o: \\1/\\2.c\\\\	33	-\\$(objects)/\\2.o: \\1/\\2.c\\\\
34	+\\$(objects)/\\2.lo: \\1/\\2.c\\\\	34	+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
35	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`	35	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
36		36
37	SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`	37	SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
38	SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`	38	SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
@@ -41,6 +41,6 @@ Index: SDL2-2.0.3/configure.in
41	SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" \| sed "s,\\([[^ ]]\\)/\\([[^ ]]\\)\\.c,\\\\	41	SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" \| sed "s,\\([[^ ]]\\)/\\([[^ ]]\\)\\.c,\\\\
42	-\\$(objects)/\\2.o: \\1/\\2.c\\\\	42	-\\$(objects)/\\2.o: \\1/\\2.c\\\\
43	+\\$(objects)/\\2.lo: \\1/\\2.c\\\\	43	+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
44	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`	44	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
45		45
46	# Set runtime shared library paths as needed	46	# Set runtime shared library paths as needed