| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | When building use the libtool intermediate .lo files instead of explicitly using |
| 2 | the .o files. Under libtool foo.lo is the libtool intermediate wrapper, foo.o is |
| 3 | a static build, and .libs/foo.o is a shared build. |
| 4 | |
| 5 | If static libraries have been disabled globally then libtool won't generate them |
| 6 | and explicit references to foo.o won't be satisfied. |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | RP |
| 10 | 2016/1/16 |
| 11 | |
| 12 | |
| 13 | Index: SDL2-2.0.4/configure.in |
| 14 | =================================================================== |
| 15 | --- SDL2-2.0.4.orig/configure.in |
| 16 | +++ SDL2-2.0.4/configure.in |
| 17 | @@ -3464,23 +3464,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 | \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --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 | \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` |
| 45 | |
| 46 | # Set runtime shared library paths as needed |