[SCM] pcsxr packaging branch, master, updated. debian/1.9.92-3-5-g20382f3
Andrey Rahmatullin
wrar at wrar.name
Fri Apr 20 14:37:35 UTC 2012
The following commit has been merged in the master branch:
commit 494cc3a67e81816662dc15da123e1f4bf065d367
Author: Andrey Rahmatullin <wrar at wrar.name>
Date: Fri Apr 20 20:18:26 2012 +0600
Fix FTBFS #669500 by reordering libraries in the link command.
diff --git a/debian/patches/fix-pcsx-link.patch b/debian/patches/fix-pcsx-link.patch
new file mode 100644
index 0000000..a27c8da
--- /dev/null
+++ b/debian/patches/fix-pcsx-link.patch
@@ -0,0 +1,17 @@
+Description: Order libraries on the link command properly
+Origin: upstream, http://pcsxr.codeplex.com/SourceControl/changeset/changes/61512
+Forwarded: not-needed
+Last-Update: 2012-04-20
+
+diff --git a/gui/Makefile.am b/gui/Makefile.am
+index 50e9e8f..5c12795 100644
+--- a/gui/Makefile.am
++++ b/gui/Makefile.am
+@@ -20,5 +20,5 @@ pcsx_SOURCES = \
+ AboutDlg.c
+
+ pcsx_LDADD = \
+- $(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst \
+- ../libpcsxcore/libpcsxcore.a
++ ../libpcsxcore/libpcsxcore.a \
++ $(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst
diff --git a/debian/patches/series b/debian/patches/series
index 80eca37..39b6be3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
fix-i386-exec-stack.patch
fix-armel-ftbfs.diff
disable-ppc-auto-dynarec.patch
+fix-pcsx-link.patch
--
pcsxr packaging
More information about the Pkg-games-commits
mailing list