LibreOffice compilation.
Baptiste Daroussin
bapt at FreeBSD.org
Sat Jul 23 16:06:05 UTC 2011
On Sat, 23 Jul 2011 18:10:26 +0300, George Liaskos wrote:
> Hello !
>
> I made some progress on LibreOffice, after 3 days of banging
> my head on the desk i finally found the cause of all the link errors.
>
> So, a major makefile cleanup and 140 out 150 modules are compiled
> with out issues. The compilation fails on some unittests with the
> same error
> as described in the following email.
>
> http://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg03889.html
>
> Also --with-lang defaults to en_US, if you try to compile either
> remove this from
> the Makefile or set a different language. It causes some errors if
> you
> leave it as is
> but i haven't found out what exactly is the root of the problem.
>
> Regards,
> George
>
> diff --git a/editors/libreoffice-devel/Makefile
> b/editors/libreoffice-devel/Makefile
> index 6775b4d..8a0b2ae 100644
> --- a/editors/libreoffice-devel/Makefile
> +++ b/editors/libreoffice-devel/Makefile
> @@ -144,7 +144,7 @@
> CONFIGURE_ARGS+= --with-unix-wrapper="libreoffice" \
> --with-build-version="FreeBSD ports ${PKGVERSION}" \
> --with-vendor="FreeBSD ports ${PKGVERSION}" \
> --exec-prefix=${PREFIX} \
> - --with-num-cpus=${MAKE_JOBS_NUMBER} \
> + --with-max-jobs=${MAKE_JOBS_NUMBER} \
> --with-external-tar=${DISTDIR}/${DIST_SUBDIR} \
> --with-gnu-patch=${LOCALBASE}/bin/gpatch \
> --with-system-libxml \
> @@ -166,7 +166,7 @@
> CONFIGURE_ARGS+= --with-unix-wrapper="libreoffice" \
> --with-system-redland \
> --with-system-hunspell \
> --with-system-mythes \
> - --with-system-hyphen \
> + --with-system-altlinuxhyph \
> --with-system-libtextcat \
> --with-system-lpsolve \
> --with-system-vigra \
> @@ -181,7 +181,8 @@
> CONFIGURE_ARGS+= --with-unix-wrapper="libreoffice" \
> --disable-kde \
> --without-stlport \
> --disable-nss-module \
> - --without-system-mozilla
> + --without-system-mozilla \
> + --with-system-translate-toolkit
>
> # extensions
>
> diff --git
>
> a/editors/libreoffice-devel/files/patch-clone__filters__oox__source__token__makefile.mk
>
> b/editors/libreoffice-devel/files/patch-clone__filters__oox__source__token__makefile.mk
> new file mode 100644
> index 0000000..84bd1c7
> --- /dev/null
> +++
>
> b/editors/libreoffice-devel/files/patch-clone__filters__oox__source__token__makefile.mk
> @@ -0,0 +1,11 @@
> +--- clone/filters/oox/source/token/makefile.mk.orig 2011-07-22
> 14:33:31.988113939 +0000
> ++++ clone/filters/oox/source/token/makefile.mk 2011-07-22
> 14:34:30.469770138 +0000
> +@@ -56,7 +56,7 @@
> + $(SLO)$/tokenmap.obj : $(INCCOM)$/tokenhash.inc
> $(INCCOM)$/tokennames.inc $(GENHEADERPATH)$/tokens.hxx
> $(MISC)$/do_tokens
> +
> + $(INCCOM)$/tokenhash.inc : $(MISC)$/tokenhash.gperf
> $(MISC)$/do_tokens
> +- $(AUGMENT_LIBRARY_PATH) gperf --compare-strncmp
> $(MISC)$/tokenhash.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" |
> $(GREP) -v "^#line" >$(INCCOM)$/tokenhash.inc
> ++ $(AUGMENT_LIBRARY_PATH) $(GPERF) --compare-strncmp
> $(MISC)$/tokenhash.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" |
> $(GREP) -v "^#line" >$(INCCOM)$/tokenhash.inc
> +
> + $(MISC)$/do_tokens $(do_phony) : tokens.txt tokens.pl
> tokens.hxx.head tokens.hxx.tail $(GENHEADERPATH)$/tokens.hxx
> $(INCCOM)$/tokennames.inc $(MISC)$/tokenhash.gperf
> + @@-$(RM) $@
> diff --git
>
> a/editors/libreoffice-devel/files/patch-clone__ure__codemaker__source__cppumaker__makefile.mk
>
> b/editors/libreoffice-devel/files/patch-clone__ure__codemaker__source__cppumaker__makefile.mk
> deleted file mode 100644
> index 7514ae4..0000000
> ---
>
> a/editors/libreoffice-devel/files/patch-clone__ure__codemaker__source__cppumaker__makefile.mk
> +++ /dev/null
> @@ -1,10 +0,0 @@
> ----
> ./clone/ure/codemaker/source/cppumaker/makefile.mk.orig 2011-07-19
> 01:06:50.709229437 -0700
> -+++ ./clone/ure/codemaker/source/cppumaker/makefile.mk 2011-07-19
> 01:07:17.888941663 -0700
> -@@ -60,6 +60,6 @@
> - APP1OBJS= $(OBJFILES)
> -
> - APP1DEPN= $(OUT)$/lib$/$(CODEMAKERLIBDEPN)
> $(OUT)$/lib$/$(COMMONCPPLIBDEPN)
> --APP1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CODEMAKERLIBST)
> $(COMMONCPPLIBST)
> -+APP1STDLIBS= $(SALLIB) $(STORELIB) $(SALHELPERLIB) $(REGLIB)
> $(CODEMAKERLIBST) $(COMMONCPPLIBST)
> -
> - .INCLUDE : target.mk
> diff --git
>
> a/editors/libreoffice-devel/files/patch-clone__ure__codemaker__source__javamaker__makefile.mk
>
> b/editors/libreoffice-devel/files/patch-clone__ure__codemaker__source__javamaker__makefile.mk
> deleted file mode 100644
> index 43cfb98..0000000
> ---
>
> a/editors/libreoffice-devel/files/patch-clone__ure__codemaker__source__javamaker__makefile.mk
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ----
> ./clone/ure/codemaker/source/javamaker/makefile.mk.orig 2011-07-19
> 01:40:15.468865648 -0700
> -+++ ./clone/ure/codemaker/source/javamaker/makefile.mk 2011-07-19
> 01:40:30.426685985 -0700
> -@@ -52,7 +52,7 @@
> - APP1OBJS = $(OBJFILES)
> -
> - APP1DEPN= $(OUT)$/lib$/$(CODEMAKERLIBDEPN)
> $(OUT)$/lib$/$(COMMONJAVALIBDEPN)
> --APP1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CODEMAKERLIBST)
> $(COMMONJAVALIBST)
> -+APP1STDLIBS= $(SALLIB) $(STORELIB) $(SALHELPERLIB) $(REGLIB)
> $(CODEMAKERLIBST) $(COMMONJAVALIBST)
> -
> - .INCLUDE : target.mk
> -
> diff --git
>
> a/editors/libreoffice-devel/files/patch-clone__ure__idlc__source__makefile.mk
>
> b/editors/libreoffice-devel/files/patch-clone__ure__idlc__source__makefile.mk
> deleted file mode 100644
> index 9466796..0000000
> ---
>
> a/editors/libreoffice-devel/files/patch-clone__ure__idlc__source__makefile.mk
> +++ /dev/null
> @@ -1,10 +0,0 @@
> ---- ./clone/ure/idlc/source/makefile.mk.orig 2011-07-19
> 00:41:54.938864209 -0700
> -+++ ./clone/ure/idlc/source/makefile.mk 2011-07-19
> 00:42:33.817148181 -0700
> -@@ -107,6 +107,7 @@
> - APP1STDLIBS = \
> - $(REGLIB) \
> - $(SALLIB) \
> -+ $(STORELIB) \
> - $(SALHELPERLIB)
> -
> - # --- Targets
> ------------------------------------------------------
> diff --git
>
> a/editors/libreoffice-devel/files/patch-clone__ure__registry__tools__makefile.mk
>
> b/editors/libreoffice-devel/files/patch-clone__ure__registry__tools__makefile.mk
> deleted file mode 100644
> index 9490627..0000000
> ---
>
> a/editors/libreoffice-devel/files/patch-clone__ure__registry__tools__makefile.mk
> +++ /dev/null
> @@ -1,42 +0,0 @@
> ---- ./clone/ure/registry/tools/makefile.mk.orig 2011-05-19
> 04:22:57.000000000 -0700
> -+++ ./clone/ure/registry/tools/makefile.mk 2011-07-19
> 00:00:14.698945728 -0700
> -@@ -48,6 +48,7 @@
> -
> - APP1STDLIBS=\
> - $(SALLIB) \
> -+ ${STORELIB} \
> - $(REGLIB)
> -
> - APP2TARGET= regview
> -@@ -56,6 +57,7 @@
> -
> - APP2STDLIBS=\
> - $(SALLIB) \
> -+ ${STORELIB} \
> - $(REGLIB)
> -
> - APP3TARGET= regcompare
> -@@ -65,6 +67,7 @@
> - APP3STDLIBS=\
> - $(SALLIB) \
> - $(SALHELPERLIB) \
> -+ ${STORELIB} \
> - $(REGLIB)
> -
> - APP4TARGET= checksingleton
> -@@ -73,6 +76,7 @@
> - APP4STDLIBS=\
> - $(SALLIB) \
> - $(SALHELPERLIB) \
> -+ ${STORELIB} \
> - $(REGLIB)
> -
> - APP5TARGET= rdbedit
> -@@ -81,6 +85,7 @@
> - APP5STDLIBS=\
> - $(SALLIB) \
> - $(SALHELPERLIB) \
> -+ ${STORELIB} \
> - $(REGLIB)
> -
> - OBJFILES = $(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS)
> $(APP5OBJS)
> diff --git a/editors/libreoffice-devel/files/patch-configure.in
> b/editors/libreoffice-devel/files/patch-configure.in
> new file mode 100644
> index 0000000..5e3d88f
> --- /dev/null
> +++ b/editors/libreoffice-devel/files/patch-configure.in
> @@ -0,0 +1,11 @@
> +--- configure.in.orig 2011-07-21 02:57:19.000000000 +0300
> ++++ configure.in 2011-07-21 02:58:05.000000000 +0300
> +@@ -8086,7 +8086,7 @@
> + dnl Number of CPUs to use during the build
> + dnl
> ===================================================================
> + AC_MSG_CHECKING([for number of processors to use])
> +-if test "z`uname -s`" = "zDarwin" -o "z`uname -s`" = "zNetBSD" -o
> "z`uname -s`" = "zOpenBSD"; then
> ++if test "z`uname -s`" = "zDarwin" -o "z`uname -s`" = "zNetBSD" -o
> "z`uname -s`" = "zOpenBSD" -o "z`uname -s`" = "zFreeBSD"; then
> + BUILD_NCPUS=`sysctl -n hw.ncpu`
> + else
> + BUILD_NCPUS=`grep $'^processor\t*:' /proc/cpuinfo | wc -l`
> diff --git
>
> a/editors/libreoffice-devel/files/patch-solenv__gbuild__platform__freebsd.mk
>
> b/editors/libreoffice-devel/files/patch-solenv__gbuild__platform__freebsd.mk
> deleted file mode 100644
> index 626bed4..0000000
> ---
>
> a/editors/libreoffice-devel/files/patch-solenv__gbuild__platform__freebsd.mk
> +++ /dev/null
> @@ -1,28 +0,0 @@
> ---- ./solenv/gbuild/platform/freebsd.mk.orig 2011-05-20
> 18:04:45.000000000 +0200
> -+++ ./solenv/gbuild/platform/freebsd.mk 2011-06-18
> 15:01:48.627541342 +0200
> -@@ -37,7 +37,25 @@
> -
> - gb_Library_DLLPOSTFIX := fb
> - gb_COMPILERDEFAULTOPTFLAGS := -O2
> -+gb_STDLIBS := pthread
> -
> - include $(GBUILDDIR)/platform/unxgcc.mk
> -
> -+gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS
> -+
> -+define gb_LinkTarget__command_dynamiclink
> -+$(call gb_Helper_abbreviate_dirs,\
> -+ mkdir -p $(dir $(1)) && \
> -+ $(gb_CXX) \
> -+ $(if $(filter Library
> CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
> -+ $(subst \d,$$,$(RPATH)) $(LDFLAGS) \
> -+ $(foreach object,$(COBJECTS),$(call
> gb_CObject_get_target,$(object))) \
> -+ $(foreach object,$(CXXOBJECTS),$(call
> gb_CxxObject_get_target,$(object))) \
> -+ $(foreach object,$(GENCXXOBJECTS),$(call
> gb_GenCxxObject_get_target,$(object))) \
> -+ $(foreach
> extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \
> -+ -Wl$(COMMA)--start-group $(foreach
> lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib)))
> -Wl$(COMMA)--end-group \
> -+ $(subst -lpthread,$(PTHREAD_LIBS),$(patsubst
> lib%.so,-l%,$(foreach
> lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
> -+ -o $(1))
> -+endef
> -+
> - # vim: set noet sw=4:
> diff --git
> a/editors/libreoffice-devel/files/patch-solenv__inc__unx.mk
> b/editors/libreoffice-devel/files/patch-solenv__inc__unx.mk
> new file mode 100644
> index 0000000..a39fd67
> --- /dev/null
> +++ b/editors/libreoffice-devel/files/patch-solenv__inc__unx.mk
> @@ -0,0 +1,17 @@
> +--- solenv/inc/unx.mk.orig 2011-07-23 08:18:24.000000000 +0300
> ++++ solenv/inc/unx.mk 2011-07-23 08:20:06.000000000 +0300
> +@@ -139,8 +139,12 @@
> + .INCLUDE : unxbsds.mk
> + .ENDIF
> +
> +-.IF "$(COM)$(OS)" == "GCCFREEBSD"
> +-.INCLUDE : unxfbsd.mk
> ++.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
> ++.INCLUDE : unxfbsdi.mk
> ++.ENDIF
> ++
> ++.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDX"
> ++.INCLUDE : unxfbsdx.mk
> + .ENDIF
> +
> + .IF "$(COM)$(OS)" == "GCCOPENBSD"
> diff --git
> a/editors/libreoffice-devel/files/patch-solenv__inc__unxfbsd.mk
> b/editors/libreoffice-devel/files/patch-solenv__inc__unxfbsd.mk
> new file mode 100644
> index 0000000..91a1271
> --- /dev/null
> +++ b/editors/libreoffice-devel/files/patch-solenv__inc__unxfbsd.mk
> @@ -0,0 +1,186 @@
> +--- solenv/inc/unxfbsd.mk.orig 2011-07-23 08:03:22.000000000 +0300
> ++++ solenv/inc/unxfbsd.mk 2011-07-23 08:08:39.000000000 +0300
> +@@ -27,178 +27,12 @@
> +
> + # Makefile for FreeBSD.
> +
> +-ASM=
> +-AFLAGS=
> ++.INCLUDE : unxgcc.mk
> +
> +-SOLAR_JAVA*=
> +-JAVAFLAGSDEBUG=-g
> ++DLLPOSTFIX=fb
> +
> +-# Include arch specific makefile.
> +-.IF "$(CPUNAME)" == "INTEL"
> +-.INCLUDE : unxfbsdi.mk
> +-.ENDIF
> +-.IF "$(CPUNAME)" == "X86_64"
> +-.INCLUDE : unxfbsdx.mk
> +-.ENDIF
> +-
> +-# filter for supressing verbose messages from linker
> +-#not needed at the moment
> +-#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
> +-
> +-# _PTHREADS is needed for the stl
> +-CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR
> -D_USE_NAMESPACE=1
> +-
> +-# enable visibility define in "sal/types.h"
> +-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
> +-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
> +-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
> +-
> +-# this is a platform with JAVA support
> +-.IF "$(SOLAR_JAVA)"!=""
> +-JAVADEF=-DSOLAR_JAVA
> +-.IF "$(debug)"==""
> +-JAVA_RUNTIME=-ljava
> +-.ELSE
> +-JAVA_RUNTIME=-ljava_g
> +-.ENDIF
> +-.ENDIF
> +-
> +-# name of C++ Compiler
> +-CXX*=g++
> +-# name of C Compiler
> +-CC*=gcc
> +-.IF "$(SYSBASE)"!=""
> +-CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include
> +-CXX+:=$(CFLAGS_SYSBASE)
> +-CC+:=$(CFLAGS_SYSBASE)
> +-.ENDIF # "$(SYSBASE)"!=""
> +-CFLAGS+=-fmessage-length=0 -c
> +-
> +-# flags to enable build with symbols
> +-CFLAGSENABLESYMBOLS=-g
> +-
> +-# flags for the C++ Compiler
> +-CFLAGSCC= -pipe $(ARCH_FLAGS)
> +-# Flags for enabling exception handling
> +-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
> +-# Flags for disabling exception handling
> +-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
> +-
> +-# -fpermissive should be removed as soon as possible
> +-CFLAGSCXX= -pipe $(ARCH_FLAGS)
> +-PICSWITCH:=-fpic
> +-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
> +-CFLAGSCXX += -fvisibility-inlines-hidden
> +-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
> +-
> +-# Compiler flags for compiling static object in multi threaded
> environment with graphical user interface
> +-CFLAGSOBJGUIMT=
> +-# Compiler flags for compiling static object in multi threaded
> environment with character user interface
> +-CFLAGSOBJCUIMT=
> +-# Compiler flags for compiling shared object in multi threaded
> environment with graphical user interface
> +-CFLAGSSLOGUIMT=$(PICSWITCH)
> +-# Compiler flags for compiling shared object in multi threaded
> environment with character user interface
> +-CFLAGSSLOCUIMT=$(PICSWITCH)
> +-# Compiler flags for profiling
> +-CFLAGSPROF=
> +-# Compiler flags for debugging
> +-CFLAGSDEBUG=-g
> +-CFLAGSDBGUTIL=
> +-# Compiler flags for disabling optimizations
> +-CFLAGSNOOPT=-O0
> +-# Compiler flags for describing the output path
> +-CFLAGSOUTOBJ=-o
> +-
> +-# -Wshadow does not work for C with nested uses of
> pthread_cleanup_push:
> +-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
> +-CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
> +- -Wno-non-virtual-dtor
> +-CFLAGSWALLCC=$(CFLAGSWARNCC)
> +-CFLAGSWALLCXX=$(CFLAGSWARNCXX)
> +-CFLAGSWERRCC=-Werror
> +-
> +-# Once all modules on this platform compile without warnings, set
> +-# COMPILER_WARN_ERRORS=TRUE here instead of setting
> MODULES_WITH_WARNINGS (see
> +-# settings.mk): Currently this is not tested on FreeBSD
> +-#MODULES_WITH_WARNINGS :=
> +-
> +-# switches for dynamic and static linking
> +-STATIC = -Wl,-Bstatic
> +-DYNAMIC = -Wl,-Bdynamic
> +-
> +-# name of linker
> +-LINK*=$(CXX)
> +-LINKC*=$(CC)
> ++# disable exceptions in boost
> ++CFLAGS_NO_EXCEPTIONS+=-DBOOST_NO_EXCEPTIONS
> +
> + # default linker flags
> +-LINKFLAGSDEFS*=#-Wl,-z,defs
> +-LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
> +-LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
> +- #TODO: drop $ORIGIN once no URE executable is also shipped in
> OOo
>
> +-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
> +-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
>
> +-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
> +-LINKFLAGSRUNPATH_OXT=
> +-LINKFLAGSRUNPATH_NONE=
> +-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
> +-
> +-# linker flags for linking applications
> +-LINKFLAGSAPPGUI= -Wl,-export-dynamic
> +-LINKFLAGSAPPCUI= -Wl,-export-dynamic
> +-
> +-# linker flags for linking shared libraries
> +-LINKFLAGSSHLGUI= -shared
> +-LINKFLAGSSHLCUI= -shared
> +-
> +-LINKFLAGSTACK=
> +-LINKFLAGSPROF=
> +-LINKFLAGSDEBUG=-g
> +-LINKFLAGSOPT=
> +-
> +-# linker flags for optimization (symbol hashtable)
> +-# for now, applied to symbol scoped libraries, only
> +-LINKFLAGSOPTIMIZE*=-Wl,-O1
> +-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
> +-
> +-SONAME_SWITCH=-Wl,-h
> +-
> +-# Sequence of libs does matter !
> +-
> +-STDLIBCPP=-lstdc++
> +-
> +-# default objectfilenames to link
> +-STDOBJVCL=$(L)/salmain.o
> +-STDOBJGUI=
> +-STDSLOGUI=
> +-STDOBJCUI=
> +-STDSLOCUI=
> +-
> +-# libraries for linking applications
> +-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
> +-STDLIBCUIMT=$(PTHREAD_LIBS) -lm
> +-# libraries for linking shared libraries
> +-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
> +-STDSHLCUIMT=$(PTHREAD_LIBS) -lm
> +-
> +-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
> +-
> +-# name of library manager
> +-LIBMGR=ar
> +-LIBFLAGS=-r
> +-
> +-# tool for generating import libraries
> +-IMPLIB=
> +-IMPLIBFLAGS=
> +-
> +-MAPSYM=
> +-MAPSYMFLAGS=
> +-
> +-RC=irc
> +-RCFLAGS=-fo$@ $(RCFILES)
> +-RCLINK=
> +-RCLINKFLAGS=
> +-RCSETVERSION=
> +-
> +-# platform specific identifier for shared libs
> +-DLLPRE=lib
> +-DLLPOST=.so
> ++LINKFLAGSDEFS:=
> diff --git
> a/editors/libreoffice-devel/files/patch-solenv__inc__unxfbsdi.mk
> b/editors/libreoffice-devel/files/patch-solenv__inc__unxfbsdi.mk
> new file mode 100644
> index 0000000..24560ca
> --- /dev/null
> +++ b/editors/libreoffice-devel/files/patch-solenv__inc__unxfbsdi.mk
> @@ -0,0 +1,28 @@
> +--- solenv/inc/unxfbsdi.mk.orig 2011-07-23 08:03:39.000000000 +0300
> ++++ solenv/inc/unxfbsdi.mk 2011-07-23 08:26:34.000000000 +0300
> +@@ -25,22 +25,7 @@
> + #
> +
> #*************************************************************************
> +
> +-#
> +-# FreBSD/i386 specific defines
> +-#
> +-
> +-CDEFS+=-DX86
> +-
> +-# architecture dependent flags for the C and C++ compiler that can
> be changed by
> +-# exporting the variable ARCH_FLAGS="..." in the shell, which is
> used to start build
> +-ARCH_FLAGS*=-mtune=pentiumpro
> +-
> +-# Compiler flags for enabling optimizations
> +-.IF "$(PRODUCT)"!=""
> +-CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
> +-.ELSE # "$(PRODUCT)"!=""
> +-CFLAGSOPT= # no optimizing for non products
> +-.ENDIF # "$(PRODUCT)"!=""
> ++# FreeBSD/i386 specific defines
> +
> +-# platform specific identifier for shared libs
> +-DLLPOSTFIX=fi
> ++.INCLUDE : unxfbsd.mk
> ++CDEFS+=-DX86
> diff --git
> a/editors/libreoffice-devel/files/patch-solenv__inc__unxfbsdx.mk
> b/editors/libreoffice-devel/files/patch-solenv__inc__unxfbsdx.mk
> new file mode 100644
> index 0000000..c609b42
> --- /dev/null
> +++ b/editors/libreoffice-devel/files/patch-solenv__inc__unxfbsdx.mk
> @@ -0,0 +1,30 @@
> +--- solenv/inc/unxfbsdx.mk.orig 2011-07-23 08:03:44.000000000 +0300
> ++++ solenv/inc/unxfbsdx.mk 2011-07-23 08:26:13.000000000 +0300
> +@@ -25,25 +25,8 @@
> + #
> +
> #*************************************************************************
> +
> +-#
> +-# FreBSD/amd64 specific defines
> +-#
> ++# FreeBSD/amd64 specific defines
> +
> ++.INCLUDE : unxfbsd.mk
> + CDEFS+=-DX86_64
> +-
> +-# architecture dependent flags for the C and C++ compiler that can
> be changed by
> +-# exporting the variable ARCH_FLAGS="..." in the shell, which is
> used to start build
> +-.IF "$(CPUNAME)" == "X86_64"
> +-ARCH_FLAGS*=
> +-.ENDIF
> +-
> +-# Compiler flags for enabling optimizations
> +-.IF "$(PRODUCT)"!=""
> +-CFLAGSOPT=-O2 -fno-strict-aliasing # optimizing for products
> +-.ELSE # "$(PRODUCT)"!=""
> +-CFLAGSOPT= # no optimizing for non products
> +-.ENDIF # "$(PRODUCT)"!=""
> +-
> +-# platform specific identifier for shared libs
> +-DLLPOSTFIX=fx
> + BUILD64=1
Very very nice thanks you !!!!!!!
I have also made some progress to unbundle more stuff, I will merge
both work.
I cc this to the office mailing list, do not hesitate to subscribe.
regards,
Bapt
More information about the freebsd-office
mailing list