r11852 - in packages/trunk/alex4/debian: . patches
Peter Pentchev
roam-guest at alioth.debian.org
Wed Mar 9 20:00:23 UTC 2011
Author: roam-guest
Date: 2011-03-09 20:00:18 +0000 (Wed, 09 Mar 2011)
New Revision: 11852
Modified:
packages/trunk/alex4/debian/changelog
packages/trunk/alex4/debian/patches/unix-port.patch
Log:
Order the linker arguments properly.
Closes: #617465
Submitted by: Tarun Kumar Mall <c2tarun at gmail.com>
Modified: packages/trunk/alex4/debian/changelog
===================================================================
--- packages/trunk/alex4/debian/changelog 2011-03-09 17:55:08 UTC (rev 11851)
+++ packages/trunk/alex4/debian/changelog 2011-03-09 20:00:18 UTC (rev 11852)
@@ -1,3 +1,18 @@
+alex4 (1.1-4) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Update the unix-port patch a bit:
+ - place the libraries at the end of the linker invocation line to
+ fix the build on Ubuntu natty with the binutils-gold linker.
+ I couldn't reproduce the FTBFS on Debian with
+ binutils-gold-2.21.0.20110302-1, but it seems a really sensible
+ change to make anyway :)
+ Closes: #617465
+ - put the aldumb library before the Allegro libraries that it
+ depends on
+
+ -- Peter Pentchev <roam at ringlet.net> Wed, 09 Mar 2011 14:14:04 +0200
+
alex4 (1.1-3) unstable; urgency=low
[ Paul Wise ]
Modified: packages/trunk/alex4/debian/patches/unix-port.patch
===================================================================
--- packages/trunk/alex4/debian/patches/unix-port.patch 2011-03-09 17:55:08 UTC (rev 11851)
+++ packages/trunk/alex4/debian/patches/unix-port.patch 2011-03-09 20:00:18 UTC (rev 11852)
@@ -452,7 +452,7 @@
+PREFIX = /usr/local
+DATADIR = $(PREFIX)/share/$(TARGET)
+CFLAGS = -g -Wall -Wno-deprecated-declarations -O2
-+LDFLAGS = `allegro-config --libs` -laldmb -ldumb
++LIBS = -laldmb -ldumb `allegro-config --libs`
+DEFINES = -DDATADIR=\"$(DATADIR)/\"
+OBJS = actor.o edit.o map.o player.o shooter.o unix.o \
+ bullet.o hisc.o options.o script.o timer.o \
@@ -460,7 +460,7 @@
+TARGET = alex4
+
+$(TARGET): $(OBJS)
-+ $(CC) $(LDFLAGS) -o $@ $^
++ $(CC) -o $@ $^ $(LIBS)
+
+%.o: %.c
+ $(CC) $(CFLAGS) $(DEFINES) -o $@ -c $<
More information about the Pkg-games-commits
mailing list