summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch')
-rw-r--r--dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch b/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch
new file mode 100644
index 000000000000..a9ab46e50588
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch
@@ -0,0 +1,43 @@
+--- 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
+
+-PROGRAM_LIBRARY=$(PROGRAM_OUTPUT)_$(LIB_VERSION).so
++PROGRAM_SONAME=$(PROGRAM_OUTPUT)_$(LIB_VERSION)
++PROGRAM_LIBRARY=$(PROGRAM_SONAME).so
+
+ ifeq ($(DEFAULT_JAVA),)
+ DEFAULT_JAVA=DEFAULT_JAVA_JNI
+ endif
+
+ # Define the object modules to be compiled and flags.
+-CC=gcc
+ MAIN_OBJS = eclipseMain.o
+ COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseGtkCommon.o eclipseGtkInit.o
+ DLL_OBJS = eclipse.o eclipseGtk.o eclipseUtil.o eclipseJNI.o eclipseMozilla.o eclipseShm.o eclipseNix.o
+@@ -44,8 +44,8 @@
+ #LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl
+ LIBS = -lpthread -ldl
+ GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\""
+-LFLAGS = -shared -fpic -Wl,--export-dynamic
+-CFLAGS = -g -s -Wall\
++LFLAGS = -shared -Wl,-soname=$(PROGRAM_SONAME) -fpic -Wl,--export-dynamic
++CFLAGS += -Wall\
+ -fpic \
+ -DLINUX \
+ -DMOZILLA_FIX \
+@@ -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)
++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
+
+ install: all
+ cp $(EXEC) $(OUTPUT_DIR)