summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/linkage.patch46
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb3
2 files changed, 48 insertions, 1 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch b/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch
new file mode 100644
index 0000000000..08315e7fc8
--- /dev/null
+++ b/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch
@@ -0,0 +1,46 @@
1When building use the libtool intermediate .lo files instead of explicitly using
2the .o files. Under libtool foo.lo is the libtool intermediate wrapper, foo.o is
3a static build, and .libs/foo.o is a shared build.
4
5If static libraries have been disabled globally then libtool won't generate them
6and explicit references to foo.o won't be satisfied.
7
8Upstream-Status: Pending
9RP
102016/1/16
11
12
13Index: SDL2-2.0.3/configure.in
14===================================================================
15--- SDL2-2.0.3.orig/configure.in
16+++ SDL2-2.0.3/configure.in
17@@ -3136,23 +3136,23 @@ done
18
19 VERSION_OBJECTS=`echo $VERSION_SOURCES`
20 VERSION_DEPENDS=`echo $VERSION_SOURCES`
21-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
22+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'`
23 VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\
24-\\$(objects)/\\2.o: \\1/\\2.rc\\\\
25+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\
26 \\$(WINDRES) \\$< \\$@,g"`
27
28 SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
29 SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
30-SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
31+SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
32 SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
33-\\$(objects)/\\2.o: \\1/\\2.c\\\\
34+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
35 \\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
36
37 SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
38 SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
39-SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
40+SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
41 SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
42-\\$(objects)/\\2.o: \\1/\\2.c\\\\
43+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
44 \\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
45
46 # Set runtime shared library paths as needed
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
index 61d9c1e68d..0dc1a85f91 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
@@ -14,7 +14,8 @@ PROVIDES = "virtual/libsdl2"
14 14
15DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" 15DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
16 16
17SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz" 17SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
18 file://linkage.patch"
18 19
19S = "${WORKDIR}/SDL2-${PV}" 20S = "${WORKDIR}/SDL2-${PV}"
20 21