X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=eclipse-swt-makefile.patch;h=ea30d2cfd372a6d5d6cbd1812baf33dccade512a;hb=d6978db2307cfbb5700b14338eaa470e8d756a91;hp=dab073175bfef82372e22533d9dd62a375ec3394;hpb=49c0e0bdae9b6486e789b5c094a016466887d0a0;p=packages%2Feclipse-swt.git

diff --git a/eclipse-swt-makefile.patch b/eclipse-swt-makefile.patch
index dab0731..ea30d2c 100644
--- a/eclipse-swt-makefile.patch
+++ b/eclipse-swt-makefile.patch
@@ -1,69 +1,93 @@
---- make_gtk.mak.orig	2004-06-25 18:28:00.000000000 +0200
-+++ make_gtk.mak	2004-07-09 17:20:54.618388592 +0200
-@@ -24,13 +24,13 @@
- 
- ifeq ($(SWT_PTR_CFLAGS),-DSWT_PTR_SIZE_64)
- # 64 bit path
--JAVA_HOME		= /bluebird/teamswt/swt-builddir/jdk1.5.0
-+JAVA_HOME		= /usr/lib64/java
- AWT_LIB_PATH	= $(JAVA_HOME)/jre/lib/amd64
- XTEST_LIB_PATH  = /usr/X11R6/lib64
- else
- # 32 bit path
--JAVA_HOME		= /bluebird/teamswt/swt-builddir/IBMJava2-141
--AWT_LIB_PATH	= $(JAVA_HOME)/jre/bin
-+JAVA_HOME		= /usr/lib/java
-+AWT_LIB_PATH	= $(JAVA_HOME)/jre/lib/i386
- XTEST_LIB_PATH  = /usr/X11R6/lib
- endif
- 
-@@ -63,19 +63,20 @@
- GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
- GNOMELIBS = `pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
+--- make_linux.mak.orig	2005-06-27 20:53:36.000000000 +0200
++++ make_linux.mak	2005-06-30 22:05:11.000000000 +0200
+@@ -50,7 +50,7 @@
+ # Uncomment for Native Stats tool
+ #NATIVE_STATS = -DNATIVE_STATS
  
 -MOZILLACFLAGS = -O \
 +MOZILLACFLAGS = $(OPT) \
- 	-fno-rtti	\
- 	-Wall	\
- 	-I./ \
--	-I$(JAVA_HOME)	\
--	-include $(MOZILLA_HOME)/include/mozilla-config.h \
--	-I$(MOZILLA_HOME)/include \
--	-I$(MOZILLA_HOME)/include/xpcom \
--	-I$(MOZILLA_HOME)/include/string \
--	-I$(MOZILLA_HOME)/include/nspr \
--	-I$(MOZILLA_HOME)/include/embed_base \
--	-I$(MOZILLA_HOME)/include/gfx
--MOZILLALIBS = -L$(MOZILLA_HOME)/lib -lembed_base_s -lxpcom
-+	-I$(JAVA_HOME)/include \
-+	-I$(JAVA_HOME)/include/linux \
+ 	-DXPCOM_GLUE=1 \
+ 	-DMOZILLA_STRICT_API=1 \
+ 	-fno-rtti \
+@@ -63,7 +63,13 @@
+ 	-I$(JAVA_HOME)/include \
+ 	-I$(JAVA_HOME)/include/linux \
+ 	${GECKO_INCLUDES} \
+-	${SWT_PTR_CFLAGS}
++	${SWT_PTR_CFLAGS} \
++	$(JAVA_INC) \
 +	-include /usr/include/mozilla/mozilla-config.h \
-+	-I/usr/include/mozilla \
-+	-I/usr/include/mozilla/embed_base \
-+	-I/usr/include/mozilla/gfx \
-+	-I/usr/include/mozilla/string \
++	-I/usr/include/nspr \
 +	-I/usr/include/mozilla/xpcom \
-+	-I/usr/include/nspr
-+MOZILLALIBS = -L/usr/lib/mozilla/components -lembedcomponents -lxpcom
- MOZILLALDFLAGS = -s
- 
- SWT_OBJECTS		= swt.o callback.o
-@@ -85,14 +86,15 @@
- GNOME_OBJECTS	= swt.o gnome.o gnome_structs.o gnome_stats.o
- MOZILLA_OBJECTS = xpcom.o
++	-I/usr/include/mozilla/string \
++	-I/usr/include/mozilla/embed_base
+ 	
+ MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic ${GECKO_LIBS}
+ 	
+@@ -75,14 +81,15 @@
+ GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
+ MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
   
 -CFLAGS = -O -Wall \
 +CFLAGS = $(OPT) -Wall \
  		-DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
  		-DLINUX -DGTK \
  		-I$(JAVA_HOME)/include \
--		-fpic \
-+		-I$(JAVA_HOME)/include/linux \
-+		-fPIC \
- 		${SWT_PTR_CFLAGS}
+ 		-I$(JAVA_HOME)/include/linux \
+ 		-fpic \
+-		${SWT_PTR_CFLAGS}
++		${SWT_PTR_CFLAGS} \
++		$(JAVA_INC)
+ LIBS = -shared -fpic -s
+ 
+ 
+@@ -94,16 +101,16 @@
+ make_swt: $(SWT_LIB) $(SWTPI_LIB)
  
--LIBS = -shared -fpic
-+LIBS = -shared -fPIC
+ $(SWT_LIB): $(SWT_OBJECTS)
+-	$(LD) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS)
+-
++	$(CC) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS)
++	
+ callback.o: callback.c callback.h
+ 	$(CC) $(CFLAGS) -c callback.c
+ 
+ $(SWTPI_LIB): $(SWTPI_OBJECTS)
+-	$(LD) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
+-
++	$(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
++	
+ swt.o: swt.c swt.h
+-	$(CC) $(CFLAGS) -c swt.c
++	$(CC) $(CFLAGS) $(JAVA_INC) -c swt.c
+ os.o: os.c os.h swt.h os_custom.h
+ 	$(CC) $(CFLAGS) $(GTKCFLAGS) -c os.c
+ os_structs.o: os_structs.c os_structs.h os.h swt.h
+@@ -136,7 +143,7 @@
+ make_awt:$(AWT_LIB)
+ 
+ $(AWT_LIB): $(AWT_OBJECTS)
+-	$(LD) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
++	$(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
  
  #
- #  Target Rules
+ # Atk lib
+@@ -144,7 +151,7 @@
+ make_atk: $(ATK_LIB)
+ 
+ $(ATK_LIB): $(ATK_OBJECTS)
+-	$(LD) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
++	$(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
+ 
+ atk.o: atk.c atk.h
+ 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
+@@ -161,7 +168,7 @@
+ make_gnome: $(GNOME_LIB)
+ 
+ $(GNOME_LIB): $(GNOME_OBJECTS)
+-	$(LD) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
++	$(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
+ 
+ gnome.o: gnome.c 
+ 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c