This is an automated email from the git hooks/post-receive script. fabian pushed a commit to branch master in repository yquake2.
commit 564eec60cf8c2a358c9d5e27341390103f222ffb Author: Fabian Greffrath <[email protected]> Date: Tue Sep 29 11:57:38 2015 +0200 Extend debian/patches/Append...patch to also remove the bogus rpaths instructions from LDFLAGS --- ...-LD-FLAGS-instead-of-overriding-them-to-o.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch b/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch index 3225929..45b6514 100644 --- a/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch +++ b/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch @@ -42,3 +42,33 @@ but yquake2 doesn't. else ifeq ($(OSTYPE),OpenBSD) LDFLAGS := -L/usr/local/lib -lm else ifeq ($(OSTYPE),Windows) +@@ -425,23 +426,23 @@ release/quake2 : LDFLAGS += -lGL + endif + + ifeq ($(OSTYPE), FreeBSD) +-release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib' ++#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib' + else ifeq ($(OSTYPE), Linux) +-release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib' ++#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib' + endif + + ifeq ($(WITH_SYSTEMWIDE),yes) + ifneq ($(WITH_SYSTEMDIR),"") + ifeq ($(OSTYPE), FreeBSD) +-release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib' ++#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib' + else ifeq ($(OSTYPE), Linux) +-release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib' ++#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib' + endif + else + ifeq ($(OSTYPE), FreeBSD) +-release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib' ++#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib' + else ifeq ($(OSTYPE), Linux) +-release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib' ++#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib' + endif + endif + endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/yquake2.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
