Package: pathogen
Version: 1.1.1-2
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch



In Ubuntu, the attached patch was applied to achieve the following:


  * 01_Makefile.diff: update to fix FTBFS with ld that defaults to --as-needed
    (LP: #770915)


Thanks for considering the patch.


-- System Information:
Debian Release: squeeze/sid
  APT prefers natty-updates
  APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u pathogen-1.1.1/debian/patches/01_makefile.diff pathogen-1.1.1/debian/patches/01_makefile.diff
--- pathogen-1.1.1/debian/patches/01_makefile.diff
+++ pathogen-1.1.1/debian/patches/01_makefile.diff
@@ -1,7 +1,7 @@
 Index: pathogen-1.1.1/Makefile
 ===================================================================
---- pathogen-1.1.1.orig/Makefile	2008-04-16 15:37:49.000000000 -0400
-+++ pathogen-1.1.1/Makefile	2008-04-16 15:39:56.000000000 -0400
+--- pathogen-1.1.1.orig/Makefile	2004-07-12 10:05:00.000000000 -0600
++++ pathogen-1.1.1/Makefile	2011-09-12 22:49:14.964921411 -0600
 @@ -6,8 +6,8 @@
  # $Id: Makefile,v 1.2 2004/07/12 16:05:50 tonic Exp $
  # $Revision: 1.2 $
@@ -16,13 +16,15 @@
-@@ -17,6 +17,12 @@
- pathogen: $(objects)
- 	$(CXX) $(LDFLAGS) -o $@ $^
+@@ -15,7 +15,13 @@
+ LDFLAGS := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lGLU -lGL
  
+ pathogen: $(objects)
+-	$(CXX) $(LDFLAGS) -o $@ $^
++	$(CXX) -o $@ $^ $(LDFLAGS)
++
 +install:
 +	mkdir -p $(DESTDIR)/usr/games
 +	mkdir -p $(DESTDIR)/usr/share/pathogen
 +	install -o root -g games -m 644 data/* $(DESTDIR)/usr/share/pathogen
 +	install -o root -g games -m 755 pathogen $(DESTDIR)/usr/games
-+
+ 
  .PHONY: clean
  clean:
- 	$(RM) pathogen $(objects)
diff -u pathogen-1.1.1/debian/changelog pathogen-1.1.1/debian/changelog

Reply via email to