[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 7 commits - configure.in set_soenv.in solenv/bin solenv/inc soltools/checkdll
Robert Nagy
rnagy at kemper.freedesktop.org
Mon Nov 8 03:21:12 PST 2010
configure.in | 23 ++-
set_soenv.in | 72 +++++++++--
solenv/bin/deliver.pl | 2
solenv/inc/libs.mk | 3
solenv/inc/unitools.mk | 2
solenv/inc/unx.mk | 4
solenv/inc/unxobsd.mk | 267 ++++++++++++++++++++++++++++++++++++++++++
soltools/checkdll/makefile.mk | 3
8 files changed, 358 insertions(+), 18 deletions(-)
New commits:
commit 9413dbeee71a002e475ba8104cc9dccee78ce2cb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 6 12:20:47 2010 +0000
return early if source doesn't exist on symlink
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 4b40315..e61419a 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -368,13 +368,13 @@ sub do_symlink
}
}
else {
+ return unless -e $fullfrom;
print "REMOVE: $to\n" if $opt_verbose;
unlink $to;
if ( $opt_delete ) {
push_on_ziplist($to) if $opt_zip;
return;
}
- return unless -e $fullfrom;
print "SYMLIB: $from -> $to\n" if $opt_verbose;
if ( !symlink("$from", "$to") ) {
print_error("can't symlink $from -> $to: $!",0);
commit 0d241fc4b7f2320304ef874c2b7ee3cced3df633
Author: Robert Nagy <robert at openbsd.org>
Date: Fri Nov 5 14:55:12 2010 +0100
-DBOOST_NO_EXCEPTIONS for OpenBSD
diff --git a/solenv/inc/unxobsd.mk b/solenv/inc/unxobsd.mk
index d5a0d0c..974dd45 100644
--- a/solenv/inc/unxobsd.mk
+++ b/solenv/inc/unxobsd.mk
@@ -94,7 +94,7 @@ 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
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions -DBOOST_NO_EXCEPTIONS
# -fpermissive should be removed as soon as possible
CFLAGSCXX= -pipe $(ARCH_FLAGS)
commit e13ec8b9dd22cb284e1decbe1db9723ecf6d60e4
Author: Robert Nagy <robert at openbsd.org>
Date: Thu Nov 4 15:39:54 2010 +0100
pick up system jpeg on openbsd
diff --git a/set_soenv.in b/set_soenv.in
index a8957a7..5f3c7fb 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1448,12 +1448,14 @@ if ($platform =~ m/linux/)
}
- $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
- $I.'$JAVA_HOME'.$INCLUDE;
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31";
+ # pickup system jpeg over java jpeg on OpenBSD
if ($platform =~ m/openbsd/)
{ $SOLARINC .= $I.$USR_LOCAL.$INCLUDE;
}
+ { $SOLARINC .= $I.'$JAVA_HOME'.$INCLUDE;
+ }
#include system dependent Java include directory
if (!($JDK eq "gcj"))
commit bc6fa48cc3a2f4eccb34cd3c32fd5122b62a5a92
Author: Robert Nagy <robert at openbsd.org>
Date: Thu Nov 4 01:08:11 2010 +0100
OpenBSD needs /usr/local/lib in SOLARLIB
diff --git a/set_soenv.in b/set_soenv.in
index d72a423..a8957a7 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1379,12 +1379,16 @@ elsif ($platform =~ m/linux|netbsd|osf1|aix|freebsd|openbsd/)
{ $SOLARLIB = $L.$par_dir.$LIB.
$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
$L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
- $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
- $L.'$JAVA_HOME'.$LIB64.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
+ if ($platform =~ m/openbsd/) {
+ $SOLARLIB .= $L.$USR_LOCAL.$LIB;
+ }
+ $SOLARLIB .= $L.'$JAVA_HOME'.$LIB64.
$L.$JRELIBDIR.
$L.$JRETOOLKITDIR.
$L.$JRETHREADDIR.
$L_STLPORT_LIB;
+
if ( $XLIB ne "/usr/lib" && $XLIB ne "/usr/lib64" ) {
$SOLARLIB .= $L.$XLIB;
}
commit 5cd3768d753bff980d8c992e466d18935afcd883
Author: Robert Nagy <robert at openbsd.org>
Date: Fri Nov 5 11:04:59 2010 +0100
sync with the generic linux makefile
diff --git a/solenv/inc/unxobsd.mk b/solenv/inc/unxobsd.mk
index 9b32081..d5a0d0c 100644
--- a/solenv/inc/unxobsd.mk
+++ b/solenv/inc/unxobsd.mk
@@ -25,15 +25,20 @@
#
#*************************************************************************
-# Makefile for OpenBSD.
-
-ASM=
-AFLAGS=
-
+# Makefile for OpenBSD
+ASM*=
+AFLAGS*=
SOLAR_JAVA*=
+# default optimization level for product code
+CDEFAULTOPT*=-O2
+# 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*=
+# position independent code switch
+PICSWITCH*:=-fpic
JAVAFLAGSDEBUG=-g
-# Include arch specific makefile.
+# arch specific defines
.IF "$(CPUNAME)" == "INTEL"
CDEFS+=-DX86
.ENDIF
@@ -43,22 +48,12 @@ ARCH_FLAGS*=
BUILD64=1
.ENDIF
-# Compiler flags for enabling optimizations
-.IF "$(PRODUCT)"!=""
-CFLAGSOPT=-O2 # optimizing for products
-.IF "$(USE_SYSTEM_STL)"!="YES"
-CFLAGSOPT+=-fno-strict-aliasing # STLPort headers are full of aliasing warnings
-.ENDIF
-.ELSE # "$(PRODUCT)"!=""
-CFLAGSOPT= # no optimizing for non products
-.ENDIF # "$(PRODUCT)"!=""
-
# 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 -DSTLPORT_VERSION=450
+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -80,7 +75,7 @@ CXX*=g++
# name of C Compiler
CC*=gcc
.IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include
+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
CXX+:=$(CFLAGS_SYSBASE)
CC+:=$(CFLAGS_SYSBASE)
.ENDIF # "$(SYSBASE)"!=""
@@ -99,15 +94,18 @@ 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 -DBOOST_NO_EXCEPTIONS
+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"
+CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
+CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
+CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
+
# 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
@@ -121,6 +119,15 @@ CFLAGSPROF=
# Compiler flags for debugging
CFLAGSDEBUG=-g
CFLAGSDBGUTIL=
+# Compiler flags for enabling optimizations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products
+.IF "$(USE_SYSTEM_STL)"!="YES"
+CFLAGSOPT+=-fno-strict-aliasing #STLPort headers are full of aliasing warnings
+.ENDIF
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
# Compiler flags for disabling optimizations
CFLAGSNOOPT=-O0
# Compiler flags for describing the output path
@@ -136,8 +143,10 @@ 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 OpenBSD
-#MODULES_WITH_WARNINGS :=
+# settings.mk):
+MODULES_WITH_WARNINGS := \
+ lotuswordpro \
+ soldep
# switches for dynamic and static linking
STATIC = -Wl,-Bstatic
@@ -156,12 +165,19 @@ 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_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
LINKFLAGSRUNPATH_NONE=
-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
+# flag -Wl,-z,noexecstack sets the NX bit on the stack
+LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
+.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
+LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
+.ENDIF
# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
+ -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
+ -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
# linker flags for linking shared libraries
LINKFLAGSSHLGUI= -shared
@@ -184,18 +200,26 @@ SONAME_SWITCH=-Wl,-h
STDLIBCPP=-lstdc++
# default objectfilenames to link
-STDOBJVCL=$(L)/salmain.o
+STDOBJVCL=$(L)$/salmain.o
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
STDSLOCUI=
+.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE"
+LINKFLAGS += -Wl,--hash-style=both
+.ELSE
+LINKFLAGS += -Wl,-zdynsort
+.ENDIF
+
# libraries for linking applications
-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-STDLIBCUIMT=$(PTHREAD_LIBS) -lm
+STDLIBGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+STDLIBCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
# libraries for linking shared libraries
-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+STDSHLGUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+STDSHLCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+
+X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
@@ -220,7 +244,7 @@ LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
# name of library manager
-LIBMGR=ar
+LIBMGR*=ar
LIBFLAGS=-r
# tool for generating import libraries
@@ -240,3 +264,4 @@ RCSETVERSION=
DLLPRE=lib
DLLPOST=.so
DLLPOSTFIX=
+PCHPOST=.gch
commit ad68fedaa1d4d8fd44f66b30fe016cdda5b56c54
Author: Robert Nagy <robert at openbsd.org>
Date: Thu Nov 4 15:38:10 2010 +0100
use system jpeg on OpenBSD
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 06c720c..fc5dee4 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -205,7 +205,8 @@ ZLIB3RDLIB=-lz
ZLIB3RDLIB=-lzlib
.ENDIF
.IF "$(SYSTEM_JPEG)"=="YES"
-.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX"
+.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX" && \
+ "$(OS)" != "OPENBSD"
#i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
.IF "$(OS)" == "FREEBSD"
JPEG3RDLIB=/usr/local/lib/libjpeg.so
commit 81584af690e5d4ffe2adaf454bf7ac97e096f337
Author: Robert Nagy <robert at openbsd.org>
Date: Thu Nov 4 00:43:13 2010 +0100
make LibreOffice boostrap on OpenBSD
diff --git a/configure.in b/configure.in
index e6206f3..ec349b6 100644
--- a/configure.in
+++ b/configure.in
@@ -1379,9 +1379,21 @@ case "$build_os" in
test_cups=no
test_randr=no
test_freetype=yes
- PTHREAD_LIBS=-pthread
+ PTHREAD_LIBS=-pthread
_os=AIX
;;
+ openbsd*)
+ test_x=yes
+ test_gtk=yes
+ build_cairo=yes
+ test_kde=yes
+ test_cups=yes
+ test_freetype=yes
+ test_randr=yes
+ PTHREAD_CFLAGS="-pthread -D_THREAD_SAFE"
+ PTHREAD_LIBS="-pthread"
+ _os=OpenBSD
+ ;;
*)
AC_MSG_ERROR([$_os operating system is not suitable to build LibreOffice!])
;;
@@ -3626,6 +3638,9 @@ if test "$enable_epm" = "yes"; then
AIX)
PKGFORMAT=rpm
;;
+ OpenBSD)
+ PKGFORMAT=portable
+ ;;
*BSD)
PKGFORMAT=bsd
;;
@@ -5372,7 +5387,7 @@ fi
dnl ===================================================================
dnl Check for system openssl
dnl ===================================================================
-if test "$_os" = "Darwin" -o "$_os" = "NetBSD" && test "$with_system_openssl" != "no"; then
+if test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" && test "$with_system_openssl" != "no"; then
with_system_openssl=yes
fi
AC_MSG_CHECKING([which libssl to use])
@@ -5381,7 +5396,7 @@ if test -n "$with_system_openssl" -o -n "$with_system_libs" && \
AC_MSG_RESULT([external])
# Mac OS builds should get out without extra stuff is the Mac porters'
# wish. And pkg-config is although Xcode ships a .pc for openssl
- if test "$_os" = "Darwin" -o "$_os" = "NetBSD" ; then
+ if test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" ; then
OPENSSL_CFLAGS=
OPENSSL_LIBS="-lssl -lcrypto"
else
@@ -7656,7 +7671,7 @@ dnl ===================================================================
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"; then
+if test "z`uname -s`" = "zDarwin" -o "z`uname -s`" = "zOpenBSD"; then
BUILD_NCPUS=`sysctl -n hw.ncpu`
else
BUILD_NCPUS=`grep $'^processor\t*:' /proc/cpuinfo | wc -l`
diff --git a/set_soenv.in b/set_soenv.in
index 989dff4..d72a423 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -393,6 +393,45 @@ elsif ( $platform =~ m/freebsd/ )
}
$INPATH = $OUTPATH.$PROEXT;
}
+elsif ( $platform =~ m/openbsd/ )
+{ $BIG_SVX = "TRUE";
+ $COM = "GCC";
+ $COMPATH = '@COMPATH@';
+ $CVER = "C300";
+ $GUI = "UNX";
+ $GUIBASE = "unx";
+ $GVER = "VCL";
+ $OS = "OPENBSD";
+ $PATH_SEPERATOR = $ps;
+ $OSVERSION = '@OSVERSION@';
+ $OUTPATH = "unxobsd";
+ $outfile = "OpenBSDEnv.Set.sh";
+ if ($platform =~ m/^amd64/)
+ {
+ print "Setting OpenBSD AMD64 specific values... ";
+ $CPU = "X";
+ $CPUNAME = "X86_64";
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ }
+ elsif ($platform =~ m/^i386/)
+ { print "Setting OpenBSD x86 specific values... ";
+ $CPU = "I";
+ $CPUNAME = "INTEL";
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+ }
+ else
+ { print "Unsupported OpenBSD architecture: $platform \n";
+ exit 1;
+ }
+ if( @GCCVER@ >= 30401 ) {
+ $CVER = "C341";
+ }
+ $INPATH = $OUTPATH.$PROEXT;
+}
elsif ( $platform =~ m/linux/ )
{
# General Linux settings:
@@ -1044,7 +1083,7 @@ if ($platform =~ m/solaris/)
$L.$USR_DT.$LIB.
$L.$USR_OPENWIN.$LIB;
}
-elsif ($platform =~ m/linux|netbsd|osf1|freebsd|aix/)
+elsif ($platform =~ m/linux|netbsd|osf1|freebsd|aix|openbsd/)
{
$SOLAREXTRALIB = $L.$par_dir.$LIB64;
}
@@ -1110,7 +1149,7 @@ if ($platform =~ m/cygwin|os2/)
}
# The general environment path.
-if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/)
+if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris|openbsd/)
{ $PATH = $cur_dir.
# $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
@@ -1336,7 +1375,7 @@ if ($platform =~ m/solaris/)
$L_STLPORT_LIB.
$L.$XLIB;
}
-elsif ($platform =~ m/linux|netbsd|osf1|aix|freebsd/)
+elsif ($platform =~ m/linux|netbsd|osf1|aix|freebsd|openbsd/)
{ $SOLARLIB = $L.$par_dir.$LIB.
$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
$L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
@@ -1381,10 +1420,10 @@ $SOLARINC = $I.$cur_dir.
$I.'$SOLARENV'.$INC.
$I.'$SRC_ROOT'.$ds."res";
-if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd|aix/)
+if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd|aix|openbsd/)
{
$SOLARINC .= $STLPORT_stlport;
-if ($platform =~ m/linux|freebsd|netbsd/)
+if ($platform =~ m/linux|freebsd|netbsd|openbsd/)
{
# This simply adds an include path, so even cases that break the FHS work
$SOLARINC .= $STLPORT_inc_stlport;
@@ -1408,6 +1447,10 @@ if ($platform =~ m/linux/)
$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
$I.'$JAVA_HOME'.$INCLUDE;
+ if ($platform =~ m/openbsd/)
+ { $SOLARINC .= $I.$USR_LOCAL.$INCLUDE;
+ }
+
#include system dependent Java include directory
if (!($JDK eq "gcj"))
{
@@ -1429,13 +1472,16 @@ if ($platform =~ m/linux/)
elsif ( $platform =~ m/aix/ )
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."aix";
}
+ elsif ($platform =~ m/openbsd/)
+ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."openbsd";
+ }
#java threads include path
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
}
#The tail, if needed
- if ($platform =~ m/linux|freebsd|netbsd|aix/)
+ if ($platform =~ m/linux|freebsd|netbsd|aix|openbsd/)
{ $SOLARINC .= $I.$XINC;
}
elsif ($platform =~ m/osf1/)
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 6bf0653..c6055d1 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -107,7 +107,7 @@ PERL*=perl
TYPE=cat
CDD=cd
COPY=cp -f
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD"
+.IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD"
COPYRECURSE=-R
.ELSE #"$(OS)"=="MACOSX"
COPYRECURSE=-r
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index f7364ba..7645a73 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -147,6 +147,10 @@
.INCLUDE : unxfbsd.mk
.ENDIF
+.IF "$(COM)$(OS)" == "GCCOPENBSD"
+.INCLUDE : unxobsd.mk
+.ENDIF
+
.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
.INCLUDE : unxmacxp.mk
.ENDIF
diff --git a/solenv/inc/unxobsd.mk b/solenv/inc/unxobsd.mk
new file mode 100644
index 0000000..9b32081
--- /dev/null
+++ b/solenv/inc/unxobsd.mk
@@ -0,0 +1,242 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# Makefile for OpenBSD.
+
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=
+JAVAFLAGSDEBUG=-g
+
+# Include arch specific makefile.
+.IF "$(CPUNAME)" == "INTEL"
+CDEFS+=-DX86
+.ENDIF
+.IF "$(CPUNAME)" == "X86_64"
+CDEFS+=-DX86_64
+ARCH_FLAGS*=
+BUILD64=1
+.ENDIF
+
+# Compiler flags for enabling optimizations
+.IF "$(PRODUCT)"!=""
+CFLAGSOPT=-O2 # optimizing for products
+.IF "$(USE_SYSTEM_STL)"!="YES"
+CFLAGSOPT+=-fno-strict-aliasing # STLPort headers are full of aliasing warnings
+.ENDIF
+.ELSE # "$(PRODUCT)"!=""
+CFLAGSOPT= # no optimizing for non products
+.ENDIF # "$(PRODUCT)"!=""
+
+# 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 -DSTLPORT_VERSION=450
+
+# 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; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
+
+.ENDIF
+
+# 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 -DBOOST_NO_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 OpenBSD
+#MODULES_WITH_WARNINGS :=
+
+# switches for dynamic and static linking
+STATIC = -Wl,-Bstatic
+DYNAMIC = -Wl,-Bdynamic
+
+# name of linker
+LINK*=$(CXX)
+LINKC*=$(CC)
+
+# 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 -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+
+# 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
+
+.IF "$(USE_STLP_DEBUG)" != ""
+.IF "$(STLPORT_VER)" >= "500"
+LIBSTLPORT=$(DYNAMIC) -lstlportstlg
+LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
+.ELSE
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+.ENDIF
+.ELSE # "$(USE_STLP_DEBUG)" != ""
+.IF "$(STLPORT_VER)" >= "500"
+LIBSTLPORT=$(DYNAMIC) -lstlport
+LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
+.ELSE
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+.ENDIF
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+
+# 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
+DLLPOSTFIX=
diff --git a/soltools/checkdll/makefile.mk b/soltools/checkdll/makefile.mk
index fc09a56..b5b386a 100644
--- a/soltools/checkdll/makefile.mk
+++ b/soltools/checkdll/makefile.mk
@@ -45,7 +45,8 @@ LIBSALCPPRT=$(0)
APP1TARGET = checkdll
APP1OBJS = $(OBJ)$/checkdll.obj
DEPOBJFILES = $(APP1OBJS)
-.IF "$(OS)"!="FREEBSD" && "$(OS)"!="MACOSX" && "$(OS)"!="NETBSD"
+.IF "$(OS)"!="FREEBSD" && "$(OS)"!="MACOSX" && "$(OS)"!="NETBSD" \
+ && "$(OS)"!="OPENBSD"
STDLIB += -ldl
.ENDIF
.IF "$(OS)"=="NETBSD"
More information about the Libreoffice-commits
mailing list