[Libreoffice-commits] .: 33 commits - instsetoo_native/util solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Nov 12 06:49:15 PST 2010
instsetoo_native/util/openoffice.lst | 12 ++++++------
solenv/inc/minor.mk | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 5465fe2aed6d51e95a8f3770e85cbf742e056d85
Merge: 37c8df8... b7a2e72...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Nov 12 14:27:14 2010 +0100
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
configure.in
set_soenv.in
solenv/bin/modules/installer/systemactions.pm
commit b7a2e7223f257e305b366123c59104dd44561bd7
Merge: 4b70814... 066088e...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Nov 11 18:09:59 2010 +0100
Merge commit 'ooo/OOO330_m14' into libreoffice-3-3
Conflicts:
solenv/inc/minor.mk
diff --cc solenv/inc/minor.mk
index e635e0c,aed4bf7..c6e863e
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@@ -1,5 -1,5 +1,5 @@@
RSCVERSION=330
- RSCREVISION=330m13(Build:1)
-RSCREVISION=330m14(Build:9542)
-BUILD=9542
++RSCREVISION=330m14(Build:1)
+BUILD=1
- LAST_MINOR=m12
+ LAST_MINOR=m14
SOURCEVERSION=OOO330
commit 4b708149610c15e7c000d8ff29b42cdf35c43b2d
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Nov 11 13:24:48 2010 +0100
Version 3.2.99.3, tag LIBREOFFICE_3_2_99_3 (3.3-beta3)
commit 13a7b27348d45fb93ec1ac7e0d6b95eb5e907795
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Nov 10 10:42:11 2010 +0100
One more comma missing
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index b60c2ba..48c1b3f 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -1330,7 +1330,7 @@ Module gid_Module_Root_Ure_Hidden
gid_Unixlink_File_Dl_Salhelper,
gid_Unixlink_File_Dl_Cppu,
gid_Unixlink_File_Dl_Cppuhelper,
- gid_Unixlink_File_Dl_PurpEnvHelper
+ gid_Unixlink_File_Dl_PurpEnvHelper,
gid_Unixlink_File_Dl_Reg,
gid_Unixlink_File_Dl_Rmcxt,
gid_Unixlink_File_Dl_Store,
commit 3294150eb75fb9edc3a22a217d3c82364163bbe6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Nov 10 10:34:14 2010 +0100
Fix URE packaging on windows
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 7fc6ef1..b60c2ba 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -1262,15 +1262,15 @@ Module gid_Module_Root_Ure_Hidden
gid_Unixlink_File_Dl_Salhelper,
gid_File_Dl_Profile_Uno,
gid_File_Dl_Reg,
- gid_Unixlink_File_Dl_Reg
+ gid_Unixlink_File_Dl_Reg,
gid_File_Dl_Rmcxt,
- gid_Unixlink_File_Dl_Rmcxt
+ gid_Unixlink_File_Dl_Rmcxt,
gid_File_Dl_Store,
- gid_Unixlink_File_Dl_Store
+ gid_Unixlink_File_Dl_Store,
gid_File_Dl_Jvmaccess,
- gid_Unixlink_File_Dl_Jvmaccess
+ gid_Unixlink_File_Dl_Jvmaccess,
gid_File_Dl_Jvmfwk,
- gid_Unixlink_File_Dl_Jvmfwk
+ gid_Unixlink_File_Dl_Jvmfwk,
gid_File_Dl_Sunjavaplugin,
gid_File_Dl_JrepropertiesClass,
gid_File_Dl_Profile_Jvmfwk3rc,
commit d04442e15367319401180a0d9e4ce1a752788a77
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date: Wed Nov 10 04:58:40 2010 +0100
Get rid of undefined $setup_vars array.
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 547ad44..dfca65e 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -75,8 +75,7 @@ $ENV{LOCAL_COMMON_OUT} = $ENV{OUT};
# the installer to use the English localization of the file instead.
$ENV{DEFAULT_TO_ENGLISH_FOR_PACKING} = 1;
-# FIXME. Migrate to WITH_LANG?
-$langs=$ENV{OOO_LANGS_LIST};
+$langs=$ENV{WITH_LANG};
$langs='en-US' if $langs eq '';
$langs =~ s/\s+/,/g;
# FIXME: hack... we get a useless , at the end which makes it being e.g. zu#
@@ -90,8 +89,8 @@ if ( defined $ENV{OODESTDIR} &&
}
$strip='';
-if ( defined $ENV{OOO_STRIP} &&
- $ENV{OOO_STRIP} eq "no" ) {
+if ( defined $ENV{DISABLE_STRIP} &&
+ $ENV{DISABLE_STRIP} eq "TRUE" ) {
$strip = "-dontstrip";
}
commit 8126991c5d177ce5a99a0d1ebc8d859a7e0282cd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 9 10:04:38 2010 +0000
restore original position of tg_compv.mk
grab the compiler version explicitly in unxlng.mk
(cherry picked from commit b3611ba2d74d6b36c9f7758801b4f774b0b013bb)
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index fa7b32e..5bdffba 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1008,12 +1008,6 @@ LNT=$(DEVROOT)/lint/lint
LNTFLAGS=+v -i$(DEVROOT)/lint/ -mL options.lnt -u
LNTFLAGSOUTOBJ=-os
-.IF "$(DISABLE_ENHANCED_COMID)"==""
-.INCLUDE : tg_compv.mk
-.ELSE # "$(DISABLE_ENHANCED_COMID)"==""
-COMID=$(COM)
-.ENDIF # "$(DISABLE_ENHANCED_COMID)"==""
-
.IF "$(GUI)"=="WNT"
.INCLUDE : wnt.mk
.ENDIF
@@ -1093,6 +1087,11 @@ SCPLINK=$(PERL) $(SOLARENV)/bin/par2script.pl
LZIP*=lzip
CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpplcc
+.IF "$(DISABLE_ENHANCED_COMID)"==""
+.INCLUDE : tg_compv.mk
+.ELSE # "$(DISABLE_ENHANCED_COMID)"==""
+COMID=$(COM)
+.ENDIF # "$(DISABLE_ENHANCED_COMID)"==""
.IF "$(SOLAR_JAVA)"=="TRUE"
.IF "$(USE_JAVAVER)"!=""
.INCLUDE : tg_javav.mk
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index 8a2f075..1b7ee75 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -112,7 +112,11 @@ CFLAGSDBGUTIL=
# Compiler flags for enabling optimizations
.IF "$(PRODUCT)"!=""
CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products
-.IF "$(USE_SYSTEM_STL)"!="YES" || "$(CCNUMVER)" <= "000400050000"
+
+GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
+GCCNUMVER:=$(shell @-$(CXX) $(GCCNUMVERSION_CMD))
+
+.IF "$(USE_SYSTEM_STL)"!="YES" || "$(GCCNUMVER)" <= "000400050000"
#STLPort headers are full of aliasing warnings and
#At least SLED 10.2 gcc 4.3 overly agressively optimizes
#uno::Sequence into junk, so only strict-alias on compiler
commit c05a3201e8ac1a5cd95f167029f16f0d9fc62d04
Author: Robert Nagy <robert at openbsd.org>
Date: Tue Nov 9 09:57:42 2010 +0100
no /proc on OpenBSD
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index f1b9edf..547ad44 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -26,7 +26,7 @@ sub wanted {
&& die "Cannot install $_ extension!";
}
-( $^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted";
+( $^O =~ /openbsd/i ) || ( $^O =~ /darwin/i ) || ( -f "/proc/meminfo" ) || die "The installer cannot work without javaldx running, which requires /proc to be mounted";
# Workaround for system Mozilla
if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) {
commit 80027f42bb3c6db06e7f17e2d056a6e25688b49b
Author: Robert Nagy <robert at openbsd.org>
Date: Mon Nov 8 19:39:55 2010 +0100
set a DLLPOSTFIX for OpenBSD and sync unxobsd.mk
diff --git a/solenv/inc/unxobsd.mk b/solenv/inc/unxobsd.mk
index 974dd45..548be65 100644
--- a/solenv/inc/unxobsd.mk
+++ b/solenv/inc/unxobsd.mk
@@ -122,8 +122,12 @@ 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
+.IF "$(USE_SYSTEM_STL)"!="YES" || "$(CCNUMVER)" <= "000400050000"
+#STLPort headers are full of aliasing warnings and
+#At least SLED 10.2 gcc 4.3 overly agressively optimizes
+#uno::Sequence into junk, so only strict-alias on compiler
+#later than 4.5.1
+CFLAGSOPT+=-fno-strict-aliasing
.ENDIF
.ELSE # "$(PRODUCT)"!=""
CFLAGSOPT= # no optimizing for non products
@@ -263,5 +267,5 @@ RCSETVERSION=
# platform specific identifier for shared libs
DLLPRE=lib
DLLPOST=.so
-DLLPOSTFIX=
+DLLPOSTFIX=ob
PCHPOST=.gch
commit a9c6f4cfd394359baf9a3c8da297c4567bf6ffbd
Author: Robert Nagy <robert at openbsd.org>
Date: Sat Nov 6 18:40:19 2010 +0100
add OPENBSD specific stuff
diff --git a/solenv/bin/mapgen.pl b/solenv/bin/mapgen.pl
index 8cb51c3..c3effeb 100644
--- a/solenv/bin/mapgen.pl
+++ b/solenv/bin/mapgen.pl
@@ -135,7 +135,8 @@ sub filter_symbols {
$env_section = '1' and next if ((/^# SOLARIS #$/) && ($ENV{OS} eq 'SOLARIS'));
$env_section = '1' and next if ((/^# LINUX #$/) && ($ENV{OS} eq 'LINUX'));
$env_section = '1' and next if ((/^# FREEBSD #$/) && ($ENV{OS} eq 'FREEBSD'));
- last if ($env_section && ((/^# SOLARIS #$/) || (/^# FREEBSD #$/) || (/^# LINUX #$/)));
+ $env_section = '1' and next if ((/^# OPENBSD #$/) && ($ENV{OS} eq 'OPENBSD'));
+ last if ($env_section && ((/^# SOLARIS #$/) || (/^# FREEBSD #$/) || (/^# LINUX #$/) || (/^# OPENBSD #$/)));
next if (!$_ || /^#/);
push(@filters, $_);
};
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 6e0c05e..33a062e 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -299,6 +299,11 @@ sub setglobalvariables
}
}
+ if ( $installer::globals::compiler =~ /unxobsd/ )
+ {
+ $installer::globals::epmoutpath = "openbsd";
+ }
+
if ( $installer::globals::compiler =~ /unxfbsd/ )
{
$installer::globals::isfreebsdbuild = 1;
diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm
index 637e953..5aaa188 100755
--- a/solenv/bin/modules/osarch.pm
+++ b/solenv/bin/modules/osarch.pm
@@ -22,6 +22,7 @@ chop( $m_str, $s_str );
"Linux", "linux",
"FreeBSD", "freebsd",
"NetBSD", "netbsd",
+ "OpenBSD", "openbsd",
"OSF1", "decunix",
"SCO_SV", "scoosr5",
# "SCO_SV", "scouw21",
@@ -36,6 +37,7 @@ chop( $m_str, $s_str );
"Linux", "-DLINUX",
"FreeBSD", "-DFREEBSD",
"NetBSD", "-DNETBSD",
+ "OpenBSD", "-DOPENBSD",
"OSF1", "-DSYSV -DDECUNIX",
"SCO_SV", "-DSYSV -DSCO -DSCO_OSR5",
# "SCO_SV", "-DSYSV -DSCO -DSCO_UW21",
@@ -51,6 +53,7 @@ chop( $m_str, $s_str );
"Linux", "lng",
"FreeBSD", "fbsd",
"NetBSD", "bsd",
+ "OpenBSD", "obsd",
"SCO_SV", "sco",
"Darwin", "macx",
"Mac OS", "macx",
commit d25ee3500c6872f1b184e8097570ee74bb8f8063
Author: Robert Nagy <robert at openbsd.org>
Date: Sat Nov 6 18:35:38 2010 +0100
add OPENBSD ifdefs where needed
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index f0f294a..7fc6ef1 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -1002,7 +1002,7 @@ File gid_File_Dl_Stlport
End
#endif
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
File gid_File_Dl_GccS
TXT_FILE_BODY;
@@ -1017,7 +1017,7 @@ File gid_File_Dl_GccS
End
#endif
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
File gid_File_Dl_Stdcpp
Dir = SCP2_URE_DL_DIR;
commit a14d19544fe8306afa9ca6a4c4b9683daf6c9fb9
Author: Robert Nagy <robert at openbsd.org>
Date: Mon Nov 8 12:40:20 2010 +0100
set correct $outfile for OpenBSD
diff --git a/set_soenv.in b/set_soenv.in
index 5f3c7fb..dbaada4 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -405,7 +405,7 @@ elsif ( $platform =~ m/openbsd/ )
$PATH_SEPERATOR = $ps;
$OSVERSION = '@OSVERSION@';
$OUTPATH = "unxobsd";
- $outfile = "OpenBSDEnv.Set.sh";
+ $outfile = "OpenBSDEnv.Set";
if ($platform =~ m/^amd64/)
{
print "Setting OpenBSD AMD64 specific values... ";
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"
commit 066088ef313f136a54273075a691e71a9b7a0552
Author: Kurt Zenker <kz at openoffice.org>
Date: Sat Nov 6 17:01:50 2010 +0100
OOO330
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 6992bb5..aed4bf7 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m13(Build:9539)
-BUILD=9539
-LAST_MINOR=m13
+RSCREVISION=330m14(Build:9542)
+BUILD=9542
+LAST_MINOR=m14
SOURCEVERSION=OOO330
commit 2460c89b2bb618eaded5ca0ac07749ff914f3b34
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 5 12:37:23 2010 +0000
extra optimization unsafe for earlier gccs
(cherry picked from commit 30ee54453389af148ea6ac4df1c54b8f404ea559)
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 5bdffba..fa7b32e 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1008,6 +1008,12 @@ LNT=$(DEVROOT)/lint/lint
LNTFLAGS=+v -i$(DEVROOT)/lint/ -mL options.lnt -u
LNTFLAGSOUTOBJ=-os
+.IF "$(DISABLE_ENHANCED_COMID)"==""
+.INCLUDE : tg_compv.mk
+.ELSE # "$(DISABLE_ENHANCED_COMID)"==""
+COMID=$(COM)
+.ENDIF # "$(DISABLE_ENHANCED_COMID)"==""
+
.IF "$(GUI)"=="WNT"
.INCLUDE : wnt.mk
.ENDIF
@@ -1087,11 +1093,6 @@ SCPLINK=$(PERL) $(SOLARENV)/bin/par2script.pl
LZIP*=lzip
CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpplcc
-.IF "$(DISABLE_ENHANCED_COMID)"==""
-.INCLUDE : tg_compv.mk
-.ELSE # "$(DISABLE_ENHANCED_COMID)"==""
-COMID=$(COM)
-.ENDIF # "$(DISABLE_ENHANCED_COMID)"==""
.IF "$(SOLAR_JAVA)"=="TRUE"
.IF "$(USE_JAVAVER)"!=""
.INCLUDE : tg_javav.mk
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index 3602c0b..8a2f075 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -112,8 +112,12 @@ 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
+.IF "$(USE_SYSTEM_STL)"!="YES" || "$(CCNUMVER)" <= "000400050000"
+#STLPort headers are full of aliasing warnings and
+#At least SLED 10.2 gcc 4.3 overly agressively optimizes
+#uno::Sequence into junk, so only strict-alias on compiler
+#later than 4.5.1
+CFLAGSOPT+=-fno-strict-aliasing
.ENDIF
.ELSE # "$(PRODUCT)"!=""
CFLAGSOPT= # no optimizing for non products
commit aca1fb370f5e76071dcc3e1be1958b2d2b3ce892
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Nov 5 14:58:42 2010 +0100
fix ooinstall to create the installation dir
Cwd::realpath does not work if the path does not exist
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 80f46b3..f1b9edf 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -8,6 +8,7 @@
# 3. When packaging (called from package-ooo), to install to DESTDIR
use File::Find;
+use File::Path qw(mkpath);
use Cwd;
$path = '';
@@ -38,10 +39,11 @@ $ENV{'PYTHONPATH'} = "$ENV{'SRC_ROOT'}/instsetoo_native/$ENV{'INPATH'}/bin:$ENV{
for $arg (@ARGV) {
if ($arg eq '-l') {
$do_link = 1;
-
} elsif ($arg eq '-h' || $arg eq '--help') {
$help = 1;
} else {
+ # Cwd::realpath does not work if the path does not exist
+ mkpath($arg) unless -d $arg;
$path = Cwd::realpath( $arg );
}
}
commit dde811ad2976c7ae6b6b301a74436aba7367773c
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri Nov 5 13:10:42 2010 +0100
Use org.libreoffice.script for Mac preferences
This fixes fdo#30568
(cherry picked from commit 236de85bba6416d9c905029116c875671cbeaf15)
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 9ad0fc6..fe89bd0 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -354,7 +354,7 @@ sub replace_variables_in_scriptfile
replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTVERSION'}, "PRODUCTVERSION" );
my $scriptname = lc($allvariables->{'PRODUCTNAME'}) . "\.script";
- if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $scriptname = "org.openoffice.script"; }
+ if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $scriptname = "org.libreoffice.script"; }
replace_one_variable_in_shellscript($scriptfile, $scriptname, "SEARCHSCRIPTNAME" );
}
commit 5ef780900fec4195cd413f07893f3617078e130c
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Nov 4 17:29:51 2010 +0100
create the installation dir when defined (fdo#30837)
it was logical problem when I updated the code for fdo#30837
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index aebe20f..83502ef 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -397,8 +397,9 @@ sub create_directories
if ($newdirectory eq "install" )
{
- # put packages into versioned path (fdo#30837)
- $path = $path . "$installer::globals::ooodownloadfilename";
+ # put packages into versioned path (fdo#30837)
+ $path = $path . "$installer::globals::ooodownloadfilename";
+ create_directory($path);
}
else
{
@@ -417,8 +418,8 @@ sub create_directories
}
$path = $path . $languagestring . $installer::globals::separator;
+ create_directory($path);
}
- create_directory($path);
}
}
commit bdbd0385f6972f49a5e954cebb342263f3666c7d
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Nov 4 16:00:16 2010 +0100
fix smoketest with the improved download tarball (fdo#30837)
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 15a80b0..80de446 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -39,7 +39,7 @@ my_instsets = $(shell ls -dt \
installationtest_instset = $(my_instsets:1)
.ELSE
installationtest_instset = \
- $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso)
+ $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install
.END
.IF "$(OS)" == "WNT"
commit e45385b0fb2339738ce07c8cd6985c55b522e557
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Nov 4 15:25:20 2010 +0100
better name directory with download tarballs
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index b7f01ff..8e70bbb 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -1951,7 +1951,7 @@ sub create_download_sets
my $lastdir = $installationdir;
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$lastdir);
- if ( $lastdir =~ /\./ ) { $lastdir =~ s/\./_download_inprogress\./ }
+ if ( $installer::globals::iswindowsbuild && $lastdir =~ /\./ ) { $lastdir =~ s/\./_download_inprogress\./ }
else { $lastdir = $lastdir . "_download_inprogress"; }
# removing existing directory "_native_packed_inprogress" and "_native_packed_witherror" and "_native_packed"
commit f9b6ca66bfab141bd5a13945f37ed64e286930a3
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Nov 3 21:28:39 2010 +0100
set SHORT_PRODUCTEXTENSION to beta3
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 8daf376..836899c 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -56,7 +56,7 @@ LibreOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION beta3
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -121,7 +121,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION beta3
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -186,7 +186,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION beta3
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
@@ -263,7 +263,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION beta3
LICENSENAME LGPL
SERVICESPROJEKT 1
SETSTATICPATH 1
@@ -303,7 +303,7 @@ LibreOffice_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION beta3
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
@@ -348,7 +348,7 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION beta3
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
commit d166e81980fb8f02411005862d5ab5b3a4f57bdd
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Nov 3 21:20:18 2010 +0100
use versioned path in download tarballs (fdo#30837)
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 441f28d..4c464fa 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1292,6 +1292,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
# Creating directories
####################################################
+ if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { installer::download::set_download_filename($languagestringref, $allvariableshashref); }
+ else { installer::download::resolve_variables_in_downloadname($allvariableshashref, "", $languagestringref); }
+
$installdir = installer::worker::create_installation_directory($shipinstalldir, $languagestringref, \$current_install_number);
my $listfiledir = installer::systemactions::create_directories("listfile", $languagestringref);
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index e3ef783..aebe20f 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -390,29 +390,38 @@ sub create_directories
$path = $path . $newdirectory . $installer::globals::separator;
create_directory($path);
-
+
my $locallanguagesref = "";
-
+
if ( $$languagesref ) { $locallanguagesref = $$languagesref; }
- if (!($locallanguagesref eq "" )) # this will be a path like "01_49", for Profiles and ConfigurationFiles, idt-Files
+ if ($newdirectory eq "install" )
{
- my $languagestring = $$languagesref;
-
- if (length($languagestring) > $installer::globals::max_lang_length )
+ # put packages into versioned path (fdo#30837)
+ $path = $path . "$installer::globals::ooodownloadfilename";
+ }
+ else
+ {
+ if ($locallanguagesref ne "") # this will be a path like "01_49", for Profiles and ConfigurationFiles, idt-Files
{
- my $number_of_languages = get_number_of_langs($languagestring);
- chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
- # $languagestring = $shorter;
- my $id = substr($shorter, 0, 8); # taking only the first 8 digits
- $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
- }
- $path = $path . $languagestring . $installer::globals::separator;
+ my $languagestring = $$languagesref;
+
+ if (length($languagestring) > $installer::globals::max_lang_length )
+ {
+ my $number_of_languages = get_number_of_langs($languagestring);
+ chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
+ # $languagestring = $shorter;
+ my $id = substr($shorter, 0, 8); # taking only the first 8 digits
+ $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
+ }
+
+ $path = $path . $languagestring . $installer::globals::separator;
+ }
create_directory($path);
}
}
-
+
installer::remover::remove_ending_pathseparator(\$path);
$path = installer::converter::make_path_conform($path);
commit e45e52f5a3e2b48e7a3b0a395b0ce444b6fb9828
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Nov 3 15:03:27 2010 +0100
Don't add an explicit -L/usr/lib or -L/usr/lib64.
It breaks KDE3 build on SUSE.
diff --git a/set_soenv.in b/set_soenv.in
index 1ae3d66..989dff4 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1345,8 +1345,10 @@ elsif ($platform =~ m/linux|netbsd|osf1|aix|freebsd/)
$L.$JRELIBDIR.
$L.$JRETOOLKITDIR.
$L.$JRETHREADDIR.
- $L_STLPORT_LIB.
- $L.$XLIB;
+ $L_STLPORT_LIB;
+ if ( $XLIB ne "/usr/lib" && $XLIB ne "/usr/lib64" ) {
+ $SOLARLIB .= $L.$XLIB;
+ }
}
elsif ($platform =~ m/cygwin|os2/)
{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
commit 69001fa68235ff8ec958d1c19d492f8d7a73fd0d
Author: Joseph Powers <jpowers27 at cox.net>
Date: Wed Nov 3 10:17:39 2010 +0100
Fix Mac build issues.
(cherry picked from commit 994b9eaca0707c9d462a358a10d2ae7a066edc32)
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index 726e092..844c36f 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -1,7 +1,7 @@
#*************************************************************************
#
# 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
@@ -47,6 +47,7 @@ sub action($$$)
'shl/BOXT/URELIB' => '@executable_path/urelibs',
'shl/BOXT/OOO' => '@loader_path/../../../basis-link/program',
'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
+ 'shl/OOO/NONE' => '@__VIA_LIBRARY_PATH__',
'shl/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
'shl/NONE/NONE' => '@__VIA_LIBRARY_PATH__');
my ($type, $loc1, $loc2) = @_;
commit e2cb483262c61c79648fe3a4c2072c6b48ae11b5
Author: Bernhard Rosenkraenzer <bero at arklinux.org>
Date: Mon Nov 1 17:34:28 2010 +0100
correctly check Template Pack and Lightproof with --with-lang=ALL
diff --git a/configure.in b/configure.in
index 38d2e7b..e6206f3 100644
--- a/configure.in
+++ b/configure.in
@@ -6990,7 +6990,7 @@ else
LIGHTPROOF_LANG=
# check whether the langs are requested at all
for lang in $wanted_lightproof ; do
- if test -n "`echo $with_lang | grep "$lang"`" ; then
+ if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
fi
done
@@ -7164,7 +7164,7 @@ else
SUNTEMPLATES_LANG=
# check whether the langs are requested at all
for lang in $wanted_sun_templates ; do
- if test -n "`echo $with_lang | grep "$lang"`" ; then
+ if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
fi
done
commit d839f5987ff634193384117dcd7b8e890ebc7b2c
Author: Rene Engelhard <rene at debian.org>
Date: Tue Nov 2 02:22:53 2010 +0100
move undefined(!) $setup_vars{'X'} to $ENV{'X'} in solenv/bin/ooinstall
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index f848ea8..80f46b3 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -73,7 +73,8 @@ $ENV{LOCAL_COMMON_OUT} = $ENV{OUT};
# the installer to use the English localization of the file instead.
$ENV{DEFAULT_TO_ENGLISH_FOR_PACKING} = 1;
-$langs=$setup_vars{OOO_LANGS_LIST};
+# FIXME. Migrate to WITH_LANG?
+$langs=$ENV{OOO_LANGS_LIST};
$langs='en-US' if $langs eq '';
$langs =~ s/\s+/,/g;
# FIXME: hack... we get a useless , at the end which makes it being e.g. zu#
@@ -81,14 +82,14 @@ $langs =~ s/\s+/,/g;
$langs =~ s/,'/'/;
$destdir='';
-if ( defined $setup_vars{OODESTDIR} &&
- $setup_vars{OODESTDIR} ne "" ) {
- $destdir = "-destdir \"$setup_vars{OODESTDIR}\"";
+if ( defined $ENV{OODESTDIR} &&
+ $ENV{OODESTDIR} ne "" ) {
+ $destdir = "-destdir \"$ENV{OODESTDIR}\"";
}
$strip='';
-if ( defined $setup_vars{OOO_STRIP} &&
- $setup_vars{OOO_STRIP} eq "no" ) {
+if ( defined $ENV{OOO_STRIP} &&
+ $ENV{OOO_STRIP} eq "no" ) {
$strip = "-dontstrip";
}
commit a9dad017cdaa4fd0ff40801cec942580b5e4bd4a
Author: Niko Rönkkö <ronkko at iki.fi>
Date: Mon Nov 1 18:41:45 2010 +0200
Removed deprecated option
--with-unzip-home has been deprecated since 2003.
diff --git a/configure.in b/configure.in
index 7a9dc43..38d2e7b 100644
--- a/configure.in
+++ b/configure.in
@@ -1037,9 +1037,6 @@ AC_ARG_WITH(os-version,
Usage: --with-os-version=<OSVERSION>
],,)
-AC_ARG_WITH(unzip-home,
-[ --with-unzip-home Deprecated: use --with-zip-home instead],,)
-
AC_ARG_WITH(zip-home,
[ --with-zip-home If you use a non standard zip, for example windows
please supply the path for zip
@@ -5882,12 +5879,6 @@ ASM_HOME="$with_asm_home"
AC_SUBST(ASM_HOME)
dnl ===================================================================
-dnl testing handle deprecated unzip switch
-dnl ===================================================================
-if test -z "$with_zip_home"; then
- with_zip_home="$with_unzip_home"
-fi
-dnl ===================================================================
dnl Zip will be found where you tell me to find it
dnl ===================================================================
if test -n "$with_zip_home" ; then
More information about the Libreoffice-commits
mailing list