[Libreoffice-commits] .: 5 commits - configure.in git-hooks/pre-commit Makefile.in set_soenv.in solenv/inc
Thomas Klausner
tklausner at kemper.freedesktop.org
Tue Dec 7 01:54:44 PST 2010
Makefile.in | 2
configure.in | 5 +
git-hooks/pre-commit | 2
set_soenv.in | 20 ++++-
solenv/inc/unx.mk | 8 ++
solenv/inc/unxbsdi3.mk | 178 +++++++++++++++++++++++++++++++++++++++++++++++++
solenv/inc/unxbsdx3.mk | 178 +++++++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 388 insertions(+), 5 deletions(-)
New commits:
commit ac8b141c4d6bb72fa1e7e86d135d56241f21629b
Author: Thomas Klausner <wiz at NetBSD.org>
Date: Tue Dec 7 10:40:42 2010 +0100
Add NetBSD support for amd64 and for current compiler.
Should be merged with the generic gcc file, I'll do that as
a separate step.
diff --git a/set_soenv.in b/set_soenv.in
index 2c56a4d..88dd5f1 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -259,6 +259,16 @@ elsif ( $platform =~ m/netbsd/ )
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
}
+ elsif ($platform =~ m/^x86_64/)
+ { print "Setting NetBSD x86-64 specific values... ";
+ $outfile = "NetBSDX86-64Env.Set.sh";
+ $CPU = "X";
+ $CPUNAME = "X86_64";
+ $OUTPATH = "unxbsdx";
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ }
elsif ($platform =~ m/^sparc/)
{ print "Setting NetBSD Sparc specific values... ";
$outfile = "NetBSDSparcEnv.Set.sh";
@@ -284,8 +294,14 @@ elsif ( $platform =~ m/netbsd/ )
exit 1;
}
#Conditional setting depending on gcc3:
- $CVER = "C300";
- $OUTPATH = $OUTPATH."2";
+ if (@GCCVER@ >= 30401) {
+ $CVER = "C341";
+ $OUTPATH = $OUTPATH."3";
+ }
+ else {
+ $CVER = "C300";
+ $OUTPATH = $OUTPATH."2";
+ }
# General NetBSD settings:
$BIG_SVX = "TRUE";
$COM = "GCC";
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 7645a73..311b6d1 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -139,6 +139,14 @@
.INCLUDE : unxbsdi2.mk
.ENDIF
+.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC341NETBSDI"
+.INCLUDE : unxbsdi3.mk
+.ENDIF
+
+.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC341NETBSDX"
+.INCLUDE : unxbsdx3.mk
+.ENDIF
+
.IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDS"
.INCLUDE : unxbsds.mk
.ENDIF
diff --git a/solenv/inc/unxbsdi3.mk b/solenv/inc/unxbsdi3.mk
new file mode 100644
index 0000000..c059965
--- /dev/null
+++ b/solenv/inc/unxbsdi3.mk
@@ -0,0 +1,178 @@
+#
+# mk file for NetBSD/i386 with gcc 3.4.x and higher.
+#
+
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=
+JAVAFLAGSDEBUG=-g
+
+# 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+= -DX86 $(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
+
+# 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*=
+
+# name of C++ Compiler
+CXX*=g++
+# name of C Compiler
+CC*=gcc
+# flags for C and C++ Compiler
+CFLAGS+=-fmessage-length=0 -c
+
+# 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)"!=""
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g
+.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
+
+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 enabling optimizations
+# CFLAGSOPT=-O2
+# reduce to -O1 to avoid optimization problems
+CFLAGSOPT=-O1
+# Compiler flags for disabling optimizations
+CFLAGSNOOPT=-O0
+# Compiler flags for describing the output path
+CFLAGSOUTOBJ=-o
+
+CFLAGSWARNCC=
+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
+# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
+CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
+CFLAGSWERRCC=-Werror
+
+# 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*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+
+# 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=-L$(SOLARVERSION)$/$(INPATH)$/lib
+
+# 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=-lgcc_s -lstdc++
+
+# default objectfilenames to link
+STDOBJGUI=
+STDSLOGUI=
+STDOBJCUI=
+STDSLOCUI=
+STDOBJVCL=$(L)$/salmain.o
+
+# libraries for linking applications
+STDLIBGUIMT=-lX11 -lm -lc -lgcc_s -lstdc++ -lpthread
+STDLIBCUIMT=-lm -lc -lgcc_s -lstdc++ -lpthread
+# libraries for linking shared libraries
+STDSHLGUIMT=-lX11 -lXext -lm -lc -lgcc_s -lstdc++ -lpthread
+STDSHLCUIMT=-lm -lc -lgcc_s -lstdc++ -lpthread
+
+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lgcc_s -lstdc++
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#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
+DLLPOSTFIX=bi
+DLLPRE=lib
+DLLPOST=.so
diff --git a/solenv/inc/unxbsdx3.mk b/solenv/inc/unxbsdx3.mk
new file mode 100644
index 0000000..069aa91
--- /dev/null
+++ b/solenv/inc/unxbsdx3.mk
@@ -0,0 +1,178 @@
+#
+# mk file for NetBSD/amd64 with gcc 3.4.x and higher.
+#
+
+ASM=
+AFLAGS=
+
+SOLAR_JAVA*=
+JAVAFLAGSDEBUG=-g
+
+# 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+= -DX86_64 $(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
+
+# 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*=
+
+# name of C++ Compiler
+CXX*=g++
+# name of C Compiler
+CC*=gcc
+# flags for C and C++ Compiler
+CFLAGS+=-fmessage-length=0 -c
+
+# 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)"!=""
+
+# flags to enable build with symbols; required for crashdump feature
+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+CFLAGSENABLESYMBOLS=-g1
+.ELSE
+CFLAGSENABLESYMBOLS=-g
+.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
+
+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 enabling optimizations
+# CFLAGSOPT=-O2
+# reduce to -O1 to avoid optimization problems
+CFLAGSOPT=-O1
+# Compiler flags for disabling optimizations
+CFLAGSNOOPT=-O0
+# Compiler flags for describing the output path
+CFLAGSOUTOBJ=-o
+
+CFLAGSWARNCC=
+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
+# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
+CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
+CFLAGSWERRCC=-Werror
+
+# 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*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+
+# 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=-L$(SOLARVERSION)$/$(INPATH)$/lib
+
+# 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=-lgcc_s -lstdc++
+
+# default objectfilenames to link
+STDOBJGUI=
+STDSLOGUI=
+STDOBJCUI=
+STDSLOCUI=
+STDOBJVCL=$(L)$/salmain.o
+
+# libraries for linking applications
+STDLIBGUIMT=-lX11 -lm -lc -lgcc_s -lstdc++ -lpthread
+STDLIBCUIMT=-lm -lc -lgcc_s -lstdc++ -lpthread
+# libraries for linking shared libraries
+STDSHLGUIMT=-lX11 -lXext -lm -lc -lgcc_s -lstdc++ -lpthread
+STDSHLCUIMT=-lm -lc -lgcc_s -lstdc++ -lpthread
+
+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lgcc_s -lstdc++
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#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
+DLLPOSTFIX=bx
+DLLPRE=lib
+DLLPOST=.so
commit 0f9f8c9614146374b0772671aaf7c9f7e36270d0
Author: Thomas Klausner <wiz at NetBSD.org>
Date: Tue Dec 7 10:32:26 2010 +0100
Use "/usr/bin/env perl" to make it work on systems without /usr/bin/perl.
diff --git a/git-hooks/pre-commit b/git-hooks/pre-commit
index 253f2dd..b6581a4 100755
--- a/git-hooks/pre-commit
+++ b/git-hooks/pre-commit
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
# A hook script to verify what is about to be committed.
# Called by "git commit" with no arguments. The hook should
commit 322de7ab3c3245abb8a71842983fe5539ace1ff2
Author: Thomas Klausner <wiz at NetBSD.org>
Date: Tue Dec 7 10:31:16 2010 +0100
Also check for db4 in /usr/pkg/include.
This should use the compiler instead of manual path checking...
diff --git a/configure.in b/configure.in
index 9fc8ace..0e60fdd 100644
--- a/configure.in
+++ b/configure.in
@@ -4539,7 +4539,7 @@ if test -n "$with_system_db" -o -n "$with_system_libs" && \
AC_MSG_RESULT([external])
for dbver in -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4 ''; do
AC_MSG_CHECKING([for db$dbver/db.h])
- for inc_dir in /usr/include /usr/local/include; do
+ for inc_dir in /usr/include /usr/local/include /usr/pkg/include; do
if test -r "$inc_dir/db$dbver/db.h"; then
DB_INCLUDES="$inc_dir/db$dbver"
db_header="db$dbver/db.h"
commit 373a5a7eafb40e58cb2a22b1e2301d9ecaa9f718
Author: Thomas Klausner <wiz at NetBSD.org>
Date: Tue Dec 7 10:30:56 2010 +0100
Display result for BrOffice branding line.
diff --git a/configure.in b/configure.in
index 0be475c..9fc8ace 100644
--- a/configure.in
+++ b/configure.in
@@ -6413,6 +6413,9 @@ ENABLE_BROFFICE=""
AC_MSG_CHECKING([whether to enable BrOffice branding])
if test "$enable_broffice" = "yes"; then
ENABLE_BROFFICE="TRUE"
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([yes])
fi
AC_SUBST(ENABLE_BROFFICE)
commit 78e2f7f0dfcdf86319e6552ff8f744e7d51f8551
Author: Thomas Klausner <wiz at NetBSD.org>
Date: Tue Dec 7 10:30:05 2010 +0100
Use bash as shell for this Makefile.
Using /bin/sh, this breaks on NetBSD (not even dmake is built).
diff --git a/Makefile.in b/Makefile.in
index 9e05c70..694141e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
# @configure_input@
# FIXME: create 'install' and 'check' target
-SHELL=/bin/sh
+SHELL=/usr/bin/env bash
all: dmake/dmake at EXEEXT@ fetch
@. ./*[Ee]nv.[Ss]et.sh && \
More information about the Libreoffice-commits
mailing list