summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2008-08-19 14:27:52 +0000
committerMarkus Dittrich <markusle@gentoo.org>2008-08-19 14:27:52 +0000
commitaf498bc53a732d3e0c51bfc7815c03707492035d (patch)
treead94e68ec81aecdab124f0994ddb3d6c0bc37215 /sci-mathematics/gretl
parentFix Config/Grammar Perl dependencies bug 221831 (diff)
downloadgentoo-2-af498bc53a732d3e0c51bfc7815c03707492035d.tar.gz
gentoo-2-af498bc53a732d3e0c51bfc7815c03707492035d.tar.bz2
gentoo-2-af498bc53a732d3e0c51bfc7815c03707492035d.zip
Fixed faulty patch causing compile failures (see bug #235108).
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-SENTINEL-2 i686)
Diffstat (limited to 'sci-mathematics/gretl')
-rw-r--r--sci-mathematics/gretl/ChangeLog6
-rw-r--r--sci-mathematics/gretl/files/gretl-1.7.6-ldflags.patch10
2 files changed, 10 insertions, 6 deletions
diff --git a/sci-mathematics/gretl/ChangeLog b/sci-mathematics/gretl/ChangeLog
index 8b46de7d58e5..9b25f56af3ca 100644
--- a/sci-mathematics/gretl/ChangeLog
+++ b/sci-mathematics/gretl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-mathematics/gretl
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.13 2008/08/08 13:41:13 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gretl/ChangeLog,v 1.14 2008/08/19 14:27:52 markusle Exp $
+
+ 19 Aug 2008; Markus Dittrich <markusle@gentoo.org>
+ files/gretl-1.7.6-ldflags.patch:
+ Fixed faulty patch causing compile failures (see bug #235108).
*gretl-1.7.6 (08 Aug 2008)
diff --git a/sci-mathematics/gretl/files/gretl-1.7.6-ldflags.patch b/sci-mathematics/gretl/files/gretl-1.7.6-ldflags.patch
index a136b206c087..f0d32d543832 100644
--- a/sci-mathematics/gretl/files/gretl-1.7.6-ldflags.patch
+++ b/sci-mathematics/gretl/files/gretl-1.7.6-ldflags.patch
@@ -14,7 +14,7 @@ diff -Naur gretl-1.7.6/cli/Makefile.in gretl-1.7.6.new/cli/Makefile.in
$(CLI): .deps $(OBJS)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(GRETLLIB) $(READLINE_LIBS)
-+ $(LDFLAGS) $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(GRETLLIB) $(READLINE_LIBS)
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(GRETLLIB) $(READLINE_LIBS)
.deps:
mkdir $@
@@ -25,7 +25,7 @@ diff -Naur gretl-1.7.6/gui2/Makefile.in gretl-1.7.6.new/gui2/Makefile.in
libdir = @libdir@
CC = @CC@
CFLAGS = @CFLAGS@
-+LDFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
MAKE = @MAKE@
INSTALL = @INSTALL@
LN = @LN_S@
@@ -34,7 +34,7 @@ diff -Naur gretl-1.7.6/gui2/Makefile.in gretl-1.7.6.new/gui2/Makefile.in
$(PROG): .deps $(OBJS) $(HACK_OBJ) $(GTKEXTRA_LITE) $(GTKSOURCEVIEW_LITE)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
-+ $(LDFLAGS) $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
$(HACK_OBJ): $(HACK_SRC) $(HACK_HDR)
$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
@@ -54,7 +54,7 @@ diff -Naur gretl-1.7.6/lib/Makefile.in gretl-1.7.6.new/lib/Makefile.in
$(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \
-+ $(LDFLAGS) $(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LOBJS) $(AUX_LOBJ) \
-rpath $(prefix)/lib $(LIBS) \
-version-info $(CURRENT):$(REVISION):$(AGE)
@@ -74,7 +74,7 @@ diff -Naur gretl-1.7.6/plugin/Makefile.in gretl-1.7.6.new/plugin/Makefile.in
LIBTOOL = ../libtool
COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)
-LINK = $(LIBTOOL) --mode=link $(CC) -module -avoid-version -rpath $(plugindir)
-+LINK = $(LDFLAGS) $(LIBTOOL) --mode=link $(CC) -module -avoid-version -rpath $(plugindir)
++LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -module -avoid-version -rpath $(plugindir)
GRETLINC = -I$(topsrc)/lib/src
GRETLLIB = ../lib/libgretl-1.0.la