diff options
Diffstat (limited to 'x11-toolkits/swt/files/patch-make_freebsd.mak')
| -rw-r--r-- | x11-toolkits/swt/files/patch-make_freebsd.mak | 165 |
1 files changed, 59 insertions, 106 deletions
diff --git a/x11-toolkits/swt/files/patch-make_freebsd.mak b/x11-toolkits/swt/files/patch-make_freebsd.mak index 10ea1aad6339..5cdc3dff0886 100644 --- a/x11-toolkits/swt/files/patch-make_freebsd.mak +++ b/x11-toolkits/swt/files/patch-make_freebsd.mak @@ -1,129 +1,82 @@ ---- make_freebsd.mak.orig 2018-03-01 07:35:22.000000000 +0100 -+++ make_freebsd.mak 2018-06-27 11:33:21.105457000 +0200 -@@ -9,7 +9,7 @@ +--- make_freebsd.mak.orig 2019-06-16 12:13:00 UTC ++++ make_freebsd.mak +@@ -12,7 +12,7 @@ # IBM Corporation - initial API and implementation #******************************************************************************* -# Makefile for creating SWT libraries for Linux GTK +# Makefile for creating SWT libraries for FreeBSD GTK - include make_common.mak + # SWT debug flags for various SWT components. + #SWT_WEBKIT_DEBUG = -DWEBKIT_DEBUG +@@ -26,7 +26,6 @@ -@@ -43,7 +43,7 @@ + include make_common.mak - # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) - GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)` --GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst -+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst +-SWT_VERSION=$(maj_ver)$(min_ver)r$(rev) + GTK_VERSION?=3.0 - AWT_LFLAGS = -shared - AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -@@ -51,7 +51,8 @@ - ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)` - ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0 + # Define the various shared libraries to be build. +@@ -56,7 +55,7 @@ + # Webkit extension lib has to be put into a separate folder and is treated differently from the other libraries. + WEBKIT_EXTENSION_LIB = lib$(WEBKIT_EXTENSION_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + WEBEXTENSION_BASE_DIR = webkitextensions +-WEBEXTENSION_DIR = $(WEBEXTENSION_BASE_DIR)$(maj_ver)$(min_ver)r$(rev) ++WEBEXTENSION_DIR = $(WEBEXTENSION_BASE_DIR)$(SWT_VERSION) --GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm -+GLXCFLAGS = -I$(LOCALBASE)/include + CAIROCFLAGS = `pkg-config --cflags cairo` + CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo +@@ -64,9 +63,9 @@ + # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) + GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)` + ifeq ($(GTK_VERSION), 4.0) +-GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-4 -lcairo -lgthread-2.0 ++GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L$(LOCALBASE)/lib -lgtk-4 -lcairo -lgthread-2.0 + else +-GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-3 -lgdk-3 -lcairo -lgthread-2.0 ++GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L$(LOCALBASE)/lib -lgtk-3 -lgdk-3 -lcairo -lgthread-2.0 + endif + + AWT_LFLAGS = -shared ${SWT_LFLAGS} +@@ -75,12 +74,13 @@ + ATKCFLAGS = `pkg-config --cflags atk gtk+-$(GTK_VERSION) gtk+-unix-print-$(GTK_VERSION)` + ATKLIBS = `pkg-config --libs-only-L atk` -latk-1.0 + +-GLXLIBS = -lGL -lGLU -lm +GLXLIBS = -L$(LOCALBASE)/lib -lGL -lGLU -lm ++GLXCFLAGS = -I$(LOCALBASE)/include # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS -@@ -70,14 +71,24 @@ - -I$(JAVA_HOME)/include/freebsd \ - ${SWT_PTR_CFLAGS} - MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic -- -+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \ -+ -DNO__1XPCOMGlueStartup \ -+ -DNO__1XPCOMGlueLoadXULFunctions \ -+ -DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \ -+ -DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \ -+ -DNO_nsDynamicFunctionLoad_1sizeof \ -+ -DNO__1Call__IIIIII \ -+ -DNO__1Call__JJJJJI \ -+ -DNO_nsDynamicFunctionLoad -+XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2 -+ - SWT_OBJECTS = swt.o c.o c_stats.o callback.o - AWT_OBJECTS = swt_awt.o - SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o - CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o - ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o - MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o --XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o -+XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o - XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o - GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o -@@ -85,17 +96,18 @@ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DFREEBSD -DGTK \ -+ -I$(LOCALBASE)/include \ +-WEBKITLIBS = `pkg-config --libs-only-l gio-2.0` ++WEBKITLIBS = `pkg-config --libs-only-l gio-2.0` $(XLIB64) -L$(LOCALBASE)/lib + WEBKITCFLAGS = `pkg-config --cflags gio-2.0` + + WEBKIT_EXTENSION_CFLAGS=`pkg-config --cflags gtk+-3.0 webkit2gtk-web-extension-4.0` +@@ -108,17 +108,18 @@ + $(SWT_WEBKIT_DEBUG) \ + -DLINUX -DGTK \ -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/freebsd \ - -fPIC \ +- -I$(JAVA_HOME)/include/linux \ ++ -I$(JAVA_HOME)/include/freebsd \ ++ -I$(LOCALBASE)/include \ ${SWT_PTR_CFLAGS} - LFLAGS = -shared -fPIC + LFLAGS = -shared -fPIC ${SWT_LFLAGS} --ifndef NO_STRIP + ifndef NO_STRIP +- # -s = Remove all symbol table and relocation information from the executable. +- # i.e, more efficent code, but removes debug information. Should not be used if you want to debug. +- # https://gcc.gnu.org/onlinedocs/gcc/Link-Options.html#Link-Options +- # http://stackoverflow.com/questions/14175040/effects-of-removing-all-symbol-table-and-relocation-information-from-an-executab - AWT_LFLAGS := $(AWT_LFLAGS) -s -- MOZILLALFLAGS := $(MOZILLALFLAGS) -s - LFLAGS := $(LFLAGS) -s --endif -+.ifndef NO_STRIP ++# -s = Remove all symbol table and relocation information from the executable. ++# i.e, more efficent code, but removes debug information. Should not be used if you want to debug. ++# https://gcc.gnu.org/onlinedocs/gcc/Link-Options.html#Link-Options ++# http://stackoverflow.com/questions/14175040/effects-of-removing-all-symbol-table-and-relocation-information-from-an-executab +AWT_LFLAGS := $(AWT_LFLAGS) -s -+MOZILLALFLAGS := $(MOZILLALFLAGS) -s +LFLAGS := $(LFLAGS) -s -+.endif - - all: make_swt make_atk make_glx - -@@ -173,16 +185,16 @@ - $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} - - xpcom.o: xpcom.cpp -- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp -+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp - - xpcom_structs.o: xpcom_structs.cpp -- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp -+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp - - xpcom_custom.o: xpcom_custom.cpp -- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp -+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp - - xpcom_stats.o: xpcom_stats.cpp -- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp -+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp - - # - # XULRunner lib -@@ -193,22 +205,16 @@ - $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} - - xpcomxul.o: xpcom.cpp -- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp -+ $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp - - xpcomxul_structs.o: xpcom_structs.cpp -- $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp -+ $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp - - xpcomxul_custom.o: xpcom_custom.cpp -- $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp -+ $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp - - xpcomxul_stats.o: xpcom_stats.cpp -- $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp -- --xpcomxulglue.o: xpcomglue.cpp -- $(CXX) -o xpcomxulglue.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue.cpp -- --xpcomxulglue_stats.o: xpcomglue_stats.cpp -- $(CXX) -o xpcomxulglue_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue_stats.cpp -+ $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp + endif - # - # XPCOMInit lib + all: make_swt make_atk make_glx make_webkit |