[oe-commits] [openembedded-core] 02/06: libsdl2: Fix patch after upgrade

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit f274724a410667a381be69dcba0a9a95feeb085f
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon Feb 22 11:53:59 2016 +0000

    libsdl2: Fix patch after upgrade
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-graphics/libsdl2/libsdl2/linkage.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch b/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch
index 08315e7..60185b1 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.