From c9cad973c1b97d0a3c591fba9a83bfd43117e75a Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Wed, 17 Mar 2004 03:54:27 +0000 Subject: Add preliminary SDK support Note patches won't be integrated since it is dirty hack. http://qa.openoffice.org/issues/show_bug.cgi?id=24142 --- editors/openoffice-1.1/Makefile | 3 + .../files/patch-odk+setsdkenv_unix.in | 26 +++++++ .../files/patch-odk+settings+settings.mk | 88 ++++++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in create mode 100644 editors/openoffice-1.1/files/patch-odk+settings+settings.mk (limited to 'editors/openoffice-1.1') diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index ac454a157514..e4ac95af352a 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -34,6 +34,7 @@ ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh USE_GNOME= orbit gtk12 +USE_REINPLACE= yes .include @@ -319,6 +320,8 @@ post-extract: .endif post-patch: + @${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk + @${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk @${MAKE} patch-mozilla .if defined(WITH_TTF_BYTECODE_ENABLED) @if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \ diff --git a/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in new file mode 100644 index 000000000000..f3178e703ab9 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in @@ -0,0 +1,26 @@ +--- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 ++++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 +@@ -2,7 +2,8 @@ + + # This script starts a new shell and sets all enviroment variables, which + # are necessary for building the examples of the Office Development Kit. +-# The Script was developed for the operating systems Solaris and Linux. ++# The script was developed for the operating systems Solaris, Linux, MacOS X ++# and FreeBSD. + + # Installation directory of the Software Development Kit. + # Example: OO_SDK_HOME=/work/StarOffice_SDK +@@ -76,6 +77,13 @@ + LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH + ;; ++ ++ FreeBSD) ++ directoryname=freebsd ++ exampleout=FREEBSDexample.out ++ LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:.:$LD_LIBRARY_PATH ++ export LD_LIBRARY_PATH ++ ;; + esac + + # Add directory of the SDK tools to the path. diff --git a/editors/openoffice-1.1/files/patch-odk+settings+settings.mk b/editors/openoffice-1.1/files/patch-odk+settings+settings.mk new file mode 100644 index 000000000000..1a645d01abf1 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-odk+settings+settings.mk @@ -0,0 +1,88 @@ +--- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 ++++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 +@@ -368,3 +368,85 @@ + + endif + ++ifeq "$(PLATFORM)" "FreeBSD" ++# Settings for FreeBSD using gcc compiler ++ ++PROCTYPE := $(shell uname -m) ++ ++ ++# Default is freebsd on a intel machine ++PLATFORM=FreeBSD ++PACKAGE_LIB_DIR=freebsd_x86.plt ++JAVA_PROC_TYPE=i386 ++ ++OS=FREEBSD ++PS=/ ++CC=gcc ++LINK=gcc ++LIB=gcc ++ECHO=@echo ++MKDIR=mkdir -p ++CAT=cat ++OBJ_EXT=o ++SHAREDLIB_EXT=so ++SHAREDLIB_PRE=lib ++SHAREDLIB_OUT=$(OUT_LIB) ++ ++GCC_VERSION=$(shell $(CC) -dumpversion) ++ ++ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" ++COMID=gcc3 ++CPPU_ENV=gcc3 ++else ++COMID=GCC ++CPPU_ENV=gcc2 ++endif ++ ++OSEP=\< ++CSEP=\> ++QUOTE=$(subst S,\,S) ++QM=\" ++ ++DEL=rm -f ++DELRECURSIVE=rm -rf ++COPY=cp ++URLPREFIX=file:// ++ ++# Include UDK version numbers ++include $(PRJ)/include/udkversion.mk ++ ++SALLIB=-lsal ++CPPULIB=-lcppu ++CPPUHELPERLIB=-lcppuhelper$(COMID) ++SALHELPERLIB=-lsalhelper$(COMID) ++STLPORTLIB=-lstlport_gcc ++ ++EMPTYSTRING= ++PATH_SEPARATOR=: ++ ++# -O is necessary for inlining (see gcc documentation) ++ifeq "$(DEBUG)" "yes" ++CC_FLAGS=-c -g -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% ++else ++CC_FLAGS=-c -O -fpic -DPIC -fno-rtti %%PTHREAD_CFLAGS%% ++endif ++ ++SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd ++CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include ++STL_INCLUDES=-I$(OO_SDK_HOME)/include/stl ++CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) ++ ++# define for used compiler necessary for UNO ++#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 ++#-DCPPU_ENV=gcc3 -- gcc3 3.0 ++ ++CC_OUTPUT_SWITCH=-o ++ ++LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' ++ ++EXE_LINK_FLAGS=-Wl ++LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% ++LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE) ++ ++endif ++ -- cgit v1.2.3