]> code.ossystems Code Review - openembedded-core.git/commitdiff
libsdl2: Fix patch after upgrade
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 22 Feb 2016 11:53:59 +0000 (11:53 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 22 Feb 2016 20:42:34 +0000 (20:42 +0000)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-graphics/libsdl2/libsdl2/linkage.patch

index 08315e7fc858b13bc7ebfeec65379461c76652f5..60185b131f522ccec6ca7c0c6e69c9bcfea5f5fd 100644 (file)
@@ -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