components/swt/patches/gcc.patch

   1 --- swt-3.8.2-gtk-solaris-x86/make_solaris_x86.mak.~1~  2013-01-31 10:12:34.000000000 +0400
   2 +++ swt-3.8.2-gtk-solaris-x86/make_solaris_x86.mak      2015-02-01 12:54:28.037774850 +0300
   3 @@ -50,7 +50,7 @@
   4
   5  CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
   6
   7 -AWT_LFLAGS = -G
   8 +AWT_LFLAGS = -shared
   9  AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt
  10
  11  ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0`
  12 @@ -68,13 +68,15 @@
  13         -DSWT_VERSION=$(SWT_VERSION) \
  14         $(NATIVE_STATS) \
  15         -DMOZILLA_STRICT_API=1 \
  16 -       -KPIC \
  17 -       +w \
  18 +       -fPIC \
  19 +       -fno-rtti \
  20 +       -fno-exceptions \
  21 +       -Wall \
  22         -I. \
  23         -I$(JAVA_HOME)/include \
  24 -       -I$(JAVA_HOME)/include/linux \
  25 +       -I$(JAVA_HOME)/include/solaris \
  26         ${SWT_PTR_CFLAGS}
  27 -MOZILLALFLAGS =  -G
  28 +MOZILLALFLAGS =  -shared
  29  MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
  30         -DNO__1XPCOMGlueStartup \
  31         -DNO__1XPCOMGlueLoadXULFunctions \
  32 @@ -98,15 +100,15 @@
  33  XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
  34  GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
  35
  36 -CFLAGS = -O  +w \
  37 +CFLAGS = -O  -Wall \
  38                 -DSWT_VERSION=$(SWT_VERSION) \
  39                 $(NATIVE_STATS) \
  40                 -DLINUX -DGTK \
  41                 -I$(JAVA_HOME)/include \
  42 -               -I$(JAVA_HOME)/include/linux \
  43 -               -KPIC \
  44 +               -I$(JAVA_HOME)/include/solaris \
  45 +               -fPIC \
  46                 ${SWT_PTR_CFLAGS}
  47 -LFLAGS = -G -KPIC
  48 +LFLAGS = -shared -fPIC
  49
  50  ifndef NO_STRIP
  51         AWT_LFLAGS := $(AWT_LFLAGS) -s
  52 @@ -285,7 +287,10 @@
  53  # Install
  54  #
  55  install: all
  56 -       cp *.so $(OUTPUT_DIR)
  57 +       install -d $(DESTDIR)/usr/lib/swt
  58 +       cp *.so $(DESTDIR)/usr/lib/swt
  59 +       install -d $(DESTDIR)/usr/share/lib/java
  60 +       cp *.jar $(DESTDIR)/usr/share/lib/java
  61
  62  #
  63  # Clean