summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-util/eclipse-sdk/ChangeLog6
-rw-r--r--dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch12
2 files changed, 13 insertions, 5 deletions
diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index b712258a18ee..f0bf3b71d54c 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/eclipse-sdk
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.153 2010/03/05 17:22:59 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.154 2010/03/05 17:38:27 ali_bush Exp $
+
+ 05 Mar 2010; Alistair Bush <ali_bush@gentoo.org>
+ files/3.5/gtk_makefile.patch:
+ Update makefile patch to also pass LDFLAGS to exe. #296796.
*eclipse-sdk-3.5.1-r1 (05 Mar 2010)
diff --git a/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch b/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch
index 6c1e68420505..a9ab46e50588 100644
--- a/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch
+++ b/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch
@@ -1,5 +1,5 @@
---- features/org.eclipse.equinox.executable/library/gtk/make_linux.mak 2010-03-06 01:16:49.000000000 +1300
-+++ features/org.eclipse.equinox.executable/library/gtk/make_linux.mak 2010-03-06 01:31:15.000000000 +1300
+--- features/org.eclipse.equinox.executable/library/gtk/make_linux.mak.bak 2010-03-06 06:32:49.000000000 +1300
++++ features/org.eclipse.equinox.executable/library/gtk/make_linux.mak 2010-03-06 06:33:31.000000000 +1300
@@ -27,14 +27,14 @@
PROGRAM_OUTPUT=eclipse
endif
@@ -28,8 +28,12 @@
-fpic \
-DLINUX \
-DMOZILLA_FIX \
-@@ -98,7 +98,7 @@
- $(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+@@ -95,10 +95,10 @@
+ $(CC) $(CFLAGS) -c ../eclipseNix.c -o eclipseNix.o
+
+ $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
+- $(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
++ $(CC) $(LDFLAGS) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
$(DLL): $(DLL_OBJS) $(COMMON_OBJS)
- $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)