| 1 |
hasufell 14/01/01 00:26:03 |
| 2 |
|
| 3 |
Modified: libsdl2-2.0.1-static-libs.patch |
| 4 |
Log: |
| 5 |
modifications to static-libs.patch by Daniel Scharrer wrt #1431 (upstream tracker) |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 media-libs/libsdl2/files/libsdl2-2.0.1-static-libs.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.1-static-libs.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.1-static-libs.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.1-static-libs.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: libsdl2-2.0.1-static-libs.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.1-static-libs.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- libsdl2-2.0.1-static-libs.patch 25 Oct 2013 16:03:19 -0000 1.1 |
| 23 |
+++ libsdl2-2.0.1-static-libs.patch 1 Jan 2014 00:26:03 -0000 1.2 |
| 24 |
@@ -1,5 +1,6 @@ |
| 25 |
---- a/Makefile.in |
| 26 |
-+++ b/Makefile.in |
| 27 |
+diff -r c1563f514b5b Makefile.in |
| 28 |
+--- a/Makefile.in Thu Apr 04 11:35:22 2013 -0400 |
| 29 |
++++ b/Makefile.in Wed Apr 17 14:17:09 2013 -0400 |
| 30 |
@@ -33,10 +33,10 @@ |
| 31 |
OBJECTS = @OBJECTS@ |
| 32 |
VERSION_OBJECTS = @VERSION_OBJECTS@ |
| 33 |
@@ -12,8 +13,8 @@ |
| 34 |
+SDLTEST_TARGET = libSDL2_test.la |
| 35 |
SDLTEST_OBJECTS = @SDLTEST_OBJECTS@ |
| 36 |
|
| 37 |
- SRC_DIST = acinclude Android.mk autogen.sh BUGS build-scripts configure configure.in COPYING CREDITS debian include INSTALL Makefile.minimal Makefile.in README* sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test TODO VisualC.html VisualC WhatsNew Xcode Xcode-iOS |
| 38 |
-@@ -122,15 +122,13 @@ |
| 39 |
+ SRC_DIST = *.txt acinclude Android.mk autogen.sh android-project build-scripts cmake configure configure.in debian include Makefile.* sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test VisualC.html VisualC Xcode Xcode-iOS |
| 40 |
+@@ -123,15 +123,13 @@ |
| 41 |
.PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) |
| 42 |
|
| 43 |
$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) |
| 44 |
@@ -23,16 +24,16 @@ |
| 45 |
$(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) |
| 46 |
- $(AR) cru $@ $(SDLMAIN_OBJECTS) |
| 47 |
- $(RANLIB) $@ |
| 48 |
-+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
| 49 |
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static |
| 50 |
|
| 51 |
$(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) |
| 52 |
- $(AR) cru $@ $(SDLTEST_OBJECTS) |
| 53 |
- $(RANLIB) $@ |
| 54 |
-+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) |
| 55 |
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static |
| 56 |
|
| 57 |
install: all install-bin install-hdrs install-lib install-data |
| 58 |
install-bin: |
| 59 |
-@@ -151,10 +149,8 @@ |
| 60 |
+@@ -152,10 +150,8 @@ |
| 61 |
install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET) |
| 62 |
$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir) |
| 63 |
$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET) |
| 64 |
@@ -45,9 +46,19 @@ |
| 65 |
install-data: |
| 66 |
$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal |
| 67 |
$(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4 |
| 68 |
---- a/configure.in |
| 69 |
-+++ b/configure.in |
| 70 |
-@@ -2659,23 +2659,23 @@ |
| 71 |
+diff -r c1563f514b5b configure.in |
| 72 |
+--- a/configure.in Thu Apr 04 11:35:22 2013 -0400 |
| 73 |
++++ b/configure.in Wed Apr 17 14:17:09 2013 -0400 |
| 74 |
+@@ -2597,7 +2597,7 @@ |
| 75 |
+ have_loadso=yes |
| 76 |
+ fi |
| 77 |
+ # Set up the system libraries we need |
| 78 |
+- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -luuid -XCClinker -static-libgcc" |
| 79 |
++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion -Wl,-luuid -XCClinker -static-libgcc" |
| 80 |
+ # The Windows platform requires special setup |
| 81 |
+ VERSION_SOURCES="$srcdir/src/main/windows/*.rc" |
| 82 |
+ SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c" |
| 83 |
+@@ -2873,23 +2873,23 @@ |
| 84 |
|
| 85 |
VERSION_OBJECTS=`echo $VERSION_SOURCES` |
| 86 |
VERSION_DEPENDS=`echo $VERSION_SOURCES` |
| 87 |
@@ -55,8 +66,9 @@ |
| 88 |
+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'` |
| 89 |
VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\ |
| 90 |
-\\$(objects)/\\2.o: \\1/\\2.rc\\\\ |
| 91 |
+- \\$(WINDRES) \\$< \\$@,g"` |
| 92 |
+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\ |
| 93 |
- \\$(WINDRES) \\$< \\$@,g"` |
| 94 |
++ \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"` |
| 95 |
|
| 96 |
SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` |
| 97 |
SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` |
Archives