Fixed compilation on amd64, thanks to Torgny Nyblom

(Portage version: 2.1.3_rc5)

3 files changed, 69 insertions, 3 deletions

diff --git a/app-misc/endeavour/ChangeLog b/app-misc/endeavour/ChangeLog
index 99edf89cc6a2..0bc09f7d3438 100644
--- a/app-misc/endeavour/ChangeLog
+++ b/app-misc/endeavour/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/endeavour
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/ChangeLog,v 1.25 2007/01/06 00:23:32 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/ChangeLog,v 1.26 2007/06/24 14:42:05 angelos Exp $
+
+  24 Jun 2007; Christoph Mende <angelos@gentoo.org>
+  +files/endeavour-2.7.3-amd64-gtk-flags.patch, endeavour-2.7.3.ebuild:
+  Fixed compilation on amd64, thanks to Torgny Nyblom
 
   06 Jan 2007; Danny van Dyk <kugelfang@gentoo.org> -endeavour-2.3.6.ebuild:
   QA: Removed unused versions.
diff --git a/app-misc/endeavour/endeavour-2.7.3.ebuild b/app-misc/endeavour/endeavour-2.7.3.ebuild
index 9a23f3dbc6a5..f4ba2a28966f 100644
--- a/app-misc/endeavour/endeavour-2.7.3.ebuild
+++ b/app-misc/endeavour/endeavour-2.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.7.3.ebuild,v 1.1 2006/12/04 21:56:35 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.7.3.ebuild,v 1.2 2007/06/24 14:42:05 angelos Exp $
 
 inherit eutils
 
@@ -22,6 +22,13 @@ DEPEND="app-arch/bzip2
 	virtual/opengl
 	joystick? ( media-libs/libjsw )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-amd64-gtk-flags.patch"
+}
+
 src_compile() {
 	./configure Linux --prefix=/usr $(use_enable joystick libjsw) || die
 	emake || die "Parallel make failed"
diff --git a/app-misc/endeavour/files/endeavour-2.7.3-amd64-gtk-flags.patch b/app-misc/endeavour/files/endeavour-2.7.3-amd64-gtk-flags.patch
new file mode 100644
index 000000000000..9a31276e1cd3
--- /dev/null
+++ b/app-misc/endeavour/files/endeavour-2.7.3-amd64-gtk-flags.patch
@@ -0,0 +1,55 @@
+--- endeavour2/lib/Makefile.old	2006-11-06 09:00:00.000000000 +0100
++++ endeavour2/lib/Makefile	2007-06-04 17:34:50.040582389 +0200
+@@ -4,7 +4,7 @@
+ # Compiler flags
+ #
+ CFLAGS   = -Wall -O2 -g -fPIC \
+-           `glib-config --cflags`
++           `glib-config --cflags` `gtk-config --cflags`
+ CPPFLAGS = -D__cplusplus -Dc_plusplus
+ 
+ 
+@@ -42,14 +42,14 @@
+ LIB_CFG_BIN = endeavour2-config
+ LIB_CFG_MAN = endeavour2-config.1.bz2
+ LIB         = libendeavour2.so
+-OBJ_C   = $(SRC_C:.c=.o)
+-OBJ_CPP = $(SRC_CPP:.cpp=.o)
++OBJ_C   = $(SRC_C:.c=.o) $(SRC_C_P:.c=.o)
++OBJ_CPP = $(SRC_CPP:.cpp=.o) $(SRC_CPP_P:.cpp=.o)
+ .c.o:
+ 	@echo "Compiling module $*.o"
+-	@+$(CC) -c $*.c $(CFLAGS)
++	@+$(CC) -c $*.c $(CFLAGS) -o $*.o
+ .cpp.o:
+ 	@echo "Compiling module $*.o"
+-	@+$(CPP) -c $*.cpp $(CFLAGS) $(CPPFLAGS)
++	@+$(CPP) -c $*.cpp $(CFLAGS) $(CPPFLAGS) -o $*.o
+ 
+ 
+ # Programs and their flags
+@@ -104,6 +104,8 @@
+ 	@-$(LS) $(LSFLAGS) $(LIB)
+ 
+ prebuild:
++	@echo "Removing $(SRC_C_P:.c=.o) $(SRC_CPP_P:.C=.o) (force recompile with -fPIC)"
++	@${RM} ${RMFLAGS} $(SRC_C_P:.c=.o) $(SRC_CPP_P:.cpp=.o)
+ 	@echo "Building library \"$(LIB)\"..."
+ 
+ postbuild:
+--- endeavour2/lib/Makefile.srclist.old	2006-11-06 09:00:00.000000000 +0100
++++ endeavour2/lib/Makefile.srclist	2007-06-04 17:30:13.000000000 +0200
+@@ -22,11 +22,11 @@
+         edv_recycle.c edv_window.c
+ 
+ # Add source C files from Endeavour 2
+-SRC_C += ../cfg.c ../cfg_fio.c ../edv_interps.c			\
++SRC_C_P = ../cfg.c ../cfg_fio.c ../edv_interps.c			\
+          ../edv_recbin_index.c ../edv_recbin_stat.c		\
+          ../edv_recycled_obj.c ../edv_utils.c
+ 
+ 
+ # Source C++ files
+-SRC_CPP = ../disk.cpp ../fio.cpp ../prochandle.cpp		\
++SRC_CPP_P = ../disk.cpp ../fio.cpp ../prochandle.cpp		\
+           ../string.cpp