files/3.6/gtk_makefile.patch

gtk_makefile.patch (text/plain), 1.50 KB, created by Matt Whitlock on 2010-08-10 23:31:47 UTC

--- features/org.eclipse.equinox.executable/library/gtk/make_linux.mak~	2010-02-08 21:14:12.000000000 +0000
+++ features/org.eclipse.equinox.executable/library/gtk/make_linux.mak	2010-08-09 21:47:30.543247031 +0000
@@ -27,7 +27,8 @@
   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
@@ -44,8 +45,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 -lX11
 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\"" -DX11_LIB="\"libX11.so.6\""
-LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic 
-CFLAGS = ${M_ARCH} -g -s -Wall\
+LFLAGS = ${M_ARCH} -shared -Wl,-soname=$(PROGRAM_SONAME) -fpic -Wl,--export-dynamic 
+CFLAGS += ${M_ARCH} -Wall\
 	-fpic \
 	-DLINUX \
 	-DMOZILLA_FIX \
@@ -95,10 +96,10 @@
 	$(CC) $(CFLAGS) -c ../eclipseNix.c -o eclipseNix.o
 
 $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
-	$(CC) ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+	$(CC) ${M_ARCH} $(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)