From 695c7685137ee2f0f44bd8a2781167020183e56c Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Thu, 28 Feb 2008 03:24:24 +0000 Subject: add patch for --as-needed support from Harald van Dijk (bug #211679) (Portage version: 2.1.4.4) --- games-fps/duke3d/ChangeLog | 6 +- games-fps/duke3d/duke3d-20040817-r2.ebuild | 12 ++-- .../duke3d/files/duke3d-20040817-as-needed.patch | 74 ++++++++++++++++++++++ 3 files changed, 86 insertions(+), 6 deletions(-) create mode 100644 games-fps/duke3d/files/duke3d-20040817-as-needed.patch (limited to 'games-fps/duke3d') diff --git a/games-fps/duke3d/ChangeLog b/games-fps/duke3d/ChangeLog index 9ee4475213bf..ca22518a97e7 100644 --- a/games-fps/duke3d/ChangeLog +++ b/games-fps/duke3d/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/duke3d # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.28 2008/01/04 20:59:41 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.29 2008/02/28 03:24:23 mr_bones_ Exp $ + + 28 Feb 2008; Michael Sterrett + +files/duke3d-20040817-as-needed.patch, duke3d-20040817-r2.ebuild: + add patch for --as-needed support from Harald van Dijk (bug #211679) 04 Jan 2008; Michael Sterrett duke3d-20040817-r2.ebuild: diff --git a/games-fps/duke3d/duke3d-20040817-r2.ebuild b/games-fps/duke3d/duke3d-20040817-r2.ebuild index 7e3d3bfcddce..2ee3679c7a68 100644 --- a/games-fps/duke3d/duke3d-20040817-r2.ebuild +++ b/games-fps/duke3d/duke3d-20040817-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817-r2.ebuild,v 1.4 2008/01/04 20:59:41 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817-r2.ebuild,v 1.5 2008/02/28 03:24:23 mr_bones_ Exp $ fromcvs=0 ECVS_MODULE="duke3d" @@ -77,11 +77,13 @@ src_unpack() { # configure duke3d cd "${S}/source" - epatch "${FILESDIR}/${PV}-credits.patch" # need to sync features with build engine - epatch "${FILESDIR}/${PV}-duke3d-makefile-opts.patch" - epatch "${FILESDIR}/${PV}-gcc34.patch" # compile fixes for GCC 3.4 - epatch "${FILESDIR}"/${P}-gcc4.patch + epatch \ + "${FILESDIR}/${PV}-credits.patch" \ + "${FILESDIR}/${PV}-duke3d-makefile-opts.patch" \ + "${FILESDIR}/${PV}-gcc34.patch" \ + "${FILESDIR}"/${P}-gcc4.patch \ + "${FILESDIR}"/${P}-as-needed.patch sed -i \ -e "/^use_opengl := / s:=.*:= $(use_tf opengl):" \ -e "/^use_physfs := / s:=.*:= false:" \ diff --git a/games-fps/duke3d/files/duke3d-20040817-as-needed.patch b/games-fps/duke3d/files/duke3d-20040817-as-needed.patch new file mode 100644 index 000000000000..0a049c029c49 --- /dev/null +++ b/games-fps/duke3d/files/duke3d-20040817-as-needed.patch @@ -0,0 +1,74 @@ +diff -ur duke3d/source/buildengine/Makefile duke3d-patched/source/buildengine/Makefile +--- duke3d/source/buildengine/Makefile 2004-05-15 05:15:05.000000000 +0200 ++++ duke3d-patched/source/buildengine/Makefile 2008-02-27 23:10:46.000000000 +0100 +@@ -99,11 +99,11 @@ + ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users) + $(error Cygwin users need to set the SDL_LIB_DIR envr var.) + else +- SDL_LDFLAGS := -L$(SDL_LIB_DIR) -lSDL ++ SDL_LIBS := -L$(SDL_LIB_DIR) -lSDL + endif + else + SDL_CFLAGS := $(shell sdl-config --cflags) +- SDL_LDFLAGS := $(shell sdl-config --libs) ++ SDL_LIBS := $(shell sdl-config --libs) + endif + + CC = gcc +@@ -202,7 +202,7 @@ + ASMFLAGS = -f $(ASMOBJFMT) $(ASMDEFS) + LINKER = gcc + CFLAGS += $(USE_ASM) -funsigned-char -DPLATFORM_UNIX -Wall $(SDL_CFLAGS) -fno-omit-frame-pointer +-LDFLAGS += $(SDL_LDFLAGS) ++LDLIBS += $(SDL_LIBS) + + # Rules for turning source files into .o files + %.o: %.c +@@ -236,17 +236,17 @@ + + ifeq ($(strip $(usedlls)),true) + $(ENGINEDLL) : $(ENGINEOBJS) +- $(LINKER) -shared -o $(ENGINEDLL) $(LDFLAGS) $(ENGINEOBJS) ++ $(LINKER) -shared -o $(ENGINEDLL) $(LDFLAGS) $(ENGINEOBJS) $(LDLIBS) + + $(NETDLL) : $(NETOBJS) +- $(LINKER) -shared -o $(NETDLL) $(LDFLAGS) $(NETOBJS) ++ $(LINKER) -shared -o $(NETDLL) $(LDFLAGS) $(NETOBJS) $(LDLIBS) + endif + + $(GAMEEXE) : $(ENGINEDLL) $(NETDLL) $(GAMEOBJS) $(PERLOBJS) +- $(LINKER) -o $(GAMEEXE) $(LDFLAGS) $(LDPERL) $(PERLOBJS) $(GAMEOBJS) $(ENGINEDLL) $(NETDLL) ++ $(LINKER) -o $(GAMEEXE) $(LDFLAGS) $(LDPERL) $(PERLOBJS) $(GAMEOBJS) $(LDLIBS) $(ENGINEDLL) $(NETDLL) + + $(BUILDEXE) : $(ENGINEDLL) $(BUILDOBJS) +- $(LINKER) -o $(BUILDEXE) $(LDFLAGS) $(BUILDOBJS) $(ENGINEDLL) ++ $(LINKER) -o $(BUILDEXE) $(LDFLAGS) $(BUILDOBJS) $(LDLIBS) $(ENGINEDLL) + + listclean: + @echo "A 'make clean' would remove" $(CLEANUP) +diff -ur duke3d/source/Makefile duke3d-patched/source/Makefile +--- duke3d/source/Makefile 2004-05-15 05:14:16.000000000 +0200 ++++ duke3d-patched/source/Makefile 2008-02-27 23:09:57.000000000 +0100 +@@ -45,11 +45,11 @@ + ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users) + $(error Cygwin users need to set the SDL_LIB_DIR envr var.) + else +- SDL_LDFLAGS := -L$(SDL_LIB_DIR) -lSDL ++ SDL_LIBS := -L$(SDL_LIB_DIR) -lSDL + endif + else + SDL_CFLAGS := $(shell sdl-config --cflags) +- SDL_LDFLAGS := $(shell sdl-config --libs) -L. ++ SDL_LIBS := $(shell sdl-config --libs) -L. + endif + + ifeq ($(strip $(macosx)),true) +@@ -104,7 +104,7 @@ + #CC = icc + #CFLAGS = -g $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 -DUSE_I386_ASM=1 $(EXTRACFLAGS) -O2 + +-LDLIBS = $(SDL_LDFLAGS) -lSDL -lSDL_mixer $(EXTRALDFLAGS) ++LDLIBS = $(SDL_LIBS) -lSDL -lSDL_mixer $(EXTRALDFLAGS) + + # !!! FIXME: Do we even need this? It doesn't fly on MacOS X. --ryan. + #LDLIBS += -Wl,-E -- cgit v1.2.3-65-gdbad