[Libreoffice] [REVIEW] svgwriter SVGActionWriter::ImplWriteText uses auto_prt with new[]
Hello, Cppcheck detected the use of an auto_ptr with new [] in filter/source/svg/svgwriter.cxx (line 1145). Since, auto_ptr shouldn't be used with new[] because it always does a delete (and not a delete[] in this case), the code should be changed. So I thought about using boost::shared_array. I attached a patch. Is this one correct ? (if yes, I can of course commit and push it on master). Julien. http://nabble.documentfoundation.org/file/n3306210/patch_svg.txt patch_svg.txt -- View this message in context: http://nabble.documentfoundation.org/REVIEW-svgwriter-SVGActionWriter-ImplWriteText-uses-auto-prt-with-new-tp3306210p3306210.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] gnumake / dependencies 20%+ speedup ...
On Fri, 02 Sep 2011 21:22:24 +0100 Michael Meeks michael.me...@novell.com wrote: Hi there, Being generally irritated by the apparent hang when running make (I know, I know it is all faster in real terms than it used to be ;-) I was poking at the dependency files in: core/workdir/unxlngi6.pro/Dep/LinkTarget/Library And - being of an ignorant nature, I was amazed to see them packed half-full of a great mass of dummy / empty dependency rules like these: /data/opt/libreoffice/core/solver/unxlngi6.pro/inc/tools/string.hxx: /data/opt/libreoffice/core/solver/unxlngi6.pro/inc/osl/thread.h: .. Using the attached perl script to remove these [ and I assume they are truly redundant ;-] we get some quite interesting shrinkage (gnumake profiles show most of its time parsing and hashing strings interestingly): core/workdir/unxlngi6.pro/Dep/LinkTarget/Library du -k -c *.d.orig | tail 12748 vbaobj.uno.so.d.orig 9720 vbaswobj.uno.so.d.orig 2096 vclcanvas.uno.so.d.orig 372 writerfilter_uno.uno.so.d.orig 603924 total core/workdir/unxlngi6.pro/Dep/LinkTarget/Library du -k -c *.d | tail 6424 vbaobj.uno.so.d 4904 vbaswobj.uno.so.d 1060 vclcanvas.uno.so.d 192 writerfilter_uno.uno.so.d 324084total ie. around 50% of the byte size is gone. That translates into: * tail_build (clean make -sr / secs) + before: 33.964 33.842 34.902 + after: 21.858 21.202 21.090 * sc (clean make -sr / secs) + before: 5.238 5.729 5.802 + after: 4.195 4.184 4.195 Of course when using cvs gnumake (which has the other globbing win in it - without which everything is far slower). So - my question is: how are those library .d files created / concatenated - and is there some existing script we could piggy-back on to get rid of these. Or are they there in fact there for some good purpose that I just failed to spot ? :-) Yes, please read Caolans comments on: https://bugs.freedesktop.org/show_bug.cgi?id=40099 Best, Bjoern -- https://launchpad.net/~bjoern-michaelsen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] ODBC literal escapes in LibreOffice
On Fri, Sep 02, 2011 at 06:26:40PM +0200, Alexander Thurgood wrote:
Le 02/09/11 18:05, Lionel Elie Mamane a écrit :
So, I wanted to check whether it is policy that SDBC drivers must
accept ODBC escapes in SQL strings, or whether there would be
interest in me gradually changing LibreOffice to *not* use
ODBC-specific escapes.
How would you envisage the prepared statement working with the
filter functionality currently available in forms, for example,
where this transition from date literal is transparent for the user
(because the query is generated on the fly) ?
Exactly: it is transparent for the user, because the query is
generated on the fly; in the example of a table, instead of the on
the fly query being generated as e.g. (con being the connection):
stmt = con.createStatement();
rs = stmt.executeQuery(SELECT * FROM tblName WHERE dtColumn = {D
2011-08-28});
something like that would be done (where filterDate is the
::com::sun::star::util::Date containing the date to filter on):
stmt = con.prepareStatement(SELECT * FROM tblName WHERE dtColumn = ?);
stmt.setDate(1, filterDate);
rs = stmt.executeQuery();
On Fri, Sep 02, 2011 at 06:33:10PM +0200, Alexander Thurgood wrote:
Might this also have an impact on Basic macros, which currently have
to convert Basic com.sun.star.util.Date used as a date variable into
something that the XParameter setDate can understand because the two
are not the same ?
No, that won't have an effect on the fact that Basic macros using the
prepared statement interface have to convert the Basic date type
(basically an integer, if I remember well) into a
com.sun.star.util.Date structure.
--
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Problem with embedded images
Thanks for your answer. Here is the bug report with an attachment: https://bugs.freedesktop.org/attachment.cgi?id=50866 -- View this message in context: http://nabble.documentfoundation.org/Problem-with-embedded-images-tp3229949p3306482.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] (no subject)
Eike Rathke wrote: Can we do something against letting all those .exe .scr .zip etc. attachments pass through? Yep, just adapted the setup accordingly. Note that the surrounding messages will still be delivered (that might annoy people who've previously had downstream filters for exactly those attachments). Oh, .zip is still permitted - no strong opinion on that one, though. Cheers, -- Thorsten pgp2HaJHOhd5i.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED] [REVIEW] svgwriter SVGActionWriter::ImplWriteText uses auto_prt with new[]
julien2412 wrote: I attached a patch. Is this one correct ? (if yes, I can of course commit and push it on master). Yep, good catch. Pushed to master. Cheers, -- Thorsten pgpYyYKUf913c.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] Patch for importing hyperliks from .doc files
Hi, This patch solves a serious problem experienced by many companies and need to be included in libreoffice. I'm using this patch with my own build for my customers with ooo 3.2.1 http://openoffice.org/bugzilla/show_bug.cgi?id=114485 Best regards -- Knut Olav Bøhmer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW] Patch for importing hyperliks from .doc files
Hmm, messy since it involves .doc import/export. In any case, here is the new live location for the issue: https://issues.apache.org/ooo/show_bug.cgi?id=114485. In migrating to https://issues.apache.org/ooo/ we lost everyone's passwords. You can restore your account by clicking Forgot Password. At the Login: prompt, enter the e-mail address that goes with your previous user ID (that is, use k...@openoffice.org, not just koho). Finally, click Reset Password. You will receive a password-change token by e-mail. The advantage is all live-links of your ID on bugzilla pages will be restored and you will have your My bugs link will work as well. Bringing it to LibreOffice attention is a good idea. I just wanted you to know that you still have a common place to maintain this and other bugs if you choose to do so. Keeping the common number helps us synchronize fixes between LibreOffice and Apache OpenOffice at some point. - Dennis (PS: I am putting up more information on the new URL and the password reset on openoffice.org lists and forums later today here in UTC-0700.) -Original Message- From: libreoffice-bounces+dennis.hamilton=acm@lists.freedesktop.org [mailto:libreoffice-bounces+dennis.hamilton=acm@lists.freedesktop.org] On Behalf Of Knut Olav Bøhmer Sent: Saturday, September 03, 2011 15:30 To: Caolán McNamara; libreoffice Cc: Harald Kagerer Subject: [Libreoffice] [REVIEW] Patch for importing hyperliks from .doc files Hi, This patch solves a serious problem experienced by many companies and need to be included in libreoffice. I'm using this patch with my own build for my customers with ooo 3.2.1 http://openoffice.org/bugzilla/show_bug.cgi?id=114485 Best regards -- Knut Olav Bøhmer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW] Patch for importing hyperliks from .doc files
I said I just wanted you to know that you still have a common place to maintain this and other bugs if you choose to do so. Keeping the common number helps us synchronize fixes between LibreOffice and Apache OpenOffice at some point. I was only thinking only of issues that are already recorded on the OpenOffice.org bugzilla. To track resolution in LibreOffice, I think a new issue would be needed. In that case, it would be valuable to cross-reference. The same can be done if a reported defect at LibreOffice inspires creation of an issue against the Apache ooo code base as well. (I am not assuming we would use each other's patches, since there may be license and permission incompatibilities.) Also, if an id@openoffice.org e-mail is no longer received correctly, it is not possible to restore that account on the Apache bugzilla. The best that can be done is to create a new account at https://issues.apache.org/ooo/. The My bugs list will be a new empty one. -Original Message- From: libreoffice-bounces+dennis.hamilton=acm@lists.freedesktop.org [mailto:libreoffice-bounces+dennis.hamilton=acm@lists.freedesktop.org] On Behalf Of Dennis E. Hamilton Sent: Saturday, September 03, 2011 16:24 To: 'Knut Olav Bøhmer'; 'Caolán McNamara'; 'libreoffice' Cc: 'Harald Kagerer' Subject: Re: [Libreoffice] [REVIEW] Patch for importing hyperliks from .doc files Hmm, messy since it involves .doc import/export. In any case, here is the new live location for the issue: https://issues.apache.org/ooo/show_bug.cgi?id=114485. In migrating to https://issues.apache.org/ooo/ we lost everyone's passwords. You can restore your account by clicking Forgot Password. At the Login: prompt, enter the e-mail address that goes with your previous user ID (that is, use k...@openoffice.org, not just koho). Finally, click Reset Password. You will receive a password-change token by e-mail. The advantage is all live-links of your ID on bugzilla pages will be restored and you will have your My bugs link will work as well. Bringing it to LibreOffice attention is a good idea. I just wanted you to know that you still have a common place to maintain this and other bugs if you choose to do so. Keeping the common number helps us synchronize fixes between LibreOffice and Apache OpenOffice at some point. - Dennis (PS: I am putting up more information on the new URL and the password reset on openoffice.org lists and forums later today here in UTC-0700.) -Original Message- From: libreoffice-bounces+dennis.hamilton=acm@lists.freedesktop.org [mailto:libreoffice-bounces+dennis.hamilton=acm@lists.freedesktop.org] On Behalf Of Knut Olav Bøhmer Sent: Saturday, September 03, 2011 15:30 To: Caolán McNamara; libreoffice Cc: Harald Kagerer Subject: [Libreoffice] [REVIEW] Patch for importing hyperliks from .doc files Hi, This patch solves a serious problem experienced by many companies and need to be included in libreoffice. I'm using this patch with my own build for my customers with ooo 3.2.1 http://openoffice.org/bugzilla/show_bug.cgi?id=114485 Best regards -- Knut Olav Bøhmer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] remove build.pl --gmake option refrences from Makefile
The --gmake option was removed from build.pl in commit 4103138 This patch removes the remaining references from Makefile. From 7e32982dc47dd14cb813a8e3bc393cc38c82e929 Mon Sep 17 00:00:00 2001 From: Peter Foley pefol...@verizon.net Date: Sat, 3 Sep 2011 20:49:15 -0400 Subject: [PATCH] remove build.pl --gmake option refrences from Makefile --- Makefile.in | 16 +--- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8c7f803..154611a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,12 +2,6 @@ SHELL=/usr/bin/env bash -ifeq ($(USE_GMAKE),) -GBUILD_OPT:= -else -GBUILD_OPT:=--gmake -endif - ifeq (@CROSS_COMPILING@,YES) CROSS_TOOLSET_RULE:=cross-build-toolset else @@ -17,12 +11,12 @@ endif all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded $(CROSS_TOOLSET_RULE) @. ./Env.Host.sh \ cd instsetoo_native \ -build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ +build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ cross-build-toolset: @. ./Env.Build.sh \ cd cross_toolset \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ + build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ install: @. ./Env.Host.sh \ @@ -43,7 +37,7 @@ dev-install: @. ./Env.Host.sh \ cd smoketestoo_native \ export SAL_USE_VCLPLUGIN=svp \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all:instsetoo_native -- -P@BUILD_MAX_JOBS@ \ + build.pl -P@BUILD_NCPUS@ --all:instsetoo_native -- -P@BUILD_MAX_JOBS@ \ cd @abs_builddir@ ln -s $$SOLARVER/$$INPATH/installation/opt/ install \ echo \ $$SOLARENV/bin/linkoo $$SRC_ROOT/install $$SRC_ROOT \ @@ -101,7 +95,7 @@ check: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ fetch @. ./Env.Host.sh \ cd smoketestoo_native \ export SAL_USE_VCLPLUGIN=svp \ -build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ +build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ @. ./Env.Host.sh $$SOLARENV/bin/subsequenttests id: @@ -125,7 +119,7 @@ findunusedcode: source (sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) \ . ./solenv/bin/callcatchEnv.Set.sh \ cd instsetoo_native \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ + build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ @. ./Env.Host.sh \ source (sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) \ callanalyse \ -- 1.7.6.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] update configure.in
Sorry, but I just found a bug in this patch please disregard it. I'll send a revised version shortly. Thanks, Peter ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [ANNOUNCEMENT] OO.o Bugzilla Now Supported at Apache
FYI for those who have an interest in checking previously-reported bugs of theirs on OpenOffice.org. -Original Message- From: Dennis E. Hamilton [mailto:dennis.hamil...@acm.org] Sent: Saturday, September 03, 2011 17:45 To: us...@openoffice.org Subject: [ANNOUNCEMENT] OO.o Bugzilla Now Supported at Apache SUMMARY 1. The OpenOffice.org Bugzilla Issue Tracker at http://openoffice.org/bugzilla/ is now Read-Only. New bugs cannot be entered. Existing issues can be reviewed. Existing issues cannot be modified or updated. 2. The complete Buzilla Issue Tracker is now moved to the Apache OOo Bugzilla http://issues.apache.org/ooo/. It is publicly readable. Anyone can request a new account in order to be able to report issues. 3. If you ALREADY HAVE AN ACCOUNT on the OpenOffice.org Bugzilla, you can reactivate your account at the Apache OOo Bugzilla. However, the e-mail address held for your account must still be operational. REACTIVATING YOUR ACCOUNT 4. Current passwords were de-activated in the transfer of the Issue Tracker repository to Apache. If you had an account with Login ID: id, that account still exists with Login ID: id@openoffice.org. If you had a Login ID: e-mail that account still exists. 5. To reactivate your account, go to the http://issues.apache.org/ooo/ web page. 6. In the banner at the top of the page, click Forgot Password. 7. In the new banner, enter your Login e-mail Id at the Login: prompt. If you used an e-mail address before, enter it now. If you used an user-name, user before, now enter user@openoffice.org. (Replace user with the actual user-name.) 8. Click Reset Password 9. If the e-mail is for a known account, a password reset message will be sent to that e-mail address. When it arrives, follow the instructions in that message and specify a new password. 10. Then Log In with the same e-mail to use the issue tracker to do more than look. You can now use the Preferences link on the page banners to make other adjustments. WHY REACTIVATE THIS WAY? 10. When your account is reactivated, all bug reports in which you are a contributor will have the link from your User ID restored. You will now receive appropriate notifications. You can amend those issues by the same User ID. 11. In addition, when you are logged in, the My Bugs link at the top and bottom bars of pages will be available. PLEASE DO THIS FIRST 12. Please use the My Bugs list to verify that any issues you reported previously have been preserved correctly. 13. If there is a problem in any of the bug reports, the best way to let the Apache OOo Project know is to send a message to ooo-...@incubator.apache.org. Please include the Issue Number and any other important details in your message. If there is a problem with the functioning of the Apache OOo Bugzilla itself, you can also use the bugzilla-admin email address given in the bottom-of-page banner. - Dennis -Original Message- From: libreoffice-bounces+dennis.hamilton=acm@lists.freedesktop.org [mailto:libreoffice-bounces+dennis.hamilton=acm@lists.freedesktop.org] On Behalf Of Dennis E. Hamilton Sent: Saturday, September 03, 2011 16:45 To: dennis.hamil...@acm.org; 'Knut Olav Bøhmer'; 'Caolán McNamara'; 'libreoffice' Cc: 'Harald Kagerer' Subject: Re: [Libreoffice] [REVIEW] Patch for importing hyperliks from .doc files I said I just wanted you to know that you still have a common place to maintain this and other bugs if you choose to do so. Keeping the common number helps us synchronize fixes between LibreOffice and Apache OpenOffice at some point. I was only thinking only of issues that are already recorded on the OpenOffice.org bugzilla. To track resolution in LibreOffice, I think a new issue would be needed. In that case, it would be valuable to cross-reference. The same can be done if a reported defect at LibreOffice inspires creation of an issue against the Apache ooo code base as well. (I am not assuming we would use each other's patches, since there may be license and permission incompatibilities.) Also, if an id@openoffice.org e-mail is no longer received correctly, it is not possible to restore that account on the Apache bugzilla. The best that can be done is to create a new account at https://issues.apache.org/ooo/. The My bugs list will be a new empty one. -Original Message- From: libreoffice-bounces+dennis.hamilton=acm@lists.freedesktop.org [mailto:libreoffice-bounces+dennis.hamilton=acm@lists.freedesktop.org] On Behalf Of Dennis E. Hamilton Sent: Saturday, September 03, 2011 16:24 To: 'Knut Olav Bøhmer'; 'Caolán McNamara'; 'libreoffice' Cc: 'Harald Kagerer' Subject: Re: [Libreoffice] [REVIEW] Patch for importing hyperliks from .doc files Hmm, messy since it involves .doc import/export. In any case, here is the new live location for the issue: https://issues.apache.org/ooo/show_bug.cgi?id=114485. In migrating to
[Libreoffice] [PATCH] update configure.in
This patch updates configure.in using recomendations from autoupdate
2.68.
It also raises the required version of autoconf from 2.50 to 2.58
because versions of autoconf less then 2.58 don't work with the current
configure.in.
It also moves the generation of ooo.lst next to the other generated files
so that config.status is only generated once.
From 89798c9f8661e7ab1a180424cdb7d8cc42fd Mon Sep 17 00:00:00 2001
From: Peter Foley pefol...@verizon.net
Date: Sat, 3 Sep 2011 20:23:32 -0400
Subject: [PATCH] update configure.in
---
configure.in | 114 --
1 files changed, 47 insertions(+), 67 deletions(-)
mode change 100755 = 100644 configure.in
diff --git a/configure.in b/configure.in
old mode 100755
new mode 100644
index f2c3cba..7ab4995
--- a/configure.in
+++ b/configure.in
@@ -2,8 +2,8 @@ dnl -*- Mode: Autoconf; tab-width: 8; indent-tabs-mode: nil -*-
dnl configure.in serves as input for the GNU autoconf package
dnl in order to create a configure script.
-AC_INIT([LibreOffice], [3.5],,, [http://documentfoundation.org/])
-AC_PREREQ(2.50)
+AC_INIT([LibreOffice],[3.5],[],[],[http://documentfoundation.org/])
+AC_PREREQ([2.58])
echo $@ config.parms
dnl ===
@@ -1466,7 +1466,7 @@ echo
dnl ===
dnl checks build and host OSes
dnl ===
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
if test $cross_compiling = yes; then
CROSS_COMPILING=YES
@@ -3035,7 +3035,7 @@ if test $GXX = yes; then
if test $_gpp_majmin = 304; then
AC_MSG_CHECKING([whether $CXX has the enum bug])
-AC_TRY_RUN([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
extern C void abort (void);
extern C void exit (int status);
@@ -3054,8 +3054,7 @@ if test $GXX = yes; then
test (E0);
return 0;
}
-],
-[AC_MSG_ERROR([your version of the GNU C++ compile has a bug which
prevents LibreOffice from being compiled correctly - please check
http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details.])],
[AC_MSG_RESULT([no])])
+]])],[AC_MSG_ERROR([your version of the GNU C++ compile has a bug
which prevents LibreOffice from being compiled correctly - please check
http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for
details.])],[AC_MSG_RESULT([no])],[])
fi
fi
@@ -3274,12 +3273,10 @@ _ACEOF
AC_LANG_PUSH([C++])
AC_MSG_CHECKING([for dynamic libgcc])
-AC_TRY_LINK([
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include iostream
using namespace std;
-],
-[ try { throw 42; } catch (int e) { cout Yep, e endl; } ],
-[
+]], [[ try { throw 42; } catch (int e) { cout Yep, e endl; }
]])],[
MINGW_GCCDLL=`$OBJDUMP -p conftest.exe | grep 'DLL Name: libgcc' |
$SED -e 's@.*DLL Name: @@'`
if test -n $MINGW_GCCDLL; then
MINGW_SHARED_GCCLIB=YES
@@ -3288,18 +3285,15 @@ using namespace std;
MINGW_SHARED_GCCLIB=NO
AC_MSG_RESULT([no])
fi
- ],
- [ AC_MSG_RESULT([no])
- ]
-)
+ ],[ AC_MSG_RESULT([no])
+
+])
AC_MSG_CHECKING([for dynamic libstdc++])
-AC_TRY_LINK([
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#include iostream
using namespace std;
-],
-[ cout Hello there. endl; ],
-[
+]], [[ cout Hello there. endl; ]])],[
MINGW_GXXDLL=`$OBJDUMP -p conftest.exe | grep 'DLL Name:
libstdc++' | $SED -e 's@.*DLL Name: @@'`
if test -n $MINGW_GXXDLL; then
mingw_gxxdll_root=${MINGW_GXXDLL%.dll}
@@ -3311,10 +3305,9 @@ using namespace std;
MINGW_SHARED_GXXLIB=NO
AC_MSG_RESULT([no])
fi
- ],
- [ AC_MSG_RESULT([no])
- ]
-)
+ ],[ AC_MSG_RESULT([no])
+
+])
AC_LANG_POP([C++])
@@ -3348,16 +3341,12 @@ dnl
*
if test $WITH_MINGW = yes; then
AC_MSG_CHECKING([exception type])
AC_LANG_PUSH([C++])
-AC_TRY_LINK(
-[#include iostream
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include iostream
extern C void _Unwind_SjLj_RaiseException(void) __attribute__
((__noreturn__));
-],
-[_Unwind_SjLj_RaiseException() ],
-[exceptions_type=sjlj],
-[exceptions_type=dwarf2]
-)
+]], [[_Unwind_SjLj_RaiseException()
]])],[exceptions_type=sjlj],[exceptions_type=dwarf2
+])
AC_MSG_RESULT($exceptions_type)
AC_LANG_POP([C++])
fi
@@ -3422,7 +3411,7 @@ if test $GCC = yes; then
AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
save_CFLAGS=$CFLAGS
CFLAGS=$CFLAGS -Werror -fvisibility=hidden
-AC_TRY_LINK([], [
Re: [Libreoffice] [PATCH] remove build.pl --gmake option refrences from Makefile
On Sat, Sep 3, 2011 at 7:54 PM, Peter Foley pefol...@verizon.net wrote: The --gmake option was removed from build.pl in commit 4103138 This patch removes the remaining references from Makefile. yep, my mess. I did not clean-up completely... thanks for taking care of that. Could you be kind enough to re-send these patch as attachments, it would make my life easier yeah, I know I should use a better email client than gmail... but until I finally get around to develop a reasonable proficiency in mutt, extracting patch from inline content is pretty error prone (line wrapping and other horror stories)). thanks. Norbert From 7e32982dc47dd14cb813a8e3bc393cc38c82e929 Mon Sep 17 00:00:00 2001 From: Peter Foley pefol...@verizon.net Date: Sat, 3 Sep 2011 20:49:15 -0400 Subject: [PATCH] remove build.pl --gmake option refrences from Makefile --- Makefile.in | 16 +--- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8c7f803..154611a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,12 +2,6 @@ SHELL=/usr/bin/env bash -ifeq ($(USE_GMAKE),) -GBUILD_OPT:= -else -GBUILD_OPT:=--gmake -endif - ifeq (@CROSS_COMPILING@,YES) CROSS_TOOLSET_RULE:=cross-build-toolset else @@ -17,12 +11,12 @@ endif all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded $(CROSS_TOOLSET_RULE) @. ./Env.Host.sh \ cd instsetoo_native \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ + build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ cross-build-toolset: @. ./Env.Build.sh \ cd cross_toolset \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ + build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ install: @. ./Env.Host.sh \ @@ -43,7 +37,7 @@ dev-install: @. ./Env.Host.sh \ cd smoketestoo_native \ export SAL_USE_VCLPLUGIN=svp \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all:instsetoo_native -- -P@BUILD_MAX_JOBS@ \ + build.pl -P@BUILD_NCPUS@ --all:instsetoo_native -- -P@BUILD_MAX_JOBS@ \ cd @abs_builddir@ ln -s $$SOLARVER/$$INPATH/installation/opt/ install \ echo \ $$SOLARENV/bin/linkoo $$SRC_ROOT/install $$SRC_ROOT \ @@ -101,7 +95,7 @@ check: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ fetch @. ./Env.Host.sh \ cd smoketestoo_native \ export SAL_USE_VCLPLUGIN=svp \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ + build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ @. ./Env.Host.sh $$SOLARENV/bin/subsequenttests id: @@ -125,7 +119,7 @@ findunusedcode: source (sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) \ . ./solenv/bin/callcatchEnv.Set.sh \ cd instsetoo_native \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ + build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ @. ./Env.Host.sh \ source (sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) \ callanalyse \ -- 1.7.6.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
