summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Birchinger <joker@gentoo.org>2010-01-14 06:41:30 +0000
committerChristian Birchinger <joker@gentoo.org>2010-01-14 06:41:30 +0000
commitcabca1297e22f8be0a7a47d18269c94616f14082 (patch)
tree666f0a244c1c81f2095de37f6ca0964835281812 /media-libs/dumb/files
parentAdded an as-needed patch from bug #300515. (diff)
downloadhistorical-cabca1297e22f8be0a7a47d18269c94616f14082.tar.gz
historical-cabca1297e22f8be0a7a47d18269c94616f14082.tar.bz2
historical-cabca1297e22f8be0a7a47d18269c94616f14082.zip
Unified PIC and as-needed patches to make maintenance easier.
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'media-libs/dumb/files')
-rw-r--r--media-libs/dumb/files/dumb-0.9.3-PIC-as-needed.patch (renamed from media-libs/dumb/files/dumb-0.9.2-PIC.patch)4
-rw-r--r--media-libs/dumb/files/dumb-0.9.3-as-needed.patch12
2 files changed, 2 insertions, 14 deletions
diff --git a/media-libs/dumb/files/dumb-0.9.2-PIC.patch b/media-libs/dumb/files/dumb-0.9.3-PIC-as-needed.patch
index dc3009310b77..f44e8fb6c526 100644
--- a/media-libs/dumb/files/dumb-0.9.2-PIC.patch
+++ b/media-libs/dumb/files/dumb-0.9.3-PIC-as-needed.patch
@@ -65,8 +65,8 @@ diff -Naur dumb.orig/make/Makefile.inc dumb/make/Makefile.inc
$(CORE_LIB_FILE): $(CORE_OBJECTS)
- $(AR) rs $@ $^
-+ $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) -lm $^
++ $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) $^ -lm
$(ALLEGRO_LIB_FILE): $(ALLEGRO_OBJECTS)
- $(AR) rs $@ $^
-+ $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) -lm $^
++ $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) $^ -ldumb
diff --git a/media-libs/dumb/files/dumb-0.9.3-as-needed.patch b/media-libs/dumb/files/dumb-0.9.3-as-needed.patch
deleted file mode 100644
index 6426544e60f6..000000000000
--- a/media-libs/dumb/files/dumb-0.9.3-as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dumb-0.9.3.orig/make/Makefile.inc 2010-01-11 13:47:27.426643138 +0100
-+++ dumb-0.9.3/make/Makefile.inc 2010-01-11 13:50:42.488400053 +0100
-@@ -33,7 +33,7 @@
- $(CC) $(CFLAGS) $(WFLAGS_ALLEGRO) -c -o $@ $<
-
- $(CORE_LIB_FILE): $(CORE_OBJECTS)
-- $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) -lm $^
-+ $(CC) -shared -o $@ $(LDFLAGS) -Wl,-shared,-soname,$(shell basename $@) $^ -lm
-
- $(ALLEGRO_LIB_FILE): $(ALLEGRO_OBJECTS)
-- $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) -lm $^
-+ $(CC) -shared -o $@ $(LDFLAGS) -Wl,-shared,-soname,$(shell basename $@) $^ -lm