* [gentoo-commits] gentoo-x86 commit in media-libs/libsdl2/files: libsdl2-2.0.0-static-libs.patch
@ 2013-08-29 2:04 Julian Ospald (hasufell)
0 siblings, 0 replies; 2+ messages in thread
From: Julian Ospald (hasufell) @ 2013-08-29 2:04 UTC (permalink / raw
To: gentoo-commits
hasufell 13/08/29 02:04:23
Modified: libsdl2-2.0.0-static-libs.patch
Log:
respect CFLAGS in linking invocations
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.2 media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch?r1=1.1&r2=1.2
Index: libsdl2-2.0.0-static-libs.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libsdl2-2.0.0-static-libs.patch 28 Aug 2013 21:36:52 -0000 1.1
+++ libsdl2-2.0.0-static-libs.patch 29 Aug 2013 02:04:23 -0000 1.2
@@ -19,17 +19,17 @@
$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+ $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
$(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
- $(AR) cru $@ $(SDLMAIN_OBJECTS)
- $(RANLIB) $@
-+ $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
$(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
- $(AR) cru $@ $(SDLTEST_OBJECTS)
- $(RANLIB) $@
-+ $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
install: all install-bin install-hdrs install-lib install-data
install-bin:
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libsdl2/files: libsdl2-2.0.0-static-libs.patch
@ 2013-08-28 21:36 Julian Ospald (hasufell)
0 siblings, 0 replies; 2+ messages in thread
From: Julian Ospald (hasufell) @ 2013-08-28 21:36 UTC (permalink / raw
To: gentoo-commits
hasufell 13/08/28 21:36:52
Added: libsdl2-2.0.0-static-libs.patch
Log:
initial import wrt #480826
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.1 media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch?rev=1.1&content-type=text/plain
Index: libsdl2-2.0.0-static-libs.patch
===================================================================
diff -r c1563f514b5b Makefile.in
--- a/Makefile.in Thu Apr 04 11:35:22 2013 -0400
+++ b/Makefile.in Wed Apr 17 14:17:09 2013 -0400
@@ -33,10 +33,10 @@
OBJECTS = @OBJECTS@
VERSION_OBJECTS = @VERSION_OBJECTS@
-SDLMAIN_TARGET = libSDL2main.a
+SDLMAIN_TARGET = libSDL2main.la
SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
-SDLTEST_TARGET = libSDL2_test.a
+SDLTEST_TARGET = libSDL2_test.la
SDLTEST_OBJECTS = @SDLTEST_OBJECTS@
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
@@ -122,15 +122,13 @@
.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)
$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
$(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
- $(AR) cru $@ $(SDLMAIN_OBJECTS)
- $(RANLIB) $@
+ $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
$(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
- $(AR) cru $@ $(SDLTEST_OBJECTS)
- $(RANLIB) $@
+ $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
install: all install-bin install-hdrs install-lib install-data
install-bin:
@@ -151,10 +149,8 @@
install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
- $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
- $(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
- $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
- $(RANLIB) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
install-data:
$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal
$(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4
diff -r c1563f514b5b configure.in
--- a/configure.in Thu Apr 04 11:35:22 2013 -0400
+++ b/configure.in Wed Apr 17 14:17:09 2013 -0400
@@ -2659,23 +2659,23 @@
VERSION_OBJECTS=`echo $VERSION_SOURCES`
VERSION_DEPENDS=`echo $VERSION_SOURCES`
-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'`
VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\
-\\$(objects)/\\2.o: \\1/\\2.rc\\\\
+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\
\\$(WINDRES) \\$< \\$@,g"`
SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
-SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
+SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
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"`
SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
-SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
+SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
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"`
# Set runtime shared library paths as needed
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-29 2:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-29 2:04 [gentoo-commits] gentoo-x86 commit in media-libs/libsdl2/files: libsdl2-2.0.0-static-libs.patch Julian Ospald (hasufell)
-- strict thread matches above, loose matches on Subject: below --
2013-08-28 21:36 Julian Ospald (hasufell)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox