subject:"\[Libreoffice\-commits\] core.git\: external\/firebird"

[Libreoffice-commits] core.git: external/firebird

2022-10-20 Thread Stephan Bergmann (via logerrit)

 external/firebird/configure-c99.patch |   26 --
 1 file changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 0dd37854627aea025aa7bdae3b3bf9ca2d893943
Author: Stephan Bergmann 
AuthorDate: Thu Oct 20 10:16:12 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 20 12:27:30 2022 +0200

external/firebird: Adapt more configure checks to C99

...similar to f6be6cd82bd84f13d2a597ceb6218ae0eb80 "external/firebird:
Missing include in configure check" and 
7e1ff1cee5dd203df679d584512930fb21b97f6e
"external/firebird: Implicit int in configure check".  With recent Clang on
Linux it had still failed to detected

> configure:20511: checking for working sem_init()
[...]
> conftest.c:166:2: error: type specifier missing, defaults to 'int'; ISO 
C99 and later do not support implicit int [-Wimplicit-int]
> main () {
> ^
> int
> conftest.c:168:3: error: call to undeclared library function 'exit' with 
type 'void (int) __attribute__((noreturn))'; ISO C99 and later do not support 
implicit function declarations [-Wimplicit-function-declaration]
> exit(sem_init(,0,0));
> ^
> conftest.c:168:3: note: include the header  or explicitly 
provide a declaration for 'exit'

and

> configure:21256: checking for native large file support
[...]
> conftest.c:167:5: error: type specifier missing, defaults to 'int'; ISO 
C99 and later do not support implicit int [-Wimplicit-int]
> main () {
> ^
> int
> conftest.c:168:5: error: call to undeclared library function 'exit' with 
type 'void (int) __attribute__((noreturn))'; ISO C99 and later do not support 
implicit function declarations [-Wimplicit-function-declaration]
> exit(!(sizeof(off_t) == 8));
> ^
> conftest.c:168:5: note: include the header  or explicitly 
provide a declaration for 'exit'

And at least the former, which erroneously suppressed setting 
WORKING_SEM_INIT,
sporadically caused CppunitTest_dbaccess_hsql_binary_import to SIGABRT for 
me at

> #10 0x7f087fce37fc in __GI_abort ()
> #11 0x7f085a7e32e8 in 
Firebird::system_call_failed::system_call_failed(char const*, int) 
(this=0x55fbb11e5650, syscall=0x7f085a19ac06 "sem_open", error_code=17) at 
workdir/UnpackedTarball/firebird/src/common/fb_exception.cpp:244
> #12 0x7f085a7e33ba in Firebird::system_call_failed::raise(char 
const*) (syscall=0x7f085a19ac06 "sem_open") at 
workdir/UnpackedTarball/firebird/src/common/fb_exception.cpp:255
> #13 0x7f085a81ff4e in Firebird::SignalSafeSemaphore::init() 
(this=0x55fbb1268c80) at 
workdir/UnpackedTarball/firebird/src/common/classes/semaphore.cpp:138
> #14 0x7f085a38ee85 in 
Firebird::SignalSafeSemaphore::SignalSafeSemaphore() (this=0x55fbb1268c80) at 
workdir/UnpackedTarball/firebird/src/common/classes/semaphore.h:156
> #15 0x7f085a38c931 in (anonymous 
namespace)::MappingIpc::MappingIpc(Firebird::MemoryPool&) (this=0x55fbb1268bf0) 
at workdir/UnpackedTarball/firebird/src/jrd/Mapping.cpp:602
> #16 0x7f085a38176b in Firebird::GlobalPtr<(anonymous 
namespace)::MappingIpc, 
(Firebird::InstanceControl::DtorPriority)2>::GlobalPtr() (this=0x7f085a93e780 
<(anonymous namespace)::mappingIpc>) at 
workdir/UnpackedTarball/firebird/src/common/classes/init.h:143
> #17 0x7f085a38d270 in __cxx_global_var_init.15(void) () at 
workdir/UnpackedTarball/firebird/src/jrd/Mapping.cpp:901
[...]
> #32 0x7f085bb37626 in ModuleLoader::loadModule(long*, 
Firebird::StringBase const&) 
(status=0x7ffd9f8b42a0, modPath=...) at 
workdir/UnpackedTarball/firebird/src/common/os/posix/mod_loader.cpp:95
[...]

Change-Id: I082be878d95a020a7c419d6852614b711754cc23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141549
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/configure-c99.patch 
b/external/firebird/configure-c99.patch
index f582d383e5f0..a62a63fb024e 100644
--- a/external/firebird/configure-c99.patch
+++ b/external/firebird/configure-c99.patch
@@ -1,6 +1,28 @@
 --- configure
 +++ configure
-@@ -21478,8 +21478,9 @@
+@@ -20518,8 +20518,9 @@
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include 
+ #include 
+-  main () {
++  int main () {
+   sem_t s;
+   exit(sem_init(,0,0));
+   }
+@@ -21263,8 +21264,9 @@
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include 
+ #include 
+-main () {
++int main () {
+ exit(!(sizeof(off_t) == 8));
+   }
+ _ACEOF
+@@ -21478,8 +21480,9 @@
  else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
@@ -11,7 +33,7 @@
struct s {
  char a;
  union { long long x; sem_t y; } b;
-@@ -21514,7 +21515,8 @@
+@@ -21514,7 +21517,8 @@
  else
cat

[Libreoffice-commits] core.git: external/firebird

2022-09-17 Thread Stephan Bergmann (via logerrit)

 external/firebird/UnpackedTarball_firebird.mk|1 +
 external/firebird/Wincompatible-function-pointer-types.patch |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 3c967717d315fba0aa7b1a1ba3567edc0a88bb69
Author: Stephan Bergmann 
AuthorDate: Sat Sep 17 12:32:54 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Sep 17 13:27:08 2022 +0200

external/firebird: Fix -Wincompatible-function-pointer-types

...after Clang 16 trunk


"Default implicit function pointer conversions diagnostic to be an error"

Change-Id: Ibe06a94f45010efdeaf0c05a661f269e7a07d561
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140095
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 0233ce24dbf4..1f76870b8d18 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 external/firebird/wnt-per-process-trace-storage.patch.1 \
 
external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1
 \
 external/firebird/configure-c99.patch \
+external/firebird/Wincompatible-function-pointer-types.patch \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/firebird/Wincompatible-function-pointer-types.patch 
b/external/firebird/Wincompatible-function-pointer-types.patch
new file mode 100755
index ..d5482bdcf2c2
--- /dev/null
+++ b/external/firebird/Wincompatible-function-pointer-types.patch
@@ -0,0 +1,11 @@
+--- extern/cloop/src/tests/test1/CTest.c
 extern/cloop/src/tests/test1/CTest.c
+@@ -402,7 +402,7 @@
+   struct CALC_IFactory* (*createFactory)();
+ 
+ #ifdef WIN32
+-  createFactory = (struct Factory* (*)()) GetProcAddress(library, 
"createFactory");
++  createFactory = (struct CALC_IFactory* (*)()) GetProcAddress(library, 
"createFactory");
+ #else
+   createFactory = dlsym(library, "createFactory");
+ #endif

[Libreoffice-commits] core.git: external/firebird

2022-09-16 Thread Stephan Bergmann (via logerrit)

 external/firebird/ExternalProject_firebird.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 47e0180a55130bd698682ec12a6bb79fce88ec72
Author: Stephan Bergmann 
AuthorDate: Wed Sep 14 14:50:51 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Sep 16 15:32:22 2022 +0200

external/firebird: Work around std::auto_ptr gone from C++17

...which started to be an issue when building with recent Clang 16 trunk 
after


"C++/ObjC++: switch to gnu++17 as the default standard" against libc++:

> src/cloop/Main.cpp:31:12: error: no member named 'auto_ptr' in namespace 
'std'
> using std::auto_ptr;
>   ~^

(Recent versions of GCC similarly default to C++17, but libstdc++ by default
still provides auto_ptr even for C++17.)

Adding -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR to CXXFLAGS didn't work, 
though,
as firebird apparently only honors CXXFLAGS during the configure step, but 
not
in its makefiles.  So instead add it directly to CXX.  (Adding /all/ the
CXXFLAGS to CXX caused issues at least on Windows, where
 failed with

> Main.cpp
> 
C:\cygwin\home\tdf\jenkins\workspace\gerrit_windows\workdir\UnpackedTarball\firebird\extern\cloop\src\cloop\Expr.h(25):
 fatal error C1034: string: no include path set

etc.  This probably needs a general clean-up, and the other *FLAGS passed 
into
the firebird build system might have a similar issue.)

Change-Id: Idf0a5243938fddfb8348cc960074e60dea775650
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139932
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 35511951528c..0419109e7156 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -89,6 +89,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
$(shell expr 
'$(MAC_OS_X_VERSION_MIN_REQUIRED)' \
'<' 101200)), \
ac_cv_func_clock_gettime=no)) \
+   $(if $(HAVE_LIBCPP),CXX='$(CXX) 
-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR') \
&& LC_ALL=C $(MAKE) \
$(if $(ENABLE_DEBUG),Debug) SHELL='$(SHELL)' $(if 
$(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
MATHLIB="$(if 
$(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_LIBS),-L$(call 
gb_UnpackedTarball_get_dir,libtommath) -ltommath)" \

[Libreoffice-commits] core.git: external/firebird

2022-05-08 Thread Stephan Bergmann (via logerrit)

 external/firebird/UnpackedTarball_firebird.mk |2 +-
 external/firebird/configure-c99.patch |   13 +
 external/firebird/firebird-cygwin-msvc.patch  |2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 7e1ff1cee5dd203df679d584512930fb21b97f6e
Author: Stephan Bergmann 
AuthorDate: Sat May 7 21:23:06 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Sun May 8 16:45:13 2022 +0200

external/firebird: Implicit int in configure check

...so that with Clang 15 trunk after


"Change the behavior of implicit int diagnostics" the check now failed to
compile with

> configure:21471: checking alignment of long
[...]
> conftest.c:166:2: error: type specifier missing, defaults to 'int'; ISO 
C99 and later do not support implicit int [-Wimplicit-int]

with consequences the same as in f6be6cd82bd84f13d2a597ceb6218ae0eb80
"external/firebird: Missing include in configure check" (so rename the 
existing
configure-include.patch, as it now covers various kinds of C99 violations)

Change-Id: I64e7c13945a3ede3900cc6a84da575e35bdce953
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133994
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index e86276e6744a..0233ce24dbf4 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 external/firebird/msvc.patch \
 external/firebird/wnt-per-process-trace-storage.patch.1 \
 
external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1
 \
-external/firebird/configure-include.patch \
+external/firebird/configure-c99.patch \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/firebird/configure-include.patch 
b/external/firebird/configure-c99.patch
similarity index 63%
rename from external/firebird/configure-include.patch
rename to external/firebird/configure-c99.patch
index fe2935f139d7..f582d383e5f0 100644
--- a/external/firebird/configure-include.patch
+++ b/external/firebird/configure-c99.patch
@@ -1,18 +1,23 @@
 --- configure
 +++ configure
-@@ -21478,6 +21478,7 @@
+@@ -21478,8 +21478,9 @@
  else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 +#include 
  #include 
- main () {
+-main () {
++int main () {
struct s {
-@@ -21514,6 +21515,7 @@
+ char a;
+ union { long long x; sem_t y; } b;
+@@ -21514,7 +21515,8 @@
  else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
+-main () {
 +#include 
- main () {
++int main () {
struct s {
  char a;
+ double b;
diff --git a/external/firebird/firebird-cygwin-msvc.patch 
b/external/firebird/firebird-cygwin-msvc.patch
index a19a2798f405..c59c614ba5da 100644
--- a/external/firebird/firebird-cygwin-msvc.patch
+++ b/external/firebird/firebird-cygwin-msvc.patch
@@ -34,7 +34,7 @@
  /* end confdefs.h.  */
  #include 
 -#include 
- main () {
+ int main () {
struct s {
  char a;
 -union { long long x; sem_t y; } b;

[Libreoffice-commits] core.git: external/firebird

2022-04-25 Thread Stephan Bergmann (via logerrit)

 external/firebird/UnpackedTarball_firebird.mk |1 +
 external/firebird/configure-include.patch |   18 ++
 external/firebird/firebird-cygwin-msvc.patch  |4 ++--
 external/firebird/macos-arm64.patch.0 |8 
 4 files changed, 21 insertions(+), 10 deletions(-)

New commits:
commit f6be6cd82bd84f13d2a597ceb6218ae0eb80
Author: Stephan Bergmann 
AuthorDate: Mon Apr 25 10:49:33 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 25 16:50:59 2022 +0200

external/firebird: Missing include in configure check

...so that with Clang 15 trunk after


"[C11/C2x] Change the behavior of the implicit function declaration 
warning" the
check now failed to compile with

> configure:21471: checking alignment of long
[...]
> conftest.c:177:3: error: call to undeclared library function 'exit' with 
type 'void (int) __attribute__((noreturn))'; ISO C99 and later do not support 
implicit function declarations [-Wimplicit-function-declaration]
>   exit((int)&((struct s*)1024)->b - 1024);
>   ^
> conftest.c:177:3: note: include the header  or explicitly 
provide a declaration for 'exit'

and an exit code of 1 from the compiler invocation, which the check than
silently mistook as an alignment requirement of 1.  (Which then caused the
somewhat obscure fallout of

> workdir/UnpackedTarball/firebird/src/gpre/msc.cpp:463:10: runtime error: 
member access within misaligned address 0x7f59d8e68196 for type 'gpre_sym', 
which requires 8 byte alignment

while building ExternalProject_firebird with UBSan.)

The corresponding "checking alignment of double" a few lines further down 
had
already been modified in ccd0e5f445d4a7d0e7aca6c23c02c61bf14510b2 "Make 
firebird
build for macOS on arm64", but without stating what actual problem (if any) 
it
fixed.  I thus moved that patch into the new
external/firebird/configure-include.patch too, to have them grouped 
together.

(An alternative fix could be to replace the use of exit with return from 
main
in those configure checks.)

Change-Id: Iefa02a06d45c83add5f56fad5d726aaecee6d815
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133368
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index cc84b5f139e7..e86276e6744a 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 external/firebird/msvc.patch \
 external/firebird/wnt-per-process-trace-storage.patch.1 \
 
external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1
 \
+external/firebird/configure-include.patch \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/firebird/configure-include.patch 
b/external/firebird/configure-include.patch
new file mode 100644
index ..fe2935f139d7
--- /dev/null
+++ b/external/firebird/configure-include.patch
@@ -0,0 +1,18 @@
+--- configure
 configure
+@@ -21478,6 +21478,7 @@
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include 
+ #include 
+ main () {
+   struct s {
+@@ -21514,6 +21515,7 @@
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include 
+ main () {
+   struct s {
+ char a;
diff --git a/external/firebird/firebird-cygwin-msvc.patch 
b/external/firebird/firebird-cygwin-msvc.patch
index 7f4332633316..a19a2798f405 100644
--- a/external/firebird/firebird-cygwin-msvc.patch
+++ b/external/firebird/firebird-cygwin-msvc.patch
@@ -29,10 +29,10 @@
 
 --- configure  2016-07-07 15:57:04.538983200 +0200
 +++ configure  2016-07-13 11:31:18.132820200 +0200
-@@ -21473,13 +21473,12 @@
- else
+@@ -21490,13 +21490,12 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
+ #include 
 -#include 
  main () {
struct s {
diff --git a/external/firebird/macos-arm64.patch.0 
b/external/firebird/macos-arm64.patch.0
index 12a845c57ce9..ab2596dbd987 100644
--- a/external/firebird/macos-arm64.patch.0
+++ b/external/firebird/macos-arm64.patch.0
@@ -24,14 +24,6 @@
i*86-*-darwin*)
  MAKEFILE_PREFIX=darwin_i386
  MAKEFILE_POSTFIX=darwin
-@@ -21344,6 +21344,7 @@
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+#include 
- main () {
-   struct s {
- char a;
 --- src/common/common.h
 +++ src/common/common.h
 @@ -234,6 +234,12 @@

[Libreoffice-commits] core.git: external/firebird

2021-09-07 Thread Stephan Bergmann (via logerrit)

 
external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1
 |   41 ++
 external/firebird/UnpackedTarball_firebird.mk  
 |6 +
 external/firebird/firebird-cygwin-msvc-warnings.patch  
 |8 -
 3 files changed, 50 insertions(+), 5 deletions(-)

New commits:
commit 6593ebcc01a097e865a0fdc59b65604ae9cd5032
Author: Stephan Bergmann 
AuthorDate: Tue Sep 7 08:33:45 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 7 13:19:16 2021 +0200

exernal/firebird: extern/cloop: Missing dependencies of compilations on...

...output directories

Change-Id: Iaa2b750a12e3df078b46e5bb4feeafc926e11165
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121741
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git 
a/external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1
 
b/external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1
new file mode 100644
index ..a59e70e06abc
--- /dev/null
+++ 
b/external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1
@@ -0,0 +1,41 @@
+From 8305b41bb262b6e249f2551639fa88392e152287 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann 
+Date: Tue, 7 Sep 2021 08:47:32 +0200
+Subject: [PATCH] extern/cloop: Missing dependencies of compilations on output
+ directories
+
+When building Firebird 3.0.7 as part of LibreOffice, we noticed occasional 
build
+failures like 

+
+> error: unable to open output file 
'/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/workdir/UnpackedTarball/firebird/temp/Debug/cloop/release/tests/test1/CTest.o':
 'No such file or directory'
+> 1 error generated.
+> Makefile:72: recipe for target 
'/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/workdir/UnpackedTarball/firebird/temp/Debug/cloop/release/tests/test1/CTest.o'
 failed
+
+and while target "all" depends on target "mkdirs" (which would create all those
+directories) in extern/cloop/Makefile, there is no order among the dependencies
+of "all", so no guarantee that the directories are already created when the
+compilation recipes are executed.
+---
+ extern/cloop/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/extern/cloop/Makefile b/extern/cloop/Makefile
+index 3fca0c7356..c5a2b52628 100644
+--- a/extern/cloop/Makefile
 b/extern/cloop/Makefile
+@@ -54,10 +54,10 @@ vpath %.c $(SRC_DIRS)
+ vpath %.cpp $(SRC_DIRS)
+ 
+ define compile
+-$1/%.o: %.c
++$1/%.o: %.c | $1
+   $(CC) -c $$(C_FLAGS) $$< -o $$@
+ 
+-$1/%.o: %.cpp
++$1/%.o: %.cpp | $1
+   $(CXX) -c $$(CXX_FLAGS) $$< -o $$@
+ endef
+ 
+-- 
+2.31.1
+
diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 64052570fb2b..cc84b5f139e7 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -26,7 +26,10 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,firebird,\
 #   code",
 # * 
external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1
 is upstream
 #   at  "extern/cloop: 
Missing dependency of
-#   $(BIN_DIR)/cloop on $(BIN_DIR)":
+#   $(BIN_DIR)/cloop on $(BIN_DIR)",
+# * 
external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1
 is upstream
+#   at  "extern/cloop: 
Missing dependencies of
+#   compilations on output directories":
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 external/firebird/firebird.disable-ib-util-not-found.patch.1 \
external/firebird/firebird-Engine12.patch \
@@ -45,6 +48,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 
external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1
 \
 external/firebird/msvc.patch \
 external/firebird/wnt-per-process-trace-storage.patch.1 \
+
external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1
 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/firebird/firebird-cygwin-msvc-warnings.patch 
b/external/firebird/firebird-cygwin-msvc-warnings.patch
index b40f94750fa9..942522439bac 100644
--- a/external/firebird/firebird-cygwin-msvc-warnings.patch
+++ b/external/firebird/firebird-cygwin-msvc-warnings.patch
@@ -180,12 +180,12 @@ diff -ur builds/posix/make.rules builds/posix/make.rules
  vpath %.cpp $(SRC_DIRS)
  
  define compile
--$1/%.o: %.c
-+$1/%.obj: %.c
+-$1/%.o: %.c | $1
++$1/%.obj: %.c | $1
$(CC) -c $$(C_FLAGS) $$< -o $$@
  
--$1/%.o: %.cpp
-+$1/%.obj: %.cpp
+-$1/%.o: %.cpp | $1
++$1/%.obj: %.cpp | $1
$(CXX) -c $$(CXX_FLAGS) $$< -o $$@
  endef

[Libreoffice-commits] core.git: external/firebird

2021-09-06 Thread Mike Kaganski (via logerrit)

 external/firebird/firebird-cygwin-msvc.patch |   46 ---
 1 file changed, 28 insertions(+), 18 deletions(-)

New commits:
commit c7b5e6566d9b24a0a996c739a945004d9aadee2f
Author: Mike Kaganski 
AuthorDate: Mon Sep 6 22:10:58 2021 +0200
Commit: Mike Kaganski 
CommitDate: Mon Sep 6 23:56:50 2021 +0200

tdf#144340: fix FB configure on Windows

./configure runs on Windows, and sets value of FB_ALIGNMENT,
a define that affects the layout of FB's sort memory pool.

Trying to include  fails on Windows; the test in
./configure considers error value (equal to 2) as the value of
the alignment (which should be 4 or 8 depending on arch). This
makes the memory misaligned, chunks overlapping and re-written
during the sort, memory corrupt, and so on.

Removing the include (which is documented in a commit adding a
similar include [1] to be needed for m68k) fixes detection.

Additionally this cleans up the code added to config.h.in from
autoconfig_msvc.h, because the former is auto-generated during
configure, and the values get re-written in all occurrences of
respective defines anyway.

[1] 
https://github.com/FirebirdSQL/firebird/commit/7ba46163c74211ce4bf1051ee9998db58cb2f396

Change-Id: I8cdc5c764385a04efd130af09138149c748341fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121753
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/external/firebird/firebird-cygwin-msvc.patch 
b/external/firebird/firebird-cygwin-msvc.patch
index 9536403886c6..7f4332633316 100644
--- a/external/firebird/firebird-cygwin-msvc.patch
+++ b/external/firebird/firebird-cygwin-msvc.patch
@@ -27,8 +27,34 @@
 
  grep ODS_VERSION $OdsH | grep -v ENCODE_ODS >$Mini
 
+--- configure  2016-07-07 15:57:04.538983200 +0200
 configure  2016-07-13 11:31:18.132820200 +0200
+@@ -21473,13 +21473,12 @@
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include 
+ main () {
+   struct s {
+ char a;
+-union { long long x; sem_t y; } b;
++long long b;
+   };
+   exit((int)&((struct s*)1024)->b - 1024);
+ }
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
 --- builds/make.new/config/config.h.in 2016-07-07 15:55:55.693112800 +0200
 +++ builds/make.new/config/config.h.in 2016-07-08 13:38:49.994986400 +0200
+@@ -211,7 +211,7 @@
+ #undef HAVE_GETMNTENT
+ 
+ /* Define to 1 if you have the `getpagesize' function. */
+-#undef HAVE_GETPAGESIZE
++#define HAVE_GETPAGESIZE 1
+ 
+ /* Define to 1 if you have the `getrlimit' function. */
+ #undef HAVE_GETRLIMIT
 @@ -396,7 +396,7 @@
  #undef HAVE_SIGSET
  
@@ -56,7 +82,7 @@
  
  /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
 significant byte first (like Motorola and SPARC, unlike Intel). */
-@@ -703,3 +703,36 @@
+@@ -703,3 +703,20 @@
  #ifndef HAVE_SOCKLEN_T
  typedef int socklen_t;
  #endif
@@ -66,28 +92,12 @@
 +#define WIN32_LEAN_AND_MEAN   // Exclude rarely-used stuff from 
Windows headers
 +#endif
 +/* target architecture */
-+#if defined(_M_IX86)
-+/* sizeof(void *) */
-+#define SIZEOF_VOID_P 4
-+/* sizeof(size_t) */
-+#define SIZEOF_SIZE_T 4
-+/* alignment of long */
-+#define FB_ALIGNMENT 4
-+#elif defined(_M_AMD64)
++#if defined(_M_AMD64)
 +#define AMD64
-+/* sizeof(void *) */
-+#define SIZEOF_VOID_P 8
-+/* sizeof(size_t) */
-+#define SIZEOF_SIZE_T 8
-+/* alignment of long */
-+#define FB_ALIGNMENT 8
-+#else
-+#error unknown target platform
 +#endif
 +
 +#define HAVE_IO_H
 +#define HAVE_CTIME_S
-+#define HAVE_GETPAGESIZE
 +
 +#if defined _MSC_VER
 +#define isnan _isnan

[Libreoffice-commits] core.git: external/firebird

2021-09-03 Thread Mike Kaganski (via logerrit)

 external/firebird/ExternalProject_firebird.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6eee0843d4b354b849a21e6cb0978936d5f4dd01
Author: Mike Kaganski 
AuthorDate: Fri Sep 3 09:19:27 2021 +0200
Commit: Mike Kaganski 
CommitDate: Fri Sep 3 12:55:23 2021 +0200

No need to check DBGUTIL specially

... as discussed in comments to
https://gerrit.libreoffice.org/c/core/+/121470

Change-Id: I9be45e2157972156ab7c2aac820b69aa894cacfe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121553
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index edb3ed9eabea..4843043da3f7 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -52,7 +52,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
$(CXXFLAGS_CXX11) \
$(if $(filter TRUE,$(COM_IS_CLANG)), 
-Wno-c++11-narrowing) \
$(if $(call 
gb_Module__symbols_enabled,firebird),$(gb_DEBUGINFO_FLAGS)) \
-   $(if $(ENABLE_DEBUG)$(ENABLE_DBGUTIL),$(if $(filter 
MSC,$(COM)),-Od -Z7,-Wno-error)) \
+   $(if $(ENABLE_DEBUG),$(if $(filter MSC,$(COM)),-Od 
-Z7)) \
" \
&& export LDFLAGS=" \
$(if $(SYSTEM_LIBATOMIC_OPS),$(LIBATOMIC_OPS_LIBS), \
@@ -83,7 +83,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
'<' 101200)), \
ac_cv_func_clock_gettime=no)) \
&& LC_ALL=C $(MAKE) \
-   $(if $(ENABLE_DEBUG)$(ENABLE_DBGUTIL),Debug) 
SHELL='$(SHELL)' $(if $(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") 
\
+   $(if $(ENABLE_DEBUG),Debug) SHELL='$(SHELL)' $(if 
$(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
MATHLIB="$(if 
$(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_LIBS),-L$(call 
gb_UnpackedTarball_get_dir,libtommath) -ltommath)" \
LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst 
$$,,$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib)))' \
$(if $(filter MACOSX,$(OS)), \

[Libreoffice-commits] core.git: external/firebird

2021-09-02 Thread Mike Kaganski (via logerrit)

 external/firebird/ExternalProject_firebird.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 872b77f6e8997b663fd01c9df655cd35a31ce39e
Author: Mike Kaganski 
AuthorDate: Thu Sep 2 18:48:06 2021 +0200
Commit: Mike Kaganski 
CommitDate: Fri Sep 3 05:35:06 2021 +0200

Make sure to use debug options for firebird in debug mode

Change-Id: I358bd2013387e9fb341d92764f29767d6c0c2cb8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121470
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 94a62e418124..edb3ed9eabea 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -52,6 +52,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
$(CXXFLAGS_CXX11) \
$(if $(filter TRUE,$(COM_IS_CLANG)), 
-Wno-c++11-narrowing) \
$(if $(call 
gb_Module__symbols_enabled,firebird),$(gb_DEBUGINFO_FLAGS)) \
+   $(if $(ENABLE_DEBUG)$(ENABLE_DBGUTIL),$(if $(filter 
MSC,$(COM)),-Od -Z7,-Wno-error)) \
" \
&& export LDFLAGS=" \
$(if $(SYSTEM_LIBATOMIC_OPS),$(LIBATOMIC_OPS_LIBS), \
@@ -82,7 +83,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
'<' 101200)), \
ac_cv_func_clock_gettime=no)) \
&& LC_ALL=C $(MAKE) \
-   $(if $(ENABLE_DEBUG),Debug) SHELL='$(SHELL)' $(if 
$(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
+   $(if $(ENABLE_DEBUG)$(ENABLE_DBGUTIL),Debug) 
SHELL='$(SHELL)' $(if $(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") 
\
MATHLIB="$(if 
$(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_LIBS),-L$(call 
gb_UnpackedTarball_get_dir,libtommath) -ltommath)" \
LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst 
$$,,$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib)))' \
$(if $(filter MACOSX,$(OS)), \

[Libreoffice-commits] core.git: external/firebird

2021-09-02 Thread Mike Kaganski (via logerrit)

 external/firebird/UnpackedTarball_firebird.mk   |1 
 external/firebird/wnt-per-process-trace-storage.patch.1 |   18 
 2 files changed, 19 insertions(+)

New commits:
commit a5bb0e66492118b79da5fef31f8d2bd686947354
Author: Mike Kaganski 
AuthorDate: Wed Sep 1 17:08:10 2021 +0200
Commit: Mike Kaganski 
CommitDate: Thu Sep 2 08:39:54 2021 +0200

tdf#144172: patch FB to use per-process LOCK directories

As discussed at https://github.com/FirebirdSQL/firebird/pull/6937:

> > But as well, we may just use process id instead of session id in
> > the ConfigStorage::ConfigStorage creating filename. That would be
> > even better, fitting better into our per-process temp dir policy.
> I tend to agree with you here. It looks safe assuming LO uses
> SuperServer only.

Let's not replace the session id with process id, but instead append
process id after session id, to avoid (unlikely?) accidental overlap
of process id and session id, which would produce the same name as
already used by, say, isql tool.

Change-Id: Ibce8a8c75d405aae3e8949e7daf2476accdff22b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121457
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 37234a0a573c..64052570fb2b 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 
external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1 \
 
external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1
 \
 external/firebird/msvc.patch \
+external/firebird/wnt-per-process-trace-storage.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/firebird/wnt-per-process-trace-storage.patch.1 
b/external/firebird/wnt-per-process-trace-storage.patch.1
new file mode 100644
index ..46af6c5e5c5c
--- /dev/null
+++ b/external/firebird/wnt-per-process-trace-storage.patch.1
@@ -0,0 +1,18 @@
+diff --git a/src/jrd/trace/TraceConfigStorage.cpp 
b/src/jrd/trace/TraceConfigStorage.cpp
+index 05fce3211ae7..d267713e85de 100644
+--- a/src/jrd/trace/TraceConfigStorage.cpp
 b/src/jrd/trace/TraceConfigStorage.cpp
+@@ -103,11 +103,11 @@ ConfigStorage::ConfigStorage()
+   pfnProcessIdToSessionId(GetCurrentProcessId(), ) == 0 ||
+   sesID == 0)
+   {
+-  filename.printf(TRACE_FILE); // TODO: it must be per engine 
instance
++  filename.printf("%s.0.%u", TRACE_FILE, GetCurrentProcessId()); 
// TODO: it must be per engine instance
+   }
+   else
+   {
+-  filename.printf("%s.%u", TRACE_FILE, sesID);
++  filename.printf("%s.%u.%u", TRACE_FILE, sesID, 
GetCurrentProcessId());
+   }
+ #else
+   filename.printf(TRACE_FILE); // TODO: it must be per engine instance

[Libreoffice-commits] core.git: external/firebird

2021-02-19 Thread Tor Lillqvist (via logerrit)

 external/firebird/UnpackedTarball_firebird.mk |6 ++
 external/firebird/firebird-macosx-sandbox.patch.1 |   13 +
 2 files changed, 19 insertions(+)

New commits:
commit 22e89d2ccd3ad3ee1b5ee00aebadd3d5a38fd5dd
Author: Tor Lillqvist 
AuthorDate: Fri Feb 19 20:11:30 2021 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Feb 19 22:45:28 2021 +0100

tdf#140332: Can't use System V semaphores in a sandboxed macOS process

See

https://developer.apple.com/library/archive/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html
, "Note: System V semaphores are not supported in sandboxed apps".

So use POSIX semaphores instead.

Change-Id: I37c910cf13b868ab15fe31f90e42d24a9a24eeb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111239
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index fef0b7fe48b1..37234a0a573c 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -61,6 +61,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 ))
 endif
 
+ifeq ($(ENABLE_MACOSX_SANDBOX),TRUE)
+$(eval $(call gb_UnpackedTarball_add_patches,firebird,\
+   external/firebird/firebird-macosx-sandbox.patch.1 \
+))
+endif
+
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,firebird, \
 external/firebird/sanitizer.patch \
diff --git a/external/firebird/firebird-macosx-sandbox.patch.1 
b/external/firebird/firebird-macosx-sandbox.patch.1
new file mode 100644
index ..3bf246c682ba
--- /dev/null
+++ b/external/firebird/firebird-macosx-sandbox.patch.1
@@ -0,0 +1,13 @@
+-*- Mode: Diff -*-
+
+--- firebird/src/common/isc_s_proto.h
 firebird/src/common/isc_s_proto.h
+@@ -37,6 +37,8 @@
+ // Firebird platform-specific synchronization data structures
+ 
+ #if defined(DARWIN)
++#define USE_POSIX_SEMAPHORE
++#define USE_SHARED_FUTEX
+ #define USE_FILELOCKS
+ #endif
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2021-01-01 Thread Andrea Gelmini (via logerrit)

 0 files changed

New commits:
commit c38f638360579036f0d323ea68c5c1db13c7d450
Author: Andrea Gelmini 
AuthorDate: Fri Jan 1 16:23:11 2021 +0100
Commit: Julien Nabet 
CommitDate: Fri Jan 1 22:33:27 2021 +0100

Removed executable bits from patch file

Change-Id: I6cbfbfe32fb1d70cd8f73add0c2f6a63117e7f4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108560
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/external/firebird/msvc.patch b/external/firebird/msvc.patch
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2020-12-29 Thread Stephan Bergmann (via logerrit)

 external/firebird/UnpackedTarball_firebird.mk |1 +
 external/firebird/msvc.patch  |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit c7efa4fd4f57fd4e0a46d1aee9a9f0f0652bb67b
Author: Stephan Bergmann 
AuthorDate: Tue Dec 29 11:11:29 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Dec 29 21:48:22 2020 +0100

external/firebird: Fix MSVC /Zc:strictStrings

> 
C:/lo/core/workdir/UnpackedTarball/firebird/src/auth/trusted/AuthSspi.cpp(112): 
error C2664: 'SECURITY_STATUS (SEC_CHAR *,SEC_CHAR *,unsigned long,void *,void 
*,SEC_GET_KEY_FN,void *,PCredHandle,PTimeStamp)': cannot convert argument 2 
from 'const char [5]' to 'SEC_CHAR *'
> 
C:/lo/core/workdir/UnpackedTarball/firebird/src/auth/trusted/AuthSspi.cpp(112): 
note: Conversion from string literal loses const qualifier (see 
/Zc:strictStrings)

Not sure why this only started to hit my build now.

Change-Id: Idea0a8a2abaafe17183323a31f29173bd71fbeec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108451
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 4fc27396429a..fef0b7fe48b1 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 external/firebird/firebird-307.patch.1 \
 
external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1 \
 
external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1
 \
+external/firebird/msvc.patch \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/firebird/msvc.patch b/external/firebird/msvc.patch
new file mode 100755
index ..3f403b496098
--- /dev/null
+++ b/external/firebird/msvc.patch
@@ -0,0 +1,11 @@
+--- src/auth/trusted/AuthSspi.cpp
 src/auth/trusted/AuthSspi.cpp
+@@ -109,7 +109,7 @@
+ groupNames(*getDefaultMemoryPool()), 
sessionKey(*getDefaultMemoryPool())
+ {
+   TimeStamp timeOut;
+-  hasCredentials = initEntries() && (fAcquireCredentialsHandle(0, "NTLM",
++  hasCredentials = initEntries() && (fAcquireCredentialsHandle(0, 
const_cast("NTLM"),
+   SECPKG_CRED_BOTH, 0, 0, 0, 0,
+   , ) == SEC_E_OK);
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2020-12-07 Thread Stephan Bergmann (via logerrit)

 external/firebird/ExternalProject_firebird.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e70168ec88642dc4940bf6cf7ae49a97afc84916
Author: Stephan Bergmann 
AuthorDate: Mon Dec 7 09:35:25 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 7 10:24:55 2020 +0100

external/firebird: clang-cl needs -march=x86-64-v2 now

...to avoid

> C:/lo/core/workdir/UnpackedTarball/firebird/src/common/CRC32C.cpp(41,10): 
error: always_inline function '_mm_crc32_u8' requires target feature 'sse4.2', 
but would be inlined into function 'CRC32C' that is compiled without support 
for 'sse4.2'
> return _mm_crc32_u8(hash_value, *value);
>^

etc.

With  "Backport from master", that code
appeared on the B3_0_Release branch only after R3_0_1, so was not present 
in our
Firebird-3.0.0.32483-0.tar.bz2 before 
86744f03992213af162df6954313c9f9e44e3a0a
"firebird: update to 3.0.7".

This is apparently about the SSE4.2 CRC32 instruction.  Not sure how this 
works
in the MSVC build, whether it implicitly generates code targeting SSE4.2

(
"/arch (x64)" does not mention any switch to explicitly enable it), or 
whether
its _mm_crc32_u* intrinsics would be smart enough to generate code that also
works when SSE4.2 is not available at runtime.

Change-Id: I893733eb079e6c0eb8b685a55ce09e1fdcd2eda2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107334
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 95663a508928..0a1706031746 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -47,6 +47,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
&& export CXXFLAGS=" \
$(BOOST_CXXFLAGS) \
$(if $(filter MSC,$(COM)),$(if 
$(MSVC_USE_DEBUG_RUNTIME),-DMSVC_USE_DEBUG_RUNTIME)) \
+   $(if $(filter 
MSC-TRUE-X86_64,$(COM)-$(COM_IS_CLANG)-$(CPUNAME)),-march=x86-64-v2) \
$(if 
$(HAVE_GCC_FNO_SIZED_DEALLOCATION),-fno-sized-deallocation 
-fno-delete-null-pointer-checks) \
$(CXXFLAGS_CXX11) \
$(if $(filter TRUE,$(COM_IS_CLANG)), 
-Wno-c++11-narrowing) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2020-12-03 Thread Stephan Bergmann (via logerrit)

 
external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1
 |   67 ++
 external/firebird/UnpackedTarball_firebird.mk  
 |6 
 external/firebird/firebird-cygwin-msvc-warnings.patch  
 |2 
 3 files changed, 73 insertions(+), 2 deletions(-)

New commits:
commit bbb73810cc2da097f972f8dcf6d4461d7baba16b
Author: Stephan Bergmann 
AuthorDate: Thu Dec 3 14:08:54 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 3 19:46:49 2020 +0100

external/firebird: extern/cloop: Missing dependency of $(BIN_DIR)/cloop...

...on $(BIN_DIR)

Change-Id: I649f2eaafb0e7160f7092a652c38193975fb5982
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107163
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git 
a/external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1
 
b/external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1
new file mode 100644
index ..816f65376a0b
--- /dev/null
+++ 
b/external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1
@@ -0,0 +1,67 @@
+From e594cf4c8590bd75a544860b472a5bbf6d5a3d0e Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann 
+Date: Thu, 3 Dec 2020 13:56:34 +0100
+Subject: [PATCH] extern/cloop: Missing dependency of $(BIN_DIR)/cloop on
+ $(BIN_DIR)
+
+When building Firebird 3.0.7 as part of LibreOffice, I saw it fail once (at
+) with
+
+[...]
+> config.status: creating gen/Makefile.extern.editline
+> config.status: creating src/include/gen/autoconfig.auto
+> config.status: executing libtool commands
+>
+>
+> The Firebird3 package has been configured with the following options:
+>
+> Raw devices : enabled
+>Service name : gds_db
+>Service port : 3050
+>GPRE modules : c_cxx.cpp
+>
+> Install Dir : /usr/local/firebird
+>
+> mkpar.c:182:2: warning: add explicit braces to avoid dangling else 
[-Wdangling-else]
+> else
+> ^
+> 1 warning generated.
+> main.o: In function `create_file_names':
+> main.c:(.text+0x976): warning: the use of `mktemp' is dangerous, better use 
`mkstemp'
+> /usr/bin/ld: cannot open output file 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/workdir/UnpackedTarball/firebird/gen/Debug/cloop/release/bin/cloop:
 No such file or directory
+> clang-5.0: error: linker command failed with exit code 1 (use -v to see 
invocation)
+> Makefile:84: recipe for target 
'/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/workdir/UnpackedTarball/firebird/gen/Debug/cloop/release/bin/cloop'
 failed
+> make[6]: *** 
[/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/workdir/UnpackedTarball/firebird/gen/Debug/cloop/release/bin/cloop]
 Error 1
+> make[6]: Target 'all' not remade because of errors.
+> Makefile:130: recipe for target 'extern' failed
+> make[5]: *** [extern] Error 2
+> Makefile:181: recipe for target 'master_process' failed
+> make[4]: *** [master_process] Error 2
+> Makefile:72: recipe for target 'Debug' failed
+> make[3]: *** [Debug] Error 2
+> Makefile:6: recipe for target 'Debug' failed
+> make[2]: *** [Debug] Error 2
+> 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/external/firebird/ExternalProject_firebird.mk:29:
 recipe for target 
'/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/workdir/ExternalProject/firebird/build'
 failed
+> make[1]: *** 
[/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/workdir/ExternalProject/firebird/build]
 Error 1
+[...]
+
+(cherry picked from commit 8e9c48a94659d0c8ac80f716d321b934d47bbed1)
+---
+ extern/cloop/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/extern/cloop/Makefile b/extern/cloop/Makefile
+index 6bc6af41a1..811711fcab 100644
+--- a/extern/cloop/Makefile
 b/extern/cloop/Makefile
+@@ -80,6 +80,7 @@ $(BIN_DIR)/cloop: \
+   $(OBJ_DIR)/cloop/Lexer.o \
+   $(OBJ_DIR)/cloop/Parser.o \
+   $(OBJ_DIR)/cloop/Main.o \
++  | $(BIN_DIR)
+ 
+   $(LD) $^ -o $@
+ 
+-- 
+2.28.0
+
diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 57df8ca6d957..4fc27396429a 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -23,7 +23,10 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,firebird,\
 #   const";
 # * 
external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1 
is upstream at
 #    "Fix checks for null 
HANDLE in Windows-only
-#   code":
+#   code",
+# * 
external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1
 is

[Libreoffice-commits] core.git: external/firebird

2020-12-02 Thread Stephan Bergmann (via logerrit)

 external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1 
|   41 ++
 external/firebird/UnpackedTarball_firebird.mk  
|6 +
 2 files changed, 46 insertions(+), 1 deletion(-)

New commits:
commit 0cffcf74a17449da56fb75557c7da1e1f6c5e94e
Author: Stephan Bergmann 
AuthorDate: Wed Dec 2 11:14:19 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Dec 2 18:38:55 2020 +0100

external/firebird: Fix checks for null HANDLE in Windows-only code

Change-Id: I428bbdae91eaf69df43ae054a95e8da3fb1aa7dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107056
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git 
a/external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1
 
b/external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1
new file mode 100644
index ..22cc1e119a32
--- /dev/null
+++ 
b/external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1
@@ -0,0 +1,41 @@
+From f4c0aa3ba070e5c3ce996b33a31323a3a6820f0c Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann 
+Date: Wed, 2 Dec 2020 10:44:28 +0100
+Subject: Fix checks for null HANDLE in Windows-only code
+
+clang-cl failed with "error: unordered comparison between pointer and zero
+('HANDLE' (aka 'void *') and 'int')" in these two places introduced with
+f219283b72ab537c2b5938222708f35227c1ebde "Sub-task CORE-4463: Windows
+implementation for CORE-4462 (Make it possible to restore compressed .nbk files
+without explicitly decompressing them)" and
+c2cfa7824189ed7c3e5a19721effdf97c07dadfd "Prevent child process hung if it
+writes too much data to the pipe and overflow the pipe buffer".
+---
+ src/utilities/nbackup/nbackup.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/utilities/nbackup/nbackup.cpp 
b/src/utilities/nbackup/nbackup.cpp
+index 6598b6e331..4703079d67 100644
+--- a/src/utilities/nbackup/nbackup.cpp
 b/src/utilities/nbackup/nbackup.cpp
+@@ -385,7 +385,7 @@ FB_SIZE_T NBackup::read_file(FILE_HANDLE , void 
*buffer, FB_SIZE_T bufsize)
+ #ifdef WIN_NT
+   // Read child's stderr often to prevent child process hung if 
it writes
+   // too much data to the pipe and overflow the pipe buffer.
+-  const bool checkChild = (childStdErr > 0 && file == backup);
++  const bool checkChild = (childStdErr != 0 && file == backup);
+   if (checkChild)
+   print_child_stderr();
+ 
+@@ -790,7 +790,7 @@ void NBackup::close_backup()
+   return;
+ #ifdef WIN_NT
+   CloseHandle(backup);
+-  if (childId > 0)
++  if (childId != 0)
+   {
+   const bool killed = (WaitForSingleObject(childId, 5000) != 
WAIT_OBJECT_0);
+   if (killed)
+-- 
+2.28.0
+
diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 27f4bfad36a5..57df8ca6d957 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -20,7 +20,10 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,firebird,\
 
 # * 
external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 
is upstream at
 #    "Make comparison 
operator member functions
-#   const":
+#   const";
+# * 
external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1 
is upstream at
+#    "Fix checks for null 
HANDLE in Windows-only
+#   code":
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 external/firebird/firebird.disable-ib-util-not-found.patch.1 \
external/firebird/firebird-Engine12.patch \
@@ -35,6 +38,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/macos-arm64.patch.0 \
 external/firebird/firebird-btyacc-add-explicit-rule.patch \
 external/firebird/firebird-307.patch.1 \
+
external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2020-11-26 Thread Tor Lillqvist (via logerrit)

 external/firebird/macos-arm64.patch.0 |   22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

New commits:
commit a470932949c3e8ee28aaf77a71a90a957bbfe1ce
Author: Tor Lillqvist 
AuthorDate: Fri Nov 27 00:41:00 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Nov 27 00:16:45 2020 +0100

Fix Firebird build on macOS on arm64

Must set RAW_DEVICES_FLG=N for this architecture, too. Make the
prefix.darwin_arm64 match the x86_64 one. Don't bother defining ARM64,
just check for __aarch64__.

Change-Id: I9de67493cb159ce97a46cdd1974b04753518c703
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106716
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/firebird/macos-arm64.patch.0 
b/external/firebird/macos-arm64.patch.0
index e11065a2e3bd..12a845c57ce9 100644
--- a/external/firebird/macos-arm64.patch.0
+++ b/external/firebird/macos-arm64.patch.0
@@ -1,7 +1,7 @@
 -*- Mode: diff -*-
 --- configure
 +++ configure
-@@ -2901,6 +2901,21 @@
+@@ -2901,6 +2901,22 @@
  RAW_DEVICES_FLG=N
  ;;
  
@@ -18,6 +18,7 @@
 +SHRLIB_EXT=dylib
 +CPU_TYPE=arm64
 +EXPORT_SYMBOLS_STYLE=darwin
++RAW_DEVICES_FLG=N
 +;;
 +
i*86-*-darwin*)
@@ -33,11 +34,13 @@
  char a;
 --- src/common/common.h
 +++ src/common/common.h
-@@ -234,6 +234,10 @@
+@@ -234,6 +234,12 @@
  #define DARWINPPC64
  #define FB_CPU CpuPowerPc64
  #endif
-+#ifdef ARM64
++#ifdef __aarch64__
++// This means x86_64, but does it matter? There is no arch_arm64, 
arch_aarch64, arch_darwin_arm64,
++// or arch_darwin_aarch64 in the P_ARCH enum in src/remote/protocol.h.
 +#define DARWIN64
 +#define FB_CPU CpuArm64
 +#endif
@@ -50,7 +53,7 @@
  #if defined(ARM)
  #define FB_PLATFORM "UA"
  #endif
-+#if defined(ARM64)
++#if defined(__aarch64__)
 +#define FB_PLATFORM "UB"
 +#endif
  #endif
@@ -58,7 +61,7 @@
  #ifdef DEV_BUILD
 --- /dev/null
 +++ builds/posix/prefix.darwin_arm64
-@@ -0,0 +0,43 @@
+@@ -0,0 +0,42 @@
 +# The contents of this file are subject to the Interbase Public
 +# License Version 1.0 (the "License"); you may not use this file
 +# except in compliance with the License. You may obtain a copy
@@ -78,7 +81,6 @@
 +# Start of file prefix.darwin:$(VERSION)  @PLATFORM@
 +# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
 +#
-+# Default build from 10.7 using Clang
 +
 +
 +#DYLD_PRINT_ENV=1
@@ -90,15 +92,15 @@
 +MACOSX_DEPLOYMENT_TARGET=11.0
 +export MACOSX_DEPLOYMENT_TARGET
 +
-+PROD_FLAGS=-O1 -DDARWIN -DARM64 -pipe -MMD -fPIC -fno-common
-+DEV_FLAGS=-ggdb -DDARWIN -DARM64 -pipe -MMD -fPIC -fno-omit-frame-pointer 
-fno-common -Wall -fno-optimize-sibling-calls -Wno-non-virtual-dtor
-+CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden 
++PROD_FLAGS=-DDARWIN -pipe -O2 -MMD -fPIC -fno-common
++DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common 
-Wall -fno-optimize-sibling-calls -Wno-non-virtual-dtor
++CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden
 +
 +EXE_LINK_OPTIONS:= 
 +UNDEF_PLATFORM=
 +
 +LINK_LIBS+=-liconv
-+MATHLIB=-ltommath
++#MATHLIB=$(ROOT)/extern/libtommath/.libs/libtommath.a
 +SO_LINK_LIBS+=-liconv
 +
 +include $(ROOT)/gen/darwin.defaults
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2020-11-26 Thread Stephan Bergmann (via logerrit)

 external/firebird/ubsan.patch |   20 
 1 file changed, 20 insertions(+)

New commits:
commit 8336c1b579b6dff361e5422ebcdd225056752ed4
Author: Stephan Bergmann 
AuthorDate: Tue Nov 24 08:22:51 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 26 17:41:24 2020 +0100

New UBSan failures with Firebird 3.0.7

While building ExternalProject_firebird:  For one, the ICU UCHAR_TYPE 
mismatch

> workdir/UnpackedTarball/firebird/src/intl/cs_icu.cpp:66:30: runtime 
error: call to function ucnv_fromUChars_68 through pointer to incorrect 
function type 'int (*)(UConverter *, char *, int, const unsigned short *, int, 
UErrorCode *)'

from 61411db9f719d793f0665a4d278e0748e8fcd75f "external/firebird: 
ICU_UCHAR_TYPE
breaks -fsanitize=function" returned in a slightly different form.  Instead 
of
passing in the problematic UCHAR_TYPE macro from
external/firebird/ExternalProject_firebird.mk, Firebird now set it 
internally in
src/common/common.h.  And for another, it grew a new invalid-shift-base at

> workdir/UnpackedTarball/firebird/src/yvalve/gds.cpp:2564:33: runtime 
error: left shift of negative value -1

(And beyond that there were no further new ASan/UBSan issues with a full 
`make
check screenshot`.)

Change-Id: Ie15cf6bde2df7dc784fec89045026f71747aa0bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106477
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/ubsan.patch b/external/firebird/ubsan.patch
index cd71997f0ba6..fa296108d3d6 100644
--- a/external/firebird/ubsan.patch
+++ b/external/firebird/ubsan.patch
@@ -86,6 +86,15 @@
return *this;
}
StringType& assign(const_pointer s)
+--- src/common/common.h
 src/common/common.h
+@@ -1002,6 +1002,5 @@
+ }
+ 
+ #undef UCHAR_TYPE
+-#define UCHAR_TYPE uint16_t
+ 
+ #endif /* COMMON_COMMON_H */
 --- src/common/unicode_util.cpp
 +++ src/common/unicode_util.cpp
 @@ -187,7 +187,7 @@
@@ -285,3 +294,14 @@
  
SRQ_PTR enqueue(thread_db*, Firebird::CheckStatusWrapper*, SRQ_PTR, 
const USHORT,
const UCHAR*, const USHORT, UCHAR, lock_ast_t, void*, SINT64, 
SSHORT, SRQ_PTR);
+--- src/yvalve/gds.cpp
 src/yvalve/gds.cpp
+@@ -2561,7 +2561,7 @@
+   value += ((SLONG) *ptr++) << shift;
+   shift += 8;
+   }
+-  value += ((SLONG)(SCHAR) *ptr) << shift;
++  value += ((ULONG)(SCHAR) *ptr) << shift;
+ 
+   return value;
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2020-11-26 Thread Stephan Bergmann (via logerrit)

 external/firebird/ExternalProject_firebird.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit bca0dc97bf3d1348c928bdaf4964524374835823
Author: Stephan Bergmann 
AuthorDate: Thu Nov 26 10:42:40 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 26 11:50:37 2020 +0100

Revert "external/firebird: Pass --enable-developer into configure"

This reverts commit 823059c8f046927c3193da5acd78053f3269b753.  It was meant 
as a
prerequisite for a macOS-specific fix in patch set 19 of
 "firebird: update to 
3.0.7",
but caused both the Jenkins Windows build of that Gerrit change's patch 
set, as
well as vmiklos' Linux build based on 
823059c8f046927c3193da5acd78053f3269b753
to fail with "Could not find acceptable ICU library" messages.  The reasons 
have
not been tracked down, but are presumably because
workdir/UnpackedTarball/firebird/gen/Makefile starts to execute some more 
recipe
lines based on IsDeveloper being "Y".  Lets seek another fix for the macOS 
issue
instead.

Change-Id: I4bd6ad38bc0fc0ef2debd5ef55131bccbff54ebc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106675
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index b143e750103d..8f8a8230227f 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -68,7 +68,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
&& MAKE=$(MAKE) ./configure \
--without-editline \
--with-wire-compress=no \
-   $(if $(ENABLE_DEBUG),--enable-developer) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(DISABLE_DYNLOADING), \
--enable-static --disable-shared \
@@ -81,7 +80,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
'<' 101200)), \
ac_cv_func_clock_gettime=no)) \
&& LC_ALL=C $(MAKE) \
-   SHELL='$(SHELL)' $(if $(filter 
LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
+   $(if $(ENABLE_DEBUG),Debug) SHELL='$(SHELL)' $(if 
$(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
MATHLIB="$(if 
$(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_LIBS),-L$(call 
gb_UnpackedTarball_get_dir,libtommath) -ltommath)" \
LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst 
$$,,$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib)))' \
$(if $(filter MACOSX,$(OS)), \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2020-11-25 Thread Stephan Bergmann (via logerrit)

 external/firebird/ExternalProject_firebird.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 823059c8f046927c3193da5acd78053f3269b753
Author: Stephan Bergmann 
AuthorDate: Wed Nov 25 14:27:54 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 25 17:17:11 2020 +0100

external/firebird: Pass --enable-developer into configure

...instead of merely forcing the Make target to Debug.  That way, a future
patch set of in-progress 
"firebird: update to 3.0.7" will be able to know in the gen/examples sub-
directory Make that the top-level Make was targeting Debug, not Release.  
(Which
it will presumably need to know to fix the macOS build.)

Change-Id: I57f90f66b4739b9d2cb5c33d79fcb87090c820bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106588
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 8f8a8230227f..b143e750103d 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -68,6 +68,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
&& MAKE=$(MAKE) ./configure \
--without-editline \
--with-wire-compress=no \
+   $(if $(ENABLE_DEBUG),--enable-developer) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(DISABLE_DYNLOADING), \
--enable-static --disable-shared \
@@ -80,7 +81,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
'<' 101200)), \
ac_cv_func_clock_gettime=no)) \
&& LC_ALL=C $(MAKE) \
-   $(if $(ENABLE_DEBUG),Debug) SHELL='$(SHELL)' $(if 
$(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
+   SHELL='$(SHELL)' $(if $(filter 
LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
MATHLIB="$(if 
$(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_LIBS),-L$(call 
gb_UnpackedTarball_get_dir,libtommath) -ltommath)" \
LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst 
$$,,$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib)))' \
$(if $(filter MACOSX,$(OS)), \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2020-11-17 Thread Tor Lillqvist (via logerrit)

 external/firebird/UnpackedTarball_firebird.mk |1 
 external/firebird/macos-arm64.patch.0 |  123 ++
 2 files changed, 124 insertions(+)

New commits:
commit ccd0e5f445d4a7d0e7aca6c23c02c61bf14510b2
Author: Tor Lillqvist 
AuthorDate: Mon Nov 16 19:29:04 2020 +
Commit: Tor Lillqvist 
CommitDate: Wed Nov 18 01:01:54 2020 +0100

Make firebird build for macOS on arm64

No idea whether it works.

Change-Id: I008cf9fab56bedb2e1f33ad6a99c9cd95d7483a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106024
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index a8507db387f1..c3860673b879 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-tdf125284.patch.1 \

external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 \
 external/firebird/0001-Fix-warning-on-Win64-build-231.patch.1 \
+   external/firebird/macos-arm64.patch.0 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/firebird/macos-arm64.patch.0 
b/external/firebird/macos-arm64.patch.0
new file mode 100644
index ..ac9363784d4b
--- /dev/null
+++ b/external/firebird/macos-arm64.patch.0
@@ -0,0 +1,123 @@
+-*- Mode: diff -*-
+--- configure
 configure
+@@ -2901,6 +2901,21 @@
+ EXPORT_SYMBOLS_STYLE=darwin
+ ;;
+ 
++  aarch64-*-darwin*)
++MAKEFILE_PREFIX=darwin_arm64
++MAKEFILE_POSTFIX=darwin
++PLATFORM=DARWIN
++INSTALL_PREFIX=darwin
++
++$as_echo "#define DARWIN 1" >>confdefs.h
++
++  LIBS="$LIBS -framework CoreFoundation"
++EDITLINE_FLG=Y
++SHRLIB_EXT=dylib
++CPU_TYPE=arm64
++EXPORT_SYMBOLS_STYLE=darwin
++;;
++
+   i*86-*-darwin*)
+ MAKEFILE_PREFIX=darwin_i386
+ MAKEFILE_POSTFIX=darwin
+@@ -21344,6 +21344,7 @@
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include 
+ main () {
+   struct s {
+ char a;
+@@ -21379,6 +21379,7 @@
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include 
+ main () {
+   struct s {
+ char a;
+--- src/common/common.h
 src/common/common.h
+@@ -234,6 +234,10 @@
+ #define DARWINPPC64
+ #define FB_CPU CpuPowerPc64
+ #endif
++#ifdef ARM64
++#define DARWIN64
++#define FB_CPU CpuArm64
++#endif
+ #define IEEE
+ #define QUADCONST(n) (n##LL)
+ #define QUADFORMAT "q"
+--- src/jrd/license.h
 src/jrd/license.h
+@@ -128,6 +128,9 @@
+ #if defined(ARM)
+ #define FB_PLATFORM "UA"
+ #endif
++#if defined(ARM64)
++#define FB_PLATFORM "UB"
++#endif
+ #endif
+ 
+ #ifdef DEV_BUILD
+--- /dev/null
 builds/posix/prefix.darwin_arm64
+@@ -0,0 +0,43 @@
++# The contents of this file are subject to the Interbase Public
++# License Version 1.0 (the "License"); you may not use this file
++# except in compliance with the License. You may obtain a copy
++# of the License at http://www.Inprise.com/IPL.html
++#
++# Software distributed under the License is distributed on an
++# "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
++# or implied. See the License for the specific language governing
++# rights and limitations under the License.
++#
++# The Original Code was created by Inprise Corporation
++# and its predecessors. Portions created by Inprise Corporation are
++#
++# Copyright (C) 2000 Inprise Corporation
++# All Rights Reserved.
++# Contributor(s): __.
++# Start of file prefix.darwin:$(VERSION)  @PLATFORM@
++# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
++#
++# Default build from 10.7 using Clang
++
++
++#DYLD_PRINT_ENV=1
++#export DYLD_PRINT_ENV
++
++#DYLD_PRINT_LIBRARIES=1
++#export DYLD_PRINT_LIBRARIES
++
++MACOSX_DEPLOYMENT_TARGET=11.0
++export MACOSX_DEPLOYMENT_TARGET
++
++PROD_FLAGS=-O1 -DDARWIN -DARM64 -pipe -MMD -fPIC -fno-common
++DEV_FLAGS=-ggdb -DDARWIN -DARM64 -pipe -MMD -fPIC -fno-omit-frame-pointer 
-fno-common -Wall -fno-optimize-sibling-calls -Wno-non-virtual-dtor
++CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden 
++
++EXE_LINK_OPTIONS:= 
++UNDEF_PLATFORM=
++
++LINK_LIBS+=-liconv
++MATHLIB=-ltommath
++SO_LINK_LIBS+=-liconv
++
++include $(ROOT)/gen/darwin.defaults
+--- src/isql/InputDevices.cpp
 src/isql/InputDevices.cpp
+@@ -23,7 +23,7 @@
+ 
+ #include "firebird.h"
+ #if defined(DARWIN) && !defined(IOS)
+-#if defined(i386) || defined(__x86_64__)
++#if defined(i386) || defined(__x86_64__) || defined(__arm64__)
+ #include 
+ #else
+ #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2020-11-17 Thread Jan-Marek Glogowski (via logerrit)

 external/firebird/0001-Fix-warning-on-Win64-build-231.patch.1 |   37 ++
 external/firebird/UnpackedTarball_firebird.mk |1 
 2 files changed, 38 insertions(+)

New commits:
commit 53cb928b168f6ef4b5af431a336f2b17f2a40604
Author: Jan-Marek Glogowski 
AuthorDate: Mon Nov 16 11:31:54 2020 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Tue Nov 17 12:22:03 2020 +0100

firebird: fix Thread handle type on Windows

MSVC compiler complains about 'warning C4312: "reinterpret_cast":
conversion from "unsigned long" to "HANDLE" of greater size'.
Seems like an real error, if real_handle is too small to hold the
full "HANDLE" value, returned by _beginthreadex.

Upstream strangely just fixed in master, not B3_0_Release branch.

Change-Id: I87ad263529e119f68da976245646bf8b69efd35a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105924
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/external/firebird/0001-Fix-warning-on-Win64-build-231.patch.1 
b/external/firebird/0001-Fix-warning-on-Win64-build-231.patch.1
new file mode 100644
index ..0e21f9e27925
--- /dev/null
+++ b/external/firebird/0001-Fix-warning-on-Win64-build-231.patch.1
@@ -0,0 +1,37 @@
+From 60cb8e07b17ad8533d7d13f52435aa11e48f4659 Mon Sep 17 00:00:00 2001
+From: Dimitry Sibiryakov 
+Date: Tue, 12 Nov 2019 13:42:49 +0100
+Subject: [PATCH] Fix warning on Win64 build (#231)
+
+---
+ src/common/ThreadStart.cpp | 11 +++
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/common/ThreadStart.cpp b/src/common/ThreadStart.cpp
+index 184c93a32b..758056432f 100644
+--- a/src/common/ThreadStart.cpp
 b/src/common/ThreadStart.cpp
+@@ -309,13 +309,16 @@ Thread Thread::start(ThreadEntryPoint* routine, void* 
arg, int priority_arg, Han
+* Advanced Windows by Richter pg. # 109. */
+ 
+   unsigned thread_id;
+-  unsigned long real_handle =
+-  _beginthreadex(NULL, 0, THREAD_ENTRYPOINT, THREAD_ARG, 
CREATE_SUSPENDED, _id);
+-  if (!real_handle)
++  HANDLE handle =
++  reinterpret_cast(_beginthreadex(NULL, 0, 
THREAD_ENTRYPOINT, THREAD_ARG, CREATE_SUSPENDED, _id));
++  if (!handle)
+   {
++  // Though MSDN says that _beginthreadex() returns error in 
errno,
++  // GetLastError() still works because RTL call no other system
++  // functions after CreateThread() in the case of error.
++  // Watch out if it is ever changed.
+   Firebird::system_call_failed::raise("_beginthreadex", 
GetLastError());
+   }
+-  HANDLE handle = reinterpret_cast(real_handle);
+ 
+   SetThreadPriority(handle, priority);
+ 
+-- 
+2.20.1
+
diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index a3ee4bfe1835..a8507db387f1 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/asan.patch \
external/firebird/firebird-tdf125284.patch.1 \

external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 \
+external/firebird/0001-Fix-warning-on-Win64-build-231.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2020-11-16 Thread Stephan Bergmann (via logerrit)

 external/firebird/firebird-macosx.patch.1 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 17244646ff52dcb2a5d043e9a9ce0eaa8d23414d
Author: Stephan Bergmann 
AuthorDate: Mon Nov 16 15:22:55 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Nov 16 20:02:48 2020 +0100

Modify the non-symlink libfbclient.dylib.3.0.0

At least in my --enable-debug build,
workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib originally contains

  libfbclient.dylib -> libfbclient.dylib.2
  libfbclient.dylib.2 -> libfbclient.dylib.3.0.0
  libfbclient.dylib.3.0.0

so if we modify libfbclient.dylib with install_name_tool, it will break the
symlink and modify libfbclient.dylib but not 
libfbclient.dylib.3.0.0---where the
latter is what gets delivered via 
external/firebird/ExternalPackage_firebird.mk.

(This didn't cause any issues, though, because 
gb_LinkTarget__use_libfbembed in
RepositoryExternal.mk links against the modified libfbclient.dylib in 
workdir,
not against the delivered libfbclient.dylib.3.0.0, so e.g. 
Library_firebird_sdbc
did already contain the correct @loader_path/libfbclient.dylib.3.0.0 
reference.
Also, the `install_name_tool -id` treatment of libEngine12.dylib in
external/firebird/firebird-macosx.patch.1 should not technically be 
necessary,
as nothing links against that library; but if left unmodified, it would 
record
the build machine's

  
/full-path-to/workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.dylib

so better "clean it up".  Also, the `install_name_tool -change` treatment of
libEngine12.dylib in external/firebird/firebird-macosx.patch.1 is necessary
because otherwise it would record a full-path dependency to

  
/full-path-to/workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib/libfbclient.dylib.3.0.0

which macosx-change-install-names.pl, called from MAKE_POST in
external/firebird/ExternalProject_firebird.mk, would not adjust.  With all 
those
modifications in external/firebird/firebird-macosx.patch.1, the call to
macosx-change-install-names.pl should effectively have nothing left to do, 
as
these libraries do not depend on any other LO-provided libraries, but better
leave it in place anyway.)

Change-Id: Icf7f2ff5cb844b07be223e0b74cd6a650725777a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105946
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/firebird-macosx.patch.1 
b/external/firebird/firebird-macosx.patch.1
index e379ca738b18..35e631dece68 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -71,7 +71,7 @@
$(MAKE) plugins
$(MAKE) examples
$(MAKE) rest
-+  install_name_tool -id 
@__OOO/libfbclient.dylib.3.0.0 
$(LIB)/libfbclient.dylib
++  install_name_tool -id 
@__OOO/libfbclient.dylib.3.0.0 
$(LIB)/libfbclient.dylib.3.0.0
 +  install_name_tool -id 
@__OOO/libEngine12.dylib 
$(PLUGINS)/libEngine12.dylib
 +  install_name_tool -change $(LIB)/libfbclient.dylib.3.0.0 
@loader_path/libfbclient.dylib.3.0.0 $(PLUGINS)/libEngine12.dylib
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2020-02-20 Thread Stephan Bergmann (via logerrit)

 external/firebird/asan.patch |   11 ---
 external/firebird/firebird-cygwin-msvc.patch |4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 285d275816e58798a0a830f356cc76ef5ef506e1
Author: Stephan Bergmann 
AuthorDate: Thu Feb 20 18:32:42 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Feb 21 00:04:34 2020 +0100

external/firebird: Remove dead conditionals

For one, Clang appears to support __has_feature since at least 3.x times.  
That
simplifies the first check, from 14955ed91b282ccbb395cb47c6d76e3b42b34748
"external/firebird: Support Clang ASan".

And for another, the second check, from 
25764ffd4db0e5db6f9cc9f3da8691e607f48b83
"external/firebird: Better workaround for Clang alignment expectations", 
can be
simplified now that we no longer support neither Clang < 4 on Linux (since
685aca47da835e80f34b295c5d6389df03d1a8c2 "Bump (Linux) Clang baseline to 
5.0.2")
nor Xcode < 9 on macOS (since b4f666f2e677b05cab8395fe7972b45b15f60c3f "Bump
Xcode baseline to 9.3").

But that means we are always setting USE_ASAN when building with Clang now 
(to
work around certain Clang alignment expectations, regardless of whether or 
not
we build with -fsanitize=address).  Nevertheless, keep the
__has_feature(address_sanitizer) check as a comment, to make this a bit 
clearer.

Change-Id: Idc9720bd763bc1e00585773ef096202e2a8a6a59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89162
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/asan.patch b/external/firebird/asan.patch
index a4ef7075a884..5ee7744e1038 100644
--- a/external/firebird/asan.patch
+++ b/external/firebird/asan.patch
@@ -204,17 +204,14 @@
  #ifdef DEBUG_GDS_ALLOC
 --- src/include/firebird.h
 +++ src/include/firebird.h
-@@ -38,8 +38,20 @@
+@@ -38,8 +38,17 @@
  #include "gen/autoconfig.h"
  #endif
  
-+#if defined __clang__ && defined __has_feature
-+#if __has_feature(address_sanitizer)
-+#define USE_ASAN
-+#endif
-+#endif
-+#if defined __clang__ && (defined __apple_build_version__ ? __clang_major__ 
>= 9 : __clang_major__ >= 4)
++#if defined __clang__
++//#if __has_feature(address_sanitizer)
 +#define USE_ASAN
++//#endif
 +#endif
 +#if defined __SANITIZE_ADDRESS__
 +#define USE_ASAN
diff --git a/external/firebird/firebird-cygwin-msvc.patch 
b/external/firebird/firebird-cygwin-msvc.patch
index 12dcb3c9513a..317ea8026b5d 100644
--- a/external/firebird/firebird-cygwin-msvc.patch
+++ b/external/firebird/firebird-cygwin-msvc.patch
@@ -10,8 +10,8 @@
  #include "gen/autoconfig.h"
 -#endif
  
- #if defined __clang__ && defined __has_feature
- #if __has_feature(address_sanitizer)
+ #if defined __clang__
+ //#if __has_feature(address_sanitizer)
 --- src/misc/writeBuildNum.sh  2016-07-07 15:57:04.538983200 +0200
 +++ src/misc/writeBuildNum.sh  2016-07-13 11:31:18.132820200 +0200
 @@ -95,9 +95,9 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2019-10-21 Thread Stephan Bergmann (via logerrit)

 external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 
|   49 ++
 external/firebird/UnpackedTarball_firebird.mk  
|4 
 2 files changed, 53 insertions(+)

New commits:
commit 77f00a0237c9484dc3c71d0300df2007f581c5da
Author: Stephan Bergmann 
AuthorDate: Mon Oct 21 18:09:00 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Oct 21 21:56:57 2019 +0200

external/firebird: Make comparison operator member functions const

see commit message of

external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1
for details

Change-Id: I559e4b6ef2dbf3800ff5013dcde078d69296d2fb
Reviewed-on: https://gerrit.libreoffice.org/81261
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git 
a/external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1
 
b/external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1
new file mode 100644
index ..42c677f7e5ad
--- /dev/null
+++ 
b/external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1
@@ -0,0 +1,49 @@
+From 15390d75ee6ca429dbbe15ea04214df8a30fbd48 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann 
+Date: Mon, 21 Oct 2019 17:54:18 +0200
+Subject: [PATCH] Make comparison operator member functions const
+
+...which avoids overload resolution ambiguities in C++20, when a synthesized
+candidate of operator == for a reversed-argument rewrite conflicts with the
+actual operator ==, due to the asymmetric const-ness of the implicit object
+parameter and the RHS parameter.  (As observed with recent Clang 10 trunk with
+-std=c++2a when building firebird as part of LibreOffice:
+
+> workdir/UnpackedTarball/firebird/src/jrd/inf.cpp:1139:62: error: use of 
overloaded operator '!=' is ambiguous (with operand types 
'RuntimeStatistics::Iterator' and 'Jrd::RuntimeStatistics::Iterator')
+> for (RuntimeStatistics::Iterator iter = stats.begin(); iter != 
stats.end(); ++iter)
+> ^  
~~~
+> 
workdir/UnpackedTarball/firebird/src/jrd/../dsql/../jrd/RuntimeStatistics.h:283:8:
 note: candidate function
+> bool operator!=(const Iterator& other)
+>  ^
+> 
workdir/UnpackedTarball/firebird/src/jrd/../dsql/../jrd/RuntimeStatistics.h:278:8:
 note: candidate function
+> bool operator==(const Iterator& other)
+>  ^
+> 
workdir/UnpackedTarball/firebird/src/jrd/../dsql/../jrd/RuntimeStatistics.h:278:8:
 note: candidate function (with reversed parameter order)
+
+)
+---
+ src/jrd/RuntimeStatistics.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/jrd/RuntimeStatistics.h b/src/jrd/RuntimeStatistics.h
+index 74a03de2ad..fab286ad1a 100644
+--- a/src/jrd/RuntimeStatistics.h
 b/src/jrd/RuntimeStatistics.h
+@@ -290,12 +290,12 @@ public:
+   {}
+ 
+   public:
+-  bool operator==(const Iterator& other)
++  bool operator==(const Iterator& other) const
+   {
+   return (m_counts == other.m_counts);
+   }
+ 
+-  bool operator!=(const Iterator& other)
++  bool operator!=(const Iterator& other) const
+   {
+   return (m_counts != other.m_counts);
+   }
+-- 
+2.21.0
+
diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index a2fe0afec0e5..a3ee4bfe1835 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -18,6 +18,9 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,firebird,\
extern/editline \
 ))
 
+# * 
external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 
is upstream at
+#    "Make comparison 
operator member functions
+#   const":
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 external/firebird/firebird.disable-ib-util-not-found.patch.1 \
external/firebird/firebird-Engine12.patch \
@@ -32,6 +35,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/ubsan.patch \
external/firebird/asan.patch \
external/firebird/firebird-tdf125284.patch.1 \
+   
external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2019-08-23 Thread Caolán McNamara (via logerrit)

 external/firebird/UnpackedTarball_firebird.mk |1 
 external/firebird/firebird-tdf125284.patch.1  |   27 ++
 2 files changed, 28 insertions(+)

New commits:
commit 7bc3da4ff0a6fda621340a4ded79f7ed4ce31d85
Author: Caolán McNamara 
AuthorDate: Fri Aug 23 17:00:43 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 23 21:58:46 2019 +0200

Resolves: tdf#125284 config entries not substituted under Turkish locale

cause i is not the lowercase of I

Change-Id: I616d642df54ce19e68d484c43250a79ecae344ee
Reviewed-on: https://gerrit.libreoffice.org/78025
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 96f29a76ead5..a2fe0afec0e5 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/c++17.patch \
external/firebird/ubsan.patch \
external/firebird/asan.patch \
+   external/firebird/firebird-tdf125284.patch.1 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/firebird/firebird-tdf125284.patch.1 
b/external/firebird/firebird-tdf125284.patch.1
new file mode 100644
index ..a1cb2043e34b
--- /dev/null
+++ b/external/firebird/firebird-tdf125284.patch.1
@@ -0,0 +1,27 @@
+--- firebird/src/common/config/config_file.cpp 2019-08-23 16:42:26.721439468 
+0100
 firebird/src/common/config/config_file.cpp 2019-08-23 16:43:07.506579222 
+0100
+@@ -521,16 +521,14 @@
+   unsigned code;
+   const char* name;
+   } dirs[] = {
+-#define NMDIR(a) {Firebird::IConfigManager::a, "FB_"#a},
+-  NMDIR(DIR_CONF)
+-  NMDIR(DIR_SECDB)
+-  NMDIR(DIR_PLUGINS)
+-  NMDIR(DIR_UDF)
+-  NMDIR(DIR_SAMPLE)
+-  NMDIR(DIR_SAMPLEDB)
+-  NMDIR(DIR_INTL)
+-  NMDIR(DIR_MSG)
+-#undef NMDIR
++  {Firebird::IConfigManager::DIR_CONF, "FB_dir_conf"},
++  {Firebird::IConfigManager::DIR_SECDB, "FB_dir_secdb"},
++  {Firebird::IConfigManager::DIR_PLUGINS, "FB_dir_plugins"},
++  {Firebird::IConfigManager::DIR_UDF, "FB_dir_udf"},
++  {Firebird::IConfigManager::DIR_SAMPLE, "FB_dir_sample"},
++  {Firebird::IConfigManager::DIR_SAMPLEDB, "FB_dir_sampledb"},
++  {Firebird::IConfigManager::DIR_INTL, "FB_dir_intl"},
++  {Firebird::IConfigManager::DIR_MSG, "FB_dir_msg"},
+   {Firebird::IConfigManager::DIR_COUNT, NULL}
+   };
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2019-02-03 Thread Libreoffice Gerrit user

 external/firebird/ExternalProject_firebird.mk |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 0a42105a8d95473646b850eed6d428ebb93fc01f
Author: Michael Stahl 
AuthorDate: Fri Feb 1 19:35:03 2019 +0100
Commit: Michael Stahl 
CommitDate: Sun Feb 3 14:59:27 2019 +0100

firebird: fix CXXFLAGS

In 3.0.4, the horrible makefiles override the CXXFLAGS variable:

firebird/builds/posix/prefix.linux_generic:CXXFLAGS=-std=gnu++03

Work around that by passing LO's customised CXXFLAGS as a command-line
parameter to make, which in turn overrides the definition in the
makefile.

Other platforms, in particular Darwin, apparently extend CXXFLAGS
instead of overwriting.

To nobody's surprise, gnu++03 doesn't even build with clang because ICU
headers use C++11 features (although strangely gcc doesn't complain).

Change-Id: If3b26482a4f4bf284057e261677cd7182656154f
Reviewed-on: https://gerrit.libreoffice.org/67255
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index d0614e202951..3b444397442d 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -97,9 +97,17 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
'<' 101200)), \
ac_cv_func_clock_gettime=no)) \
&& if [ -n "$${FB_CPU_ARG}" ]; then \
-  $(MAKE_PRE) $(MAKE) $(if $(ENABLE_DEBUG),Debug) 
$(INVOKE_FPA) SHELL='$(SHELL)' LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst 
$$,,$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib)))' $(MAKE_POST); \
+   $(MAKE_PRE) $(MAKE) \
+   $(if $(filter 
LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
+   $(if $(ENABLE_DEBUG),Debug) 
$(INVOKE_FPA) SHELL='$(SHELL)' \
+   LIBO_TUNNEL_LIBRARY_PATH='$(subst 
','\'',$(subst $$,,$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib)))' \
+   $(MAKE_POST); \
else \
-  $(MAKE_PRE) $(MAKE) $(if $(ENABLE_DEBUG),Debug) 
SHELL='$(SHELL)' LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst 
$$,,$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib)))' $(MAKE_POST); \
+   $(MAKE_PRE) $(MAKE) \
+   $(if $(filter 
LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \
+   $(if $(ENABLE_DEBUG),Debug) 
SHELL='$(SHELL)' \
+   LIBO_TUNNEL_LIBRARY_PATH='$(subst 
','\'',$(subst $$,,$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib)))' \
+   $(MAKE_POST); \
fi \
)
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2018-08-15 Thread Libreoffice Gerrit user

 external/firebird/firebird-vs2017.patch.1 |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit b3b5abf3fdb0e088f6b902a22c3434e7176513c1
Author: Mike Kaganski 
AuthorDate: Wed Aug 15 14:00:56 2018 +0200
Commit: Mike Kaganski 
CommitDate: Wed Aug 15 18:20:57 2018 +0200

Allow all _MSC_VER up to (excluding) 2000 (Firebird)

(see 
https://blogs.msdn.microsoft.com/vcblog/2016/10/05/visual-c-compiler-version/)

Change-Id: I69133a3742f72c20daa0ad94e093e4fffbd5d8c2
Reviewed-on: https://gerrit.libreoffice.org/59097
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/external/firebird/firebird-vs2017.patch.1 
b/external/firebird/firebird-vs2017.patch.1
index a4dad62e34a9..609f380a3e46 100644
--- a/external/firebird/firebird-vs2017.patch.1
+++ b/external/firebird/firebird-vs2017.patch.1
@@ -4,9 +4,8 @@ diff -ru firebird.orig/src/common/os/win32/mod_loader.cpp 
firebird/src/common/os
 @@ -103,6 +103,6 @@
"msvcr120.dll",
 -#elif _MSC_VER == 1900
--  "vcruntime140.dll",
-+#elif _MSC_VER >= 1900 && _MSC_VER <= 1914
-+  "vcruntime140.dll",
++#elif _MSC_VER >= 1900 && _MSC_VER < 2000
+   "vcruntime140.dll",
  #else
  #error Specify CRT DLL name here !
  #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2018-06-03 Thread Michael Stahl

 external/firebird/UnpackedTarball_firebird.mk |2 --
 external/firebird/asan.patch  |   21 -
 2 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 731665f3c604fd3820500275445876bbc77b9c08
Author: Michael Stahl 
Date:   Sun Jun 3 17:02:31 2018 +0200

firebird: adapt asan.patch to GCC, which lacks __has_feature

Also apply sanitizer.patch, because why not.

Also tweak configure to check for dlsym() instead of dlopen();
the situation described in commit
037584cfe5e58bf6807fb0188d245042baa8c1c0 still holds on Fedora 27.

Change-Id: I446fa3e991aec06452f135ab8365702a397c441a
Reviewed-on: https://gerrit.libreoffice.org/55247
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index aaea3a5b4231..96f29a76ead5 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -48,12 +48,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 ))
 endif
 
-ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,firebird, \
 external/firebird/sanitizer.patch \
 ))
 endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/firebird/asan.patch b/external/firebird/asan.patch
index b6ecec8f4caf..a4ef7075a884 100644
--- a/external/firebird/asan.patch
+++ b/external/firebird/asan.patch
@@ -204,7 +204,7 @@
  #ifdef DEBUG_GDS_ALLOC
 --- src/include/firebird.h
 +++ src/include/firebird.h
-@@ -38,8 +38,17 @@
+@@ -38,8 +38,20 @@
  #include "gen/autoconfig.h"
  #endif
  
@@ -216,6 +216,9 @@
 +#if defined __clang__ && (defined __apple_build_version__ ? __clang_major__ 
>= 9 : __clang_major__ >= 4)
 +#define USE_ASAN
 +#endif
++#if defined __SANITIZE_ADDRESS__
++#define USE_ASAN
++#endif
 +
  // Using our debugging code is pointless when we may use Valgrind features
 -#if defined(DEV_BUILD) && !defined(USE_VALGRIND)
@@ -234,3 +237,19 @@
T* end;
};
  #endif// RECURSIVE_SIMILAR
+--- configure.orig 2018-06-03 17:44:50.152951348 +0200
 configure  2018-06-03 17:45:11.708907807 +0200
+@@ -18479,11 +18479,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char dlopen ();
++char dlsym ();
+ int
+ main ()
+ {
+-return dlopen ();
++return dlsym ();
+   ;
+   return 0;
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2018-04-17 Thread Tor Lillqvist

 external/firebird/firebird-macosx.patch.1 |   20 
 1 file changed, 20 deletions(-)

New commits:
commit 25812b3eb420b0160b07ae604c5589a305c26938
Author: Tor Lillqvist 
Date:   Tue Apr 17 10:20:37 2018 +0300

We don't build for i386 on macOS anyway

No no need to patch the Firebird build settings for i386.

Change-Id: Ic187ff462325511a9a498e312f54350be7542366
Reviewed-on: https://gerrit.libreoffice.org/53054
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/external/firebird/firebird-macosx.patch.1 
b/external/firebird/firebird-macosx.patch.1
index 8961c4278924..e379ca738b18 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -65,26 +65,6 @@
cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help
cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var
mkdir -p $(FB_FW)/Resources/doc
 firebird.org/builds/posix/prefix.darwin_i386   2016-08-01 
22:55:34.0 +0200
-+++ firebird/builds/posix/prefix.darwin_i386   2016-08-01 23:02:46.0 
+0200
-@@ -26,14 +26,14 @@
- # 4. for  CFLAGS, CXXFLAGS, LDFLAGS export '-m32 -arch i386'
- # 5. export MACOSX_DEPLOYMENT_TARGET=10.7 
- 
--DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
-+DYLD_LIBRARY_PATH:=$(FIREBIRD)/lib:$(DYLD_LIBRARY_PATH)
- export DYLD_LIBRARY_PATH
- 
- MACOSX_DEPLOYMENT_TARGET=10.7
- export MACOSX_DEPLOYMENT_TARGET
- 
--PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common -arch i386 
-mmacosx-version-min=10.7
--DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-common -Wall -arch i386 
-mmacosx-version-min=10.7 -Wno-non-virtual-dtor
-+PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common -arch i386
-+DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-common -Wall -arch i386 
-Wno-non-virtual-dtor
- CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden 
-fno-weak
- 
- EXE_LINK_OPTIONS:=-m32
 --- firebird.org/builds/posix/Makefile.in  2016-08-08 17:58:20.0 
+0200
 +++ firebird/builds/posix/Makefile.in  2016-08-08 17:57:17.0 +0200
 @@ -191,6 +191,9 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2018-04-16 Thread Stephan Bergmann

 external/firebird/ExternalProject_firebird.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ceb4bc418cd4c03a4e78f4a84ae2d56a71799a31
Author: Stephan Bergmann 
Date:   Mon Apr 16 09:52:33 2018 +0200

Pass gb_SYMBOL into external/firebird

Change-Id: I91e68dfe770aaa906abac107c3e56bc5e4782512
Reviewed-on: https://gerrit.libreoffice.org/52937
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 5678a6f36218..5ca8c0b01418 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -75,6 +75,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
) \
$(CXXFLAGS_CXX11) \
$(firebird_NO_CXX11_NARROWING) \
+   $(if $(filter 
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \
" \
&& export LDFLAGS=" \
$(if $(SYSTEM_ICU),$(ICU_LIBS), \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2018-04-13 Thread Stephan Bergmann

 external/firebird/asan.patch |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 9ddc4b62b4bdf04a2aeeddb053b00ccc031e83ef
Author: Stephan Bergmann 
Date:   Fri Apr 13 09:11:00 2018 +0200

external/firebird: Even more LIBO_TUNNEL_LIBRARY_PATH

...as needed by some builders, apparently.

Change-Id: I94f3059121d21d55fc7f87d5554bf192f6858e06

diff --git a/external/firebird/asan.patch b/external/firebird/asan.patch
index 1edcf86bce29..4c40f52bfc87 100644
--- a/external/firebird/asan.patch
+++ b/external/firebird/asan.patch
@@ -57,15 +57,17 @@
  $(BUILD_FILE):$(BUILD_Objects) $(COMMON_LIB)
 --- builds/posix/Makefile.in.examples
 +++ builds/posix/Makefile.in.examples
-@@ -123,7 +123,7 @@
+@@ -123,8 +123,8 @@
  
  $(EMPLOYEE_DB):   $(EXAMPLES_DEST)/empbuild$(EXEC_EXT) $(INPUT_Sources) 
$(EXAMPLES_DEST)/isql$(EXEC_EXT)
-$(RM) $(EMPLOYEE_DB)
 -  ./empbuild $(EMPLOYEE_DB)
+-  $(GFIX) -write sync $(EMPLOYEE_DB)
 +  $(LIBO_TUNNEL_LIBRARY_PATH) ./empbuild $(EMPLOYEE_DB)
-   $(GFIX) -write sync $(EMPLOYEE_DB)
++  $(LIBO_TUNNEL_LIBRARY_PATH) $(GFIX) -write sync $(EMPLOYEE_DB)
-$(CHMOD_6) $(EMPLOYEE_DB)
  
+ # To get past the fact isql is called from the programs, we create a local 
link in this directory
 @@ -140,7 +140,7 @@
  
  $(EXAMPLES_DEST)/empbuild.fdb : $(EXAMPLES_DEST)/empddl.sql 
$(EXAMPLES_DEST)/empbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2018-04-13 Thread Stephan Bergmann

 external/firebird/asan.patch |9 +
 1 file changed, 9 insertions(+)

New commits:
commit ed52ffb6ab840a1f4abdda8553fa9410793f4add
Author: Stephan Bergmann 
Date:   Fri Apr 13 08:43:29 2018 +0200

external/firebird: Even more LIBO_TUNNEL_LIBRARY_PATH

...as needed by some builders, apparently.

Change-Id: I0b7c063ef2c712a6b32aa107ab733a3723b38f99

diff --git a/external/firebird/asan.patch b/external/firebird/asan.patch
index fa9c4d88b249..1edcf86bce29 100644
--- a/external/firebird/asan.patch
+++ b/external/firebird/asan.patch
@@ -57,6 +57,15 @@
  $(BUILD_FILE):$(BUILD_Objects) $(COMMON_LIB)
 --- builds/posix/Makefile.in.examples
 +++ builds/posix/Makefile.in.examples
+@@ -123,7 +123,7 @@
+ 
+ $(EMPLOYEE_DB):   $(EXAMPLES_DEST)/empbuild$(EXEC_EXT) $(INPUT_Sources) 
$(EXAMPLES_DEST)/isql$(EXEC_EXT)
+   -$(RM) $(EMPLOYEE_DB)
+-  ./empbuild $(EMPLOYEE_DB)
++  $(LIBO_TUNNEL_LIBRARY_PATH) ./empbuild $(EMPLOYEE_DB)
+   $(GFIX) -write sync $(EMPLOYEE_DB)
+   -$(CHMOD_6) $(EMPLOYEE_DB)
+ 
 @@ -140,7 +140,7 @@
  
  $(EXAMPLES_DEST)/empbuild.fdb : $(EXAMPLES_DEST)/empddl.sql 
$(EXAMPLES_DEST)/empbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2018-04-12 Thread Stephan Bergmann

 external/firebird/asan.patch |   20 
 1 file changed, 20 insertions(+)

New commits:
commit 7ba4d6f367aacec69b3a3707e55085cc7303e573
Author: Stephan Bergmann 
Date:   Thu Apr 12 15:02:45 2018 +0200

external/firebird: More LIBO_TUNNEL_LIBRARY_PATH

...after 14955ed91b282ccbb395cb47c6d76e3b42b34748 "external/firebird: 
Support
Clang ASan", which was oddly enough only necessary on one machine,
, but not 
on
others.  Maybe the best fix overall would be to just not build examples at 
all,
as is already done in external/firebird/firebird-cygwin-msvc.patch.

Change-Id: I7dd37c93ea5a55cb26a167e52d22a6f50c05494e
Reviewed-on: https://gerrit.libreoffice.org/52779
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/asan.patch b/external/firebird/asan.patch
index 33d418513fba..fa9c4d88b249 100644
--- a/external/firebird/asan.patch
+++ b/external/firebird/asan.patch
@@ -55,6 +55,26 @@
$(CHMOD_6) $@
  
  $(BUILD_FILE):$(BUILD_Objects) $(COMMON_LIB)
+--- builds/posix/Makefile.in.examples
 builds/posix/Makefile.in.examples
+@@ -140,7 +140,7 @@
+ 
+ $(EXAMPLES_DEST)/empbuild.fdb : $(EXAMPLES_DEST)/empddl.sql 
$(EXAMPLES_DEST)/empbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT)
+   -$(RM) $(EXAMPLES_DEST)/empbuild.fdb
+-  $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i empbld.sql
++  $(LIBO_TUNNEL_LIBRARY_PATH) $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i 
empbld.sql
+ 
+ # The chain for intlemp.fdb is the same a script file to create an empty 
database
+ # to allow a .e program to be compiled, to then create and populate with data
+@@ -158,7 +158,7 @@
+ 
+ $(EXAMPLES_DEST)/intlbuild.fdb : $(EXAMPLES_DEST)/intlddl.sql 
$(EXAMPLES_DEST)/intlbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT)
+   -$(RM) intlbuild.fdb
+-  $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i intlbld.sql
++  $(LIBO_TUNNEL_LIBRARY_PATH) $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i 
intlbld.sql
+ 
+ 
+ $(EXAMPLES_DEST)/%.sql: $(EXAMPLES_SRC)/empbuild/%.sql
 --- builds/posix/make.rules
 +++ builds/posix/make.rules
 @@ -68,17 +68,17 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2018-04-12 Thread Stephan Bergmann

 external/firebird/ExternalProject_firebird.mk |6 
 external/firebird/UnpackedTarball_firebird.mk |1 
 external/firebird/asan.patch  |  206 ++
 external/firebird/firebird-cygwin-msvc.patch  |4 
 4 files changed, 212 insertions(+), 5 deletions(-)

New commits:
commit 14955ed91b282ccbb395cb47c6d76e3b42b34748
Author: Stephan Bergmann 
Date:   Wed Apr 11 08:59:07 2018 +0200

external/firebird: Support Clang ASan

First of all, LD_LIBRARY_PATH must not affect the make executable called 
for the
firebird build.  That would cause problems when that make executable 
depends on
system versions of dynamic libraries that also happen to be available as LO-
built versions on LD_LIBRARY_PATH:

> make: symbol lookup error: 
/data/sbergman/lo-san/core/instdir/program/libfreebl3.so: undefined symbol: 
__asan_option_detect_stack_use_after_return
> make: *** 
[/data/sbergman/lo-san/core/external/firebird/ExternalProject_firebird.mk:41: 
/data/sbergman/lo-san/core/workdir/ExternalProject/firebird/build] Error 127

For that, gb_Helper_extend_ld_path is now tunneled to the relevant places 
in the
firebird build, where executables are called that use firebird's
UnicodeUtil::getConversionICU
(workdir/UnpackedTarball/firebird/src/common/unicode_util.cpp) to 
dynamically
load icu libraries.  (Similar to 3a2818280ad65c3d0aa9e720f62fec571713b2e7
"external/liblangtag: Tunnel LD_LIBRARY_PATH to where it's actually 
needed".)

Then, what appears to work is to disable firebird's global operators 
new/delete
(so that ASan's versions kick in).

MemPool::{alloc,release}Raw would still be called at start-up through
Firebird::GlobalPtr
::GlobalPtr() calling Firebird::GlobalStorage::operator new(unsigned long), 
but
there is already provision to avoid those functions' heavy machinery for the
USE_VALGRIND case.

DEBUG_GDS_ALLOC (which would enable other inopportune overloads of global
operator new/delete) needs to be disabled in a somewhat contorted way, 
because
8ea07101c1613d213fd7cea17f094a947b14cd00 "external/firebird: Work around
operator new alignment violations" might explicitly set it from the outside,
which we need to undo for ASan builds.

`make check screenshot` encountered one alloc-dealloc-mismatch (already 
during
building firebird itself) that needs a patch to src/jrd/SimilarToMatcher.h.

Change-Id: I6bb68604095908189259be14440f72d3b23cbd4e
Reviewed-on: https://gerrit.libreoffice.org/52706
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index e1ab197227d1..5678a6f36218 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -30,7 +30,7 @@ ifeq ($(COM_IS_CLANG),TRUE)
 firebird_NO_CXX11_NARROWING := -Wno-c++11-narrowing
 endif
 
-MAKE_PRE=$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib) LC_ALL=C
+MAKE_PRE=LC_ALL=C
 
 MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl 
OOO \
@@ -97,9 +97,9 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
'<' 101200)), \
ac_cv_func_clock_gettime=no)) \
&& if [ -n "$${FB_CPU_ARG}" ]; then \
-  $(MAKE_PRE) $(MAKE) $(if $(ENABLE_DEBUG),Debug) 
$(INVOKE_FPA) SHELL='$(SHELL)' $(MAKE_POST); \
+  $(MAKE_PRE) $(MAKE) $(if $(ENABLE_DEBUG),Debug) 
$(INVOKE_FPA) SHELL='$(SHELL)' LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst 
$$,,$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib)))' $(MAKE_POST); \
else \
-  $(MAKE_PRE) $(MAKE) $(if $(ENABLE_DEBUG),Debug) 
SHELL='$(SHELL)' $(MAKE_POST); \
+  $(MAKE_PRE) $(MAKE) $(if $(ENABLE_DEBUG),Debug) 
SHELL='$(SHELL)' LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst 
$$,,$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib)))' $(MAKE_POST); \
fi \
)
 # vim: set noet sw=4 ts=4:
diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index fd780b964945..aaea3a5b4231 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\

external/firebird/0002-Backported-fix-for-CORE-5452-Segfault-when-engine-s-.patch.1
 \

[Libreoffice-commits] core.git: external/firebird

2018-04-11 Thread Stephan Bergmann

 external/firebird/ubsan.patch |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 7bd520428bf594d5edd217e58c8762f8d3648d04
Author: Stephan Bergmann 
Date:   Wed Apr 11 08:50:49 2018 +0200

external/firebird: Avoid -fsanitize=nonnull-attribute

...that hits at least during the build of firebird with also ASan enabled
(support for which will be committed shortly):

> [...]/workdir/UnpackedTarball/firebird/gen/Debug/firebird/bin/isql -q -i 
[...]/workdir/UnpackedTarball/firebird/src/dbs/metadata.sql
> workdir/UnpackedTarball/firebird/src/jrd/btr.cpp:5394:19: runtime error: 
null pointer passed as argument 2, which is declared to never be null
> /usr/include/string.h:43:28: note: nonnull attribute specified here
>  #0 in insert_node(Jrd::thread_db*, Jrd::win*, Jrd::index_insertion*, 
Jrd::temporary_key*, RecordNumber*, unsigned int*, unsigned int*) at 
workdir/UnpackedTarball/firebird/src/jrd/btr.cpp:5394:2 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x1ae2914)
>  #1 in add_node(Jrd::thread_db*, Jrd::win*, Jrd::index_insertion*, 
Jrd::temporary_key*, RecordNumber*, unsigned int*, unsigned int*) at 
workdir/UnpackedTarball/firebird/src/jrd/btr.cpp:2279:24 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x1ac5a92)
>  #2 in BTR_insert(Jrd::thread_db*, Jrd::win*, Jrd::index_insertion*) at 
workdir/UnpackedTarball/firebird/src/jrd/btr.cpp:1008:21 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x1ac29b5)
>  #3 in insert_key(Jrd::thread_db*, Jrd::jrd_rel*, Jrd::Record*, 
Jrd::jrd_tra*, Jrd::win*, Jrd::index_insertion*, Jrd::IndexErrorContext&) at 
workdir/UnpackedTarball/firebird/src/jrd/idx.cpp:1475:2 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x1c62e01)
>  #4 in IDX_store(Jrd::thread_db*, Jrd::record_param*, Jrd::jrd_tra*) at 
workdir/UnpackedTarball/firebird/src/jrd/idx.cpp:1018:22 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x1c661a2)
>  #5 in Jrd::StoreNode::store(Jrd::thread_db*, Jrd::jrd_req*, 
Jrd::StmtNode::WhichTrigger) const at 
workdir/UnpackedTarball/firebird/src/dsql/StmtNodes.cpp:7005:5 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x21c0c96)
>  #6 in Jrd::StoreNode::execute(Jrd::thread_db*, Jrd::jrd_req*, 
Jrd::StmtNode::ExeState*) const at 
workdir/UnpackedTarball/firebird/src/dsql/StmtNodes.cpp:6942:13 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x21bf955)
>  #7 in EXE_looper(Jrd::thread_db*, Jrd::jrd_req*, Jrd::StmtNode const*) 
at workdir/UnpackedTarball/firebird/src/jrd/exe.cpp:1292:17 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x157f798)
>  #8 in looper_seh(Jrd::thread_db*, Jrd::jrd_req*, Jrd::StmtNode const*) 
at workdir/UnpackedTarball/firebird/src/jrd/exe.cpp:1426:2 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x15834fc)
>  #9 in execute_looper(Jrd::thread_db*, Jrd::jrd_req*, Jrd::jrd_tra*, 
Jrd::StmtNode const*, Jrd::jrd_req::req_s) at 
workdir/UnpackedTarball/firebird/src/jrd/exe.cpp:1023:2 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x15740c3)
>  #10 in EXE_send(Jrd::thread_db*, Jrd::jrd_req*, unsigned short, unsigned 
int, unsigned char const*) at 
workdir/UnpackedTarball/firebird/src/jrd/exe.cpp:833:2 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x1579392)
>  #11 in add_index_set(Jrd::thread_db*) at 
workdir/UnpackedTarball/firebird/temp/Debug/jrd/ini.cpp:2251:3 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x1efb0c2)
>  #12 in INI_format(char const*, char const*) at 
workdir/UnpackedTarball/firebird/temp/Debug/jrd/ini.cpp:1563:2 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x1eef3bd)
>  #13 in Jrd::JProvider::createDatabase(Firebird::CheckStatusWrapper*, 
char const*, unsigned int, unsigned char const*) at 
workdir/UnpackedTarball/firebird/src/jrd/jrd.cpp:2691:4 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x1864267)
>  #14 in Firebird::IProviderBaseImpl > > > > 
>::cloopcreateDatabaseDispatcher(Firebird::IProvider*, Firebird::IStatus*, char 
const*, unsigned int, unsigned char const*) at 
workdir/UnpackedTarball/firebird/src/include/firebird/IdlFbInterfaces.h:9010:44 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x16eefb6)
>

[Libreoffice-commits] core.git: external/firebird

2018-04-09 Thread Stephan Bergmann

 external/firebird/ubsan.patch |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 3d12f4c2715596ceb33fe8323457aea13f2aa674
Author: Stephan Bergmann 
Date:   Mon Apr 9 10:59:47 2018 +0200

external/firebird: Fix -fsanitize=function

...while building external/firebird.  I started to get this failure around 
the
time I switched the machine from Fedora 27 to Fedora 28 beta, but not sure
whether the issue is related to that, nor why it only started to happen now:

> workdir/UnpackedTarball/firebird/src/common/unicode_util.cpp:1206:2: 
runtime error: call to function u_versionToString_60 through pointer to 
incorrect function type 'void (*)(unsigned char *, char *)'
> workdir/UnpackedTarball/icu/source/common/putil.cpp:2280: note: 
u_versionToString_60 defined here
>  #0 in 
Jrd::UnicodeUtil::getCollVersion(Firebird::StringBase
 const&, Firebird::StringBase const&, 
Firebird::StringBase&) at 
workdir/UnpackedTarball/firebird/src/common/unicode_util.cpp:1206:2 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x22ff24d)
>  #1 in Firebird::IntlUtil::setupIcuAttributes(charset*, 
Firebird::StringBase const&, 
Firebird::StringBase const&, 
Firebird::StringBase&) at 
workdir/UnpackedTarball/firebird/src/common/IntlUtil.cpp:629:7 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x2277bbd)
>  #2 in INTL_builtin_setup_attributes(char const*, char const*, char 
const*, unsigned int, unsigned char const*, unsigned int, unsigned char*) at 
workdir/UnpackedTarball/firebird/src/jrd/intl_builtin.cpp:1731:7 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x16b712c)
>  #3 in 
Jrd::IntlManager::setupCollationAttributes(Firebird::StringBase
 const&, Firebird::StringBase const&, 
Firebird::StringBase const&, 
Firebird::StringBase&) at 
workdir/UnpackedTarball/firebird/src/jrd/IntlManager.cpp:689:16 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x16ecd8b)
>  #4 in setupSpecificCollationAttributes(Jrd::thread_db*, Jrd::jrd_tra*, 
unsigned short, char const*) at 
workdir/UnpackedTarball/firebird/temp/Debug/jrd/dfw.cpp:7483:7 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x1918f67)
>  #5 in create_collation(Jrd::thread_db*, short, Jrd::DeferredWork*, 
Jrd::jrd_tra*) at 
workdir/UnpackedTarball/firebird/temp/Debug/jrd/dfw.cpp:7542:3 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x1936e2e)
>  #6 in DFW_perform_work(Jrd::thread_db*, Jrd::jrd_tra*) at 
workdir/UnpackedTarball/firebird/temp/Debug/jrd/dfw.cpp:4513:11 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x1912e49)
>  #7 in DFW_perform_system_work(Jrd::thread_db*) at 
workdir/UnpackedTarball/firebird/temp/Debug/jrd/dfw.cpp:4457:2 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x191259d)
>  #8 in INI_format(char const*, char const*) at 
workdir/UnpackedTarball/firebird/temp/Debug/jrd/ini.cpp:1808:2 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x18df473)
>  #9 in Jrd::JProvider::createDatabase(Firebird::CheckStatusWrapper*, char 
const*, unsigned int, unsigned char const*) at 
workdir/UnpackedTarball/firebird/src/jrd/jrd.cpp:2691:4 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x172d05f)
>  #10 in Firebird::IProviderBaseImpl > > > > 
>::cloopcreateDatabaseDispatcher(Firebird::IProvider*, Firebird::IStatus*, char 
const*, unsigned int, unsigned char const*) at 
workdir/UnpackedTarball/firebird/src/include/firebird/IdlFbInterfaces.h:9010:44 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x10d511f)
>  #11 in Firebird::IAttachment* 
Firebird::IProvider::createDatabase(Firebird::CheckStatusWrapper*,
 char const*, unsigned int, unsigned char const*) at 
workdir/UnpackedTarball/firebird/src/include/firebird/IdlFbInterfaces.h:2034:23 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib/libfbclient.so.2 
+0x3937f4)
>  #12 in 
Why::Dispatcher::attachOrCreateDatabase(Firebird::CheckStatusWrapper*, bool, 
char const*, unsigned int, unsigned char const*) at 
workdir/UnpackedTarball/firebird/src/yvalve/why.cpp:5681:15 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib/libfbclient.so.2 
+0x35adb7)
>  #13 in Why::Dispatcher::createDatabase(Firebird::CheckStatusWrapper*, 
char const*, unsigned int, unsigned char const*) at 
workdir/UnpackedTarball/firebird/src/yvalve/why.cpp:5606:9

[Libreoffice-commits] core.git: external/firebird

2018-04-09 Thread Stephan Bergmann

 external/firebird/ExternalProject_firebird.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 61411db9f719d793f0665a4d278e0748e8fcd75f
Author: Stephan Bergmann 
Date:   Mon Apr 9 11:06:26 2018 +0200

external/firebird: ICU_UCHAR_TYPE breaks -fsanitize=function

...while building external/firebird, and should not be necessary in a C++
project anyway (cf. 4c404950225e07ec7ee5275657a3192a5af79a04 
"ICU_UCHAR_TYPE is
not needed for C++11 projects").  I started to get this failure around the 
time
I switched the machine from Fedora 27 to Fedora 28 beta, but not sure 
whether
the issue is related to that, nor why it only started to happen now:

> workdir/UnpackedTarball/firebird/src/intl/cs_icu.cpp:67:30: runtime 
error: call to function ucnv_fromUChars_60 through pointer to incorrect 
function type 'int (*)(UConverter *, char *, int, const unsigned short *, int, 
UErrorCode *)'
> workdir/UnpackedTarball/icu/source/common/ucnv.cpp:1720: note: 
ucnv_fromUChars_60 defined here
>  #0 in CSICU_charset_init(charset*, char const*) at 
workdir/UnpackedTarball/firebird/src/intl/cs_icu.cpp:67:30 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/intl/libfbintl.so +0xb5a9c)
>  #1 in LD_lookup_charset at 
workdir/UnpackedTarball/firebird/src/intl/ld.cpp:484:10 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/intl/libfbintl.so +0xb34e4)
>  #2 in LCICU_setup_attributes(char const*, char const*, char const*, 
Firebird::StringBase const&, 
Firebird::StringBase&) at 
workdir/UnpackedTarball/firebird/src/intl/lc_icu.cpp:128:8 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/intl/libfbintl.so +0xaf3e2)
>  #3 in LD_setup_attributes at 
workdir/UnpackedTarball/firebird/src/intl/ld.cpp:568:7 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/intl/libfbintl.so +0xb47ff)
>  #4 in 
Jrd::IntlManager::setupCollationAttributes(Firebird::StringBase
 const&, Firebird::StringBase const&, 
Firebird::StringBase const&, 
Firebird::StringBase&) at 
workdir/UnpackedTarball/firebird/src/jrd/IntlManager.cpp:689:16 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x16ecd8b)
>  #5 in setupSpecificCollationAttributes(Jrd::thread_db*, Jrd::jrd_tra*, 
unsigned short, char const*) at 
workdir/UnpackedTarball/firebird/temp/Debug/jrd/dfw.cpp:7483:7 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x1918f67)
>  #6 in create_collation(Jrd::thread_db*, short, Jrd::DeferredWork*, 
Jrd::jrd_tra*) at 
workdir/UnpackedTarball/firebird/temp/Debug/jrd/dfw.cpp:7542:3 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x1936e2e)
>  #7 in DFW_perform_work(Jrd::thread_db*, Jrd::jrd_tra*) at 
workdir/UnpackedTarball/firebird/temp/Debug/jrd/dfw.cpp:4513:11 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x1912e49)
>  #8 in DFW_perform_system_work(Jrd::thread_db*) at 
workdir/UnpackedTarball/firebird/temp/Debug/jrd/dfw.cpp:4457:2 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x191259d)
>  #9 in INI_format(char const*, char const*) at 
workdir/UnpackedTarball/firebird/temp/Debug/jrd/ini.cpp:1808:2 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x18df473)
>  #10 in Jrd::JProvider::createDatabase(Firebird::CheckStatusWrapper*, 
char const*, unsigned int, unsigned char const*) at 
workdir/UnpackedTarball/firebird/src/jrd/jrd.cpp:2691:4 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x172d05f)
>  #11 in Firebird::IProviderBaseImpl > > > > 
>::cloopcreateDatabaseDispatcher(Firebird::IProvider*, Firebird::IStatus*, char 
const*, unsigned int, unsigned char const*) at 
workdir/UnpackedTarball/firebird/src/include/firebird/IdlFbInterfaces.h:9010:44 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.so 
+0x10d511f)
>  #12 in Firebird::IAttachment* 
Firebird::IProvider::createDatabase(Firebird::CheckStatusWrapper*,
 char const*, unsigned int, unsigned char const*) at 
workdir/UnpackedTarball/firebird/src/include/firebird/IdlFbInterfaces.h:2034:23 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib/libfbclient.so.2 
+0x3937f4)
>  #13 in 
Why::Dispatcher::attachOrCreateDatabase(Firebird::CheckStatusWrapper*, bool, 
char const*, unsigned int, unsigned char const*) at 
workdir/UnpackedTarball/firebird/src/yvalve/why.cpp:5681:15 
(workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib/libfbclient.so.2 
+0x35adb7)
>  #14 in

[Libreoffice-commits] core.git: external/firebird

2018-04-08 Thread Stephan Bergmann

 external/firebird/ubsan.patch |   12 
 1 file changed, 12 insertions(+)

New commits:
commit a2f395afa2c3bef08129c41f9b0ce92127f986ee
Author: Stephan Bergmann 
Date:   Sun Apr 8 11:10:55 2018 +0200

external/firebird: Avoid -fsanitize=nonnull-attribute

...during JunitTest_dbaccess_complex:

> 
workdir/UnpackedTarball/firebird/src/jrd/../dsql/../jrd/extds/../../common/classes/fb_string.h:677:26:
 runtime error: null pointer passed as argument 2, which is declared to never 
be null
> /usr/include/string.h:43:28: note: nonnull attribute specified here
>  #0 in Firebird::StringBase::assign(void 
const*, unsigned int) at 
workdir/UnpackedTarball/firebird/src/jrd/../dsql/../jrd/extds/../../common/classes/fb_string.h:677:4
 (instdir/program/../program/libEngine12.so +0x10d8acb)
>  #1 in Jrd::ExecStatementNode::getString(Jrd::thread_db*, Jrd::jrd_req*, 
Jrd::ValueExprNode const*, Firebird::StringBase&, 
bool) const at workdir/UnpackedTarball/firebird/src/dsql/StmtNodes.cpp:3506:6 
(instdir/program/../program/libEngine12.so +0x1a4cb95)
>  #2 in Jrd::ExecStatementNode::execute(Jrd::thread_db*, Jrd::jrd_req*, 
Jrd::StmtNode::ExeState*) const at 
workdir/UnpackedTarball/firebird/src/dsql/StmtNodes.cpp:3426:3 
(instdir/program/../program/libEngine12.so +0x1a4b21f)
>  #3 in EXE_looper(Jrd::thread_db*, Jrd::jrd_req*, Jrd::StmtNode const*) 
at workdir/UnpackedTarball/firebird/src/jrd/exe.cpp:1292:17 
(instdir/program/../program/libEngine12.so +0x129fe0f)
>  #4 in looper_seh(Jrd::thread_db*, Jrd::jrd_req*, Jrd::StmtNode const*) 
at workdir/UnpackedTarball/firebird/src/jrd/exe.cpp:1426:2 
(instdir/program/../program/libEngine12.so +0x12a295c)
>  #5 in execute_looper(Jrd::thread_db*, Jrd::jrd_req*, Jrd::jrd_tra*, 
Jrd::StmtNode const*, Jrd::jrd_req::req_s) at 
workdir/UnpackedTarball/firebird/src/jrd/exe.cpp:1023:2 
(instdir/program/../program/libEngine12.so +0x1298007)
>  #6 in EXE_receive(Jrd::thread_db*, Jrd::jrd_req*, unsigned short, 
unsigned int, unsigned char*, bool) at 
workdir/UnpackedTarball/firebird/src/jrd/exe.cpp:631:3 
(instdir/program/../program/libEngine12.so +0x1295ffa)
>  #7 in JRD_receive(Jrd::thread_db*, Jrd::jrd_req*, unsigned short, 
unsigned int, unsigned char*) at 
workdir/UnpackedTarball/firebird/src/jrd/jrd.cpp:7597:2 
(instdir/program/../program/libEngine12.so +0x173b736)
>  #8 in Jrd::DsqlDmlRequest::execute(Jrd::thread_db*, Jrd::jrd_tra**, 
Firebird::IMessageMetadata*, unsigned char const*, Firebird::IMessageMetadata*, 
unsigned char*, bool) at 
workdir/UnpackedTarball/firebird/src/dsql/dsql.cpp:723:3 
(instdir/program/../program/libEngine12.so +0x1b61a71)
>  #9 in DSQL_execute(Jrd::thread_db*, Jrd::jrd_tra**, Jrd::dsql_req*, 
Firebird::IMessageMetadata*, unsigned char const*, Firebird::IMessageMetadata*, 
unsigned char*) at workdir/UnpackedTarball/firebird/src/dsql/dsql.cpp:179:11 
(instdir/program/../program/libEngine12.so +0x1b53abd)
>  #10 in Jrd::JStatement::execute(Firebird::CheckStatusWrapper*, 
Firebird::ITransaction*, Firebird::IMessageMetadata*, void*, 
Firebird::IMessageMetadata*, void*) at 
workdir/UnpackedTarball/firebird/src/jrd/jrd.cpp:4446:4 
(instdir/program/../program/libEngine12.so +0x1743f17)
>  #11 in Firebird::IStatementBaseImpl > > 
>::cloopexecuteDispatcher(Firebird::IStatement*, Firebird::IStatus*, 
Firebird::ITransaction*, Firebird::IMessageMetadata*, void*, 
Firebird::IMessageMetadata*, void*) at 
workdir/UnpackedTarball/firebird/src/include/firebird/IdlFbInterfaces.h:8120:44 
(instdir/program/../program/libEngine12.so +0x177cb46)
>  #12 in Firebird::ITransaction* 
Firebird::IStatement::execute(Firebird::CheckStatusWrapper*,
 Firebird::ITransaction*, Firebird::IMessageMetadata*, void*, 
Firebird::IMessageMetadata*, void*) at 
workdir/UnpackedTarball/firebird/src/include/firebird/IdlFbInterfaces.h:1636:24 
(instdir/program/../program/libfbclient.so.2 +0x386562)
>  #13 in Why::YStatement::execute(Firebird::CheckStatusWrapper*, 
Firebird::ITransaction*, Firebird::IMessageMetadata*, void*, 
Firebird::IMessageMetadata*, void*) at 
workdir/UnpackedTarball/firebird/src/yvalve/why.cpp:4345:42 
(instdir/program/../program/libfbclient.so.2 +0x34ecfa)
>  #14 in (anonymous 
namespace)::IscStatement::execute(Firebird::CheckStatusWrapper*, unsigned int*, 
Firebird::IMessageMetadata*, unsigned char*, Firebird::IMessageMetadata*, 
unsigned char*) at workdir/UnpackedTarball/firebird/src/yvalve/why.cpp:1372:39 
(instdir/program/../program/libfbclient.so.2 +0x337d51)
>  #15 in isc_dsql_execute2 at 
workdir/UnpackedTarball/firebird/src/yvalve/why.cpp:2279:15 
(instdir/program/../program/libfbclient.so.2 +0x337096)
>  #16 in

[Libreoffice-commits] core.git: external/firebird

2018-03-31 Thread himajin100000

 external/firebird/firebird-vs2017.patch.1 |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit bbff9949f9c22daf1921b5680121102e4bd422ab
Author: himajin10 
Date:   Thu Mar 29 03:09:08 2018 +0900

Suppport _MSC_VER 1913 and 1914(Firebird)

Change-Id: Ifeab9119fcc1037365251cd49dd7714cc37b3012
Reviewed-on: https://gerrit.libreoffice.org/52164
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/external/firebird/firebird-vs2017.patch.1 
b/external/firebird/firebird-vs2017.patch.1
index 7d140589c881..a4dad62e34a9 100644
--- a/external/firebird/firebird-vs2017.patch.1
+++ b/external/firebird/firebird-vs2017.patch.1
@@ -1,11 +1,11 @@
 diff -ru firebird.orig/src/common/os/win32/mod_loader.cpp 
firebird/src/common/os/win32/mod_loader.cpp
 --- firebird.orig/src/common/os/win32/mod_loader.cpp   2017-02-15 
22:11:48.939042400 +0100
 +++ firebird/src/common/os/win32/mod_loader.cpp2017-02-15 
22:12:30.062262700 +0100
-@@ -103,6 +103,8 @@
+@@ -103,6 +103,6 @@
"msvcr120.dll",
- #elif _MSC_VER == 1900
-   "vcruntime140.dll",
-+#elif _MSC_VER == 1910 || _MSC_VER == 1911 || _MSC_VER == 1912
+-#elif _MSC_VER == 1900
+-  "vcruntime140.dll",
++#elif _MSC_VER >= 1900 && _MSC_VER <= 1914
 +  "vcruntime140.dll",
  #else
  #error Specify CRT DLL name here !
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2017-12-22 Thread Stephan Bergmann

 external/firebird/UnpackedTarball_firebird.mk |8 
 external/firebird/sanitizer.patch |   52 ++
 2 files changed, 60 insertions(+)

New commits:
commit 6a312a4a3d642f0f9769df54c0ec25471c9916bd
Author: Stephan Bergmann 
Date:   Fri Dec 22 07:58:47 2017 +0100

Prepare external/firebird for sanitizers

...so at least Clang -fsanitize=function on Linux works now.  The patch 
needs to
stop errors about undefined sanitizer symbols in DSOs (UNDEF_PLATFORM,
EXE_LINK_OPTIONS), and make resolution of RTTI symbols consistent in a 
process,
by exporting them from the various version map files and adding RTLD_GLOBAL 
to
dlopen.

Change-Id: I75779e55529b62a96a8943e3dee9119647aa91a7
Reviewed-on: https://gerrit.libreoffice.org/46947
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 9c03f7c8755f..a055b6573696 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -46,4 +46,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 ))
 endif
 
+ifeq ($(COM_IS_CLANG),TRUE)
+ifneq ($(filter -fsanitize=%,$(CC)),)
+$(eval $(call gb_UnpackedTarball_add_patches,firebird, \
+external/firebird/sanitizer.patch \
+))
+endif
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/firebird/sanitizer.patch 
b/external/firebird/sanitizer.patch
new file mode 100644
index ..cf3a54b266f8
--- /dev/null
+++ b/external/firebird/sanitizer.patch
@@ -0,0 +1,52 @@
+--- builds/posix/fbintl.vers
 builds/posix/fbintl.vers
+@@ -29,3 +29,4 @@
+ LD_lookup_texttype
+ LD_setup_attributes
+ LD_version
++_ZTI*
+--- builds/posix/fbplugin.vers
 builds/posix/fbplugin.vers
+@@ -26,3 +26,4 @@
+ #
+ 
+ firebird_plugin
++_ZTI*
+--- builds/posix/firebird.vers
 builds/posix/firebird.vers
+@@ -367,3 +367,4 @@
+ 
+ KEYWORD_stringIsAToken
+ KEYWORD_getTokens
++_ZTI*
+--- builds/posix/make.defaults
 builds/posix/make.defaults
+@@ -252,7 +252,7 @@
+ # LINKER OPTIONS
+ #
+ 
+-UNDEF_PLATFORM = -Wl,--no-undefined
++UNDEF_PLATFORM =
+ ifeq ($(TARGET),Debug)
+   UNDEF_FLAGS = $(UNDEF_PLATFORM)
+ endif
+@@ -291,7 +291,7 @@
+ LIB_LINK_MAPFILE= -Wl,--version-script,$(1)
+ FIREBIRD_LIBRARY_LINK= -L$(LIB) -lfbclient $(MATHLIB)
+ 
+-EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) 
$(LINK_EMPTY_SYMBOLS)
++EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS)
+ LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -shared
+ 
+ FB_DAEMON = $(BIN)/firebird$(EXEC_EXT)
+--- src/common/os/posix/mod_loader.cpp
 src/common/os/posix/mod_loader.cpp
+@@ -88,7 +88,7 @@
+ 
+ ModuleLoader::Module* ModuleLoader::loadModule(const Firebird::PathName& 
modPath)
+ {
+-  void* module = dlopen(modPath.nullStr(), FB_RTLD_MODE);
++  void* module = dlopen(modPath.nullStr(), FB_RTLD_MODE | RTLD_GLOBAL);
+   if (module == NULL)
+   {
+ #ifdef DEV_BUILD
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2017-09-26 Thread Stephan Bergmann

 external/firebird/UnpackedTarball_firebird.mk |1 
 external/firebird/automake.patch  | 1969 ++
 2 files changed, 1970 insertions(+)

New commits:
commit 1bfcde620f82e17205b75f020e632657505f1d8b
Author: Stephan Bergmann 
Date:   Tue Sep 26 08:23:49 2017 +0200

external/firebird: Update config.{guess,sub}

...with versions of those files from the latest
.

The current versions would fail for Flathub aarch64 builds.

Change-Id: Id53754e989244134bdc533eb7f37e08c598b03e0

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 29395c02561a..d58445ebe235 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/libc++.patch \

external/firebird/0001-Avoid-hangup-in-SS-when-error-happens-at-system-atta.patch.1
 \

external/firebird/0002-Backported-fix-for-CORE-5452-Segfault-when-engine-s-.patch.1
 \
+   external/firebird/automake.patch \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/firebird/automake.patch b/external/firebird/automake.patch
new file mode 100644
index ..928347f58850
--- /dev/null
+++ b/external/firebird/automake.patch
@@ -0,0 +1,1969 @@
+--- builds/make.new/config/config.guess
 builds/make.new/config/config.guess
+@@ -1,14 +1,12 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+-#   Free Software Foundation, Inc.
++#   Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+-timestamp='2010-08-21'
++timestamp='2014-11-04'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
++# the Free Software Foundation; either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+@@ -17,26 +15,22 @@
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see .
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-
+-# Originally written by Per Bothner.  Please send patches (context
+-# diff format) to  and include a ChangeLog
+-# entry.
++# the same distribution terms that you use for the rest of that
++# program.  This Exception is an additional permission under section 7
++# of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# This script attempts to guess a canonical system name similar to
+-# config.sub.  If it succeeds, it prints the system name on stdout, and
+-# exits with 0.  Otherwise, it exits with 1.
++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+ #
+ # You can get the latest version of this script from:
+ # 
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++#
++# Please send patches to .
++
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -56,9 +50,7 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+-Software Foundation, Inc.
++Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -92,7 +84,7 @@
+   exit 1
+ fi
+ 
+-trap 'exit 1' HUP INT TERM
++trap 'exit 1' 1 2 15
+ 
+ # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+ # compiler to aid in system detection is discouraged as it requires
+@@ -106,7 +98,7 @@
+ 
+ set_cc_for_build='
+ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) 
&& exit \$exitcode" 0 ;
+-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT 
PIPE TERM ;
++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 
15 ;
+ : ${TMPDIR=/tmp} ;
+  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXX") 2>/dev/null` && test -n 
"$tmp" &&

[Libreoffice-commits] core.git: external/firebird

2017-09-07 Thread Szymon Kłos

 external/firebird/firebird-vs2017.patch.1 |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5ffe8f05590e43eb8a668bb6da1f2e2ce0a7f713
Author: Szymon KÅos 
Date:   Thu Sep 7 15:39:49 2017 +0200

Fix firebird build with MSVC update 15.3

Change-Id: I236f182fd99e19e4ea171ad1bae6c03f1a258c7e
Reviewed-on: https://gerrit.libreoffice.org/42060
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/external/firebird/firebird-vs2017.patch.1 
b/external/firebird/firebird-vs2017.patch.1
index ba747b3470f4..b1d6b1b6b49e 100644
--- a/external/firebird/firebird-vs2017.patch.1
+++ b/external/firebird/firebird-vs2017.patch.1
@@ -1,12 +1,14 @@
 diff -ru firebird.orig/src/common/os/win32/mod_loader.cpp 
firebird/src/common/os/win32/mod_loader.cpp
 --- firebird.orig/src/common/os/win32/mod_loader.cpp   2017-02-15 
22:11:48.939042400 +0100
 +++ firebird/src/common/os/win32/mod_loader.cpp2017-02-15 
22:12:30.062262700 +0100
-@@ -103,6 +103,8 @@
+@@ -103,6 +103,10 @@
"msvcr120.dll",
  #elif _MSC_VER == 1900
"vcruntime140.dll",
 +#elif _MSC_VER == 1910
 +  "vcruntime140.dll",
++#elif _MSC_VER == 1911
++  "vcruntime140.dll",
  #else
  #error Specify CRT DLL name here !
  #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2017-03-22 Thread Stephan Bergmann

 external/firebird/ExternalProject_firebird.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 75530a7bbffbfd911f3481d5e0127da877da36b0
Author: Stephan Bergmann 
Date:   Wed Mar 22 14:41:44 2017 +0100

Fix building external/firebird with arbitrary locales

At least on Linux, building it with LANG=tr_TR.UTF-8 failed for me with

...
> make[5]: Entering directory '.../workdir/UnpackedTarball/firebird/gen'
> rm -f metadata.fdb
> .../workdir/UnpackedTarball/firebird/gen/Debug/firebird/bin/isql -q -i 
.../workdir/UnpackedTarball/firebird/src/dbs/metadata.sql
> .../workdir/UnpackedTarball/firebird/gen/Debug/firebird/bin/gfix -mode 
read_only metadata.fdb
> .../workdir/UnpackedTarball/firebird/gen/Debug/firebird/databases.conf: 
illegal line 
> Makefile:325: recipe for target 'metadata.fdb' failed
> make[5]: *** [metadata.fdb] Segmentation fault
> make[5]: *** Deleting file 'metadata.fdb'
> make[5]: Leaving directory '.../workdir/UnpackedTarball/firebird/gen'
> Makefile:166: recipe for target 'master_process' failed
...

Change-Id: I1784aaa790e527d382e8449f8007b0ae2dc14698

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 762e94de8fb4..361fffc86c64 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -26,7 +26,7 @@ ifneq ($(OS),WNT)
 INVOKE_FPA:="CPU=\$$(EMPTY) $${FB_CPU_ARG}"
 endif
 
-MAKE_PRE=$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib)
+MAKE_PRE=$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib) LC_ALL=C
 
 MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl 
OOO \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2017-03-03 Thread Caolán McNamara

 external/firebird/firebird-vs2013.patch.1 |   11 ---
 1 file changed, 11 deletions(-)

New commits:
commit f210499af1a6889785d49f8881672324afc755c1
Author: CaolÃ¡n McNamara 
Date:   Fri Mar 3 10:52:53 2017 +

remove unused patch

unused since...

commit 8dfe1a177eb437e751def99eea8bee08a7e49acc
Author: Christian Lohmaier 
Date:   Thu Jul 30 21:57:11 2015 +0200

fix firebird build on Win64

Change-Id: I8041e39bde3f03da71a5cd8b2edf4af3f887a6d5

diff --git a/external/firebird/firebird-vs2013.patch.1 
b/external/firebird/firebird-vs2013.patch.1
deleted file mode 100644
index b7f90d3..000
--- a/external/firebird/firebird-vs2013.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
 firebird/src/jrd/os/win32/mod_loader.cpp.orig   2015-06-05 
07:18:34.639613335 +0300
-+++ firebird/src/jrd/os/win32/mod_loader.cpp2015-06-05 07:41:08.383489041 
+0300
-@@ -97,6 +97,8 @@
- "msvcr100.dll",
- #elif _MSC_VER == 1700
- "msvcr110.dll",
-+#elif _MSC_VER == 1800
-+ "mscvr120.dll",
- #else
- #error Specify CRT DLL name here !
- #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2017-02-16 Thread Stephan Bergmann

 external/firebird/ExternalProject_firebird.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8ea07101c1613d213fd7cea17f094a947b14cd00
Author: Stephan Bergmann 
Date:   Thu Feb 16 14:25:15 2017 +0100

external/firebird: Work around operator new alignment violations

...causing problems at least when building with recent Clang trunk on
x86_64-unknown-linux-gnu:

> make[5]: Entering directory 'workdir/UnpackedTarball/firebird/gen'
> rm -f metadata.fdb
> core/workdir/UnpackedTarball/firebird/gen/Release/firebird/bin/isql -q -i 
workdir/UnpackedTarball/firebird/src/dbs/metadata.sql
> Makefile:325: recipe for target 'metadata.fdb' failed
> make[5]: *** [metadata.fdb] Segmentation fault (core dumped)

See the mail thread starting at


"[Firebird-devel] alloc.h global operator new replacement violating 
alignment
requirements".  With DEBUG_GDS_ALLOC defined, the allocation functions 
defined
in src/common/classes/alloc.h are no longer replacements of standard 
allocation
functions, so Clang happens to not make aggressive alignment assumptions, 
see
the mail thread starting at
 
"[cfe-dev]
operator new alignment assumptions".

(Instead of always defining DEBUG_GDS_ALLOC, I first tried to comment out 
the
definitions of global operator new/delete replacement functions in alloc.h,
falling back to the compiler-provided versions.  But many places in Firebird
allocate via Firebird-specific operator new placement overrides and 
deallocate
via delete expressions, which happens to work at runtime when the 
replaceable
operator delete is Firebird's, but not when it is the compiler-provided 
one.)

Change-Id: Ie02adb440fa959b723983d7f5b0246d3634dc06b

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index f76606d..762e94d 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -54,6 +54,8 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
" \
&& export CXXFLAGS=" \
$(if $(filter MSC,$(COM)),$(if 
$(MSVC_USE_DEBUG_RUNTIME),-DMSVC_USE_DEBUG_RUNTIME)) \
+   $(if $(filter 
LINUX/X86_64/TRUE,$(OS)/$(CPUNAME)/$(COM_IS_CLANG)), \
+   -DDEBUG_GDS_ALLOC) \
$(if 
$(HAVE_GCC_FNO_SIZED_DEALLOCATION),-fno-sized-deallocation 
-fno-delete-null-pointer-checks) \
$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \
$(BOOST_CPPFLAGS) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2017-02-15 Thread David Ostrovsky

 external/firebird/UnpackedTarball_firebird.mk |1 +
 external/firebird/firebird-vs2017.patch.1 |   12 
 2 files changed, 13 insertions(+)

New commits:
commit 3e1e49561bb734475d2b7d1db1beef0d3e9b53cd
Author: David Ostrovsky 
Date:   Wed Feb 15 22:31:00 2017 +0100

Fix firebird MSVC 15.0 detection

Change-Id: I9721632c68e6428b03b0368e7802c6eb4f5eb0a2
Reviewed-on: https://gerrit.libreoffice.org/34323
Tested-by: Jenkins 
Reviewed-by: David Ostrovsky 

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 3cd7a42..29395c0 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 ifeq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-cygwin-msvc.patch \
+   external/firebird/firebird-vs2017.patch.1 \
 ))
 endif
 
diff --git a/external/firebird/firebird-vs2017.patch.1 
b/external/firebird/firebird-vs2017.patch.1
new file mode 100644
index 000..ba747b3
--- /dev/null
+++ b/external/firebird/firebird-vs2017.patch.1
@@ -0,0 +1,12 @@
+diff -ru firebird.orig/src/common/os/win32/mod_loader.cpp 
firebird/src/common/os/win32/mod_loader.cpp
+--- firebird.orig/src/common/os/win32/mod_loader.cpp   2017-02-15 
22:11:48.939042400 +0100
 firebird/src/common/os/win32/mod_loader.cpp2017-02-15 
22:12:30.062262700 +0100
+@@ -103,6 +103,8 @@
+   "msvcr120.dll",
+ #elif _MSC_VER == 1900
+   "vcruntime140.dll",
++#elif _MSC_VER == 1910
++  "vcruntime140.dll",
+ #else
+ #error Specify CRT DLL name here !
+ #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2017-01-17 Thread Stephan Bergmann

 external/firebird/UnpackedTarball_firebird.mk |1 -
 external/firebird/debug-gfix-failure.patch|   22 --
 external/firebird/macosx-elcapitan-dyld.patch |6 +++---
 3 files changed, 3 insertions(+), 26 deletions(-)

New commits:
commit c8bdf901efd034f24bacf5e2d617a00bb1692238
Author: Stephan Bergmann 
Date:   Tue Jan 17 18:13:19 2017 +0100

Revert "external/firebird: Try track down "Couldn't turn forced writes off" 
failure"

This reverts commit 128e7ce3ffa50b11b2d5ff9777a27b095a84e5d7 (plus
40b44f7eb25114e5e4e19e571b8781580a938ca6 "Remove line again that was 
committed
in error" follow-up), now that the cause is found and addressed with
592f4f6a5941e42e6b2b3fa76e74b8ad509724c9 "external/firebird: Backport fix 
for
CORE-5452 causing spurious SEGV".

Change-Id: I84ddc90707693c2577ad0cd913e987bc9e173e34
Reviewed-on: https://gerrit.libreoffice.org/33229
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index d62bad7..e30048d 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-cloop-compiler.patch.1 \
external/firebird/firebird-gcc6.patch.1 \
external/firebird/wnt-dbgutil.patch \
-   external/firebird/debug-gfix-failure.patch \
external/firebird/libc++.patch \

external/firebird/0001-Avoid-hangup-in-SS-when-error-happens-at-system-atta.patch.1
 \

external/firebird/0002-Backported-fix-for-CORE-5452-Segfault-when-engine-s-.patch.1
 \
diff --git a/external/firebird/debug-gfix-failure.patch 
b/external/firebird/debug-gfix-failure.patch
deleted file mode 100644
index 8b0c121..000
--- a/external/firebird/debug-gfix-failure.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 examples/empbuild/empbuild.e
-+++ examples/empbuild/empbuild.e
-@@ -65,6 +65,7 @@
-  *
-  **/
- TEXT  cmd [140];
-+int status;
- 
- if (argc > 1)
- strcpy (Db_name, argv[1]);
-@@ -95,9 +96,9 @@
- 
- printf ("Turning forced writes off\n");
- sprintf (cmd, "gfix -write async %s", Db_name);
--if (system (cmd))
-+if ((status = system (cmd)))
- {
--printf ("Couldn't turn forced writes off\n");
-+printf ("Couldn't turn forced writes off (%d)\n", status);
- exit (FINI_ERROR);
- }
- 
diff --git a/external/firebird/macosx-elcapitan-dyld.patch 
b/external/firebird/macosx-elcapitan-dyld.patch
index d8c0b2b..134cdd9 100644
--- a/external/firebird/macosx-elcapitan-dyld.patch
+++ b/external/firebird/macosx-elcapitan-dyld.patch
@@ -6,9 +6,9 @@
   **/
 -TEXT  cmd [140];
 +TEXT  cmd [8000];
- int status;
  
  if (argc > 1)
+ strcpy (Db_name, argv[1]);
 @@ -94,7 +94,9 @@
  }
  
@@ -17,9 +17,9 @@
 +if (!lp) lp = "";
 -sprintf (cmd, "gfix -write async %s", Db_name);
 +sprintf (cmd, "DYLD_LIBRARY_PATH=%s gfix -write async %s", lp, Db_name);
- if ((status = system (cmd)))
+ if (system (cmd))
  {
- printf ("Couldn't turn forced writes off (%d)\n", status);
+ printf ("Couldn't turn forced writes off\n");
 @@ -104,7 +106,7 @@
  }
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-11-21 Thread Lionel Elie Mamane

 external/firebird/ExternalProject_firebird.mk |1 +
 external/firebird/firebird-macosx.patch.1 |8 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 6040dfb5ecf9945ba9c47a87a92506ad8bc88f0b
Author: Lionel Elie Mamane 
Date:   Tue Nov 22 08:55:38 2016 +0100

tdf#101789 work around DYLD_LIBRARY_PATH limitations on newer MacOS X

Change-Id: I6e3cbff1ec7a75e896ba5bafb9d1fbccc3bc8909

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 3467cc0..f76606d 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -73,6 +73,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
) \
" \
+   && export LIBREOFFICE_ICU_LIB="$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib" \
&& MAKE=$(MAKE) ./configure \
--without-editline \
--with-wire-compress=no \
diff --git a/external/firebird/firebird-macosx.patch.1 
b/external/firebird/firebird-macosx.patch.1
index b9a685b..8961c42 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -110,11 +110,15 @@
  #elif defined(HPUX)
  const char* const inTemplate = "libicui18n.sl.%s";
  const char* const ucTemplate = "libicuuc.sl.%s";
-@@ -353,6 +353,12 @@
+@@ -353,6 +353,16 @@
s.printf("%d%d", majorVersion, minorVersion);
  
filename.printf(templateName, s.c_str());
-+  const char * const envpath = getenv("LIBREOFFICE_FIREBIRD_LIB");
++  const char * envpath = getenv("LIBREOFFICE_FIREBIRD_LIB");
++  if(envpath == nullptr)
++  {
++  envpath = getenv("LIBREOFFICE_ICU_LIB");
++  }
 +  if(envpath != nullptr)
 +  {
 +  s = filename.c_str();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird RepositoryExternal.mk

2016-10-17 Thread Stephan Bergmann

 RepositoryExternal.mk |6 +++---
 external/firebird/ExternalPackage_firebird.mk |   16 
 external/firebird/ExternalProject_firebird.mk |9 -
 3 files changed, 15 insertions(+), 16 deletions(-)

New commits:
commit 416c552066e3a7a27430753967b3b9fe8104063f
Author: Stephan Bergmann 
Date:   Mon Oct 17 08:39:09 2016 +0200

external/firebird doesn't know --enable-debug, but make target "Debug"

* There's an --enable-developer configure option, but it probably does more 
than
  just default to the "Debug" target, things we potentially don't want here.

* Disabling --enable-debug for MSC was apparently a leftover from firebird 2
  times, f58f10fc89e19d182b5a415bb69af5ecc7de080a "firebird: --enable-debug
  breaks the build with MSVC".

Change-Id: Id9f7b6aa0cdfcea0b07f94814a8dab43488879bb

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 95241ab..5365f6d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2953,16 +2953,16 @@ else # !SYSTEM_FIREBIRD
 define gb_LinkTarget__use_libfbembed
 $(call gb_LinkTarget_use_package,$(1),firebird)
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(call 
gb_UnpackedTarball_get_dir,firebird)/gen/Release/firebird/include \
+   -I$(call gb_UnpackedTarball_get_dir,firebird)/gen/$(if 
$(ENABLE_DEBUG),Debug,Release)/firebird/include \
$$(INCLUDE) \
 )
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,firebird)/gen/Release/firebird/bin/ifbclient.lib \
+   $(call gb_UnpackedTarball_get_dir,firebird)/gen/$(if 
$(ENABLE_DEBUG),Debug,Release)/firebird/bin/ifbclient.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,firebird)/gen/Release/firebird/lib 
-lfbclient \
+   -L$(call gb_UnpackedTarball_get_dir,firebird)/gen/$(if 
$(ENABLE_DEBUG),Debug,Release)/firebird/lib -lfbclient \
 )
 endif
 
diff --git a/external/firebird/ExternalPackage_firebird.mk 
b/external/firebird/ExternalPackage_firebird.mk
index 1e8752d..6505eda 100644
--- a/external/firebird/ExternalPackage_firebird.mk
+++ b/external/firebird/ExternalPackage_firebird.mk
@@ -12,17 +12,17 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,firebird,firebird))
 $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/ifbclient.dll,gen/Release/firebird/bin/ifbclient.dll))
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/Engine12.dll,gen/Release/firebird/plugins/Engine12.dll))
+$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/ifbclient.dll,gen/$(if 
$(ENABLE_DEBUG),Debug,Release)/firebird/bin/ifbclient.dll))
+$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/Engine12.dll,gen/$(if 
$(ENABLE_DEBUG),Debug,Release)/firebird/plugins/Engine12.dll))
 else ifeq ($(OS),MACOSX)
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.dylib.3.0.0,gen/Release/firebird/lib/libfbclient.dylib.3.0.0))
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libEngine12.dylib,gen/Release/firebird/plugins/libEngine12.dylib))
+$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.dylib.3.0.0,gen/$(if
 $(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.dylib.3.0.0))
+$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libEngine12.dylib,gen/$(if
 $(ENABLE_DEBUG),Debug,Release)/firebird/plugins/libEngine12.dylib))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.so.2,gen/Release/firebird/lib/libfbclient.so.3.0.0))
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libEngine12.so,gen/Release/firebird/plugins/libEngine12.so))
+$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.so.2,gen/$(if
 $(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.so.3.0.0))
+$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libEngine12.so,gen/$(if 
$(ENABLE_DEBUG),Debug,Release)/firebird/plugins/libEngine12.so))
 endif
 
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/firebird.msg,gen/Release/firebird/firebird.msg))
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/security3.fdb,gen/Release/firebird/security3.fdb))
+$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/firebird.msg,gen/$(if
 $(ENABLE_DEBUG),Debug,Release)/firebird/firebird.msg))
+$(eval $(call 
gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/security3.fdb,gen/$(if
 $(ENABLE_DEBUG),Debug,Release)/firebird/security3.fdb))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/firebird/ExternalProject_firebird.mk

[Libreoffice-commits] core.git: external/firebird

2016-10-05 Thread Stephan Bergmann

 external/firebird/UnpackedTarball_firebird.mk |1 +
 external/firebird/libc++.patch|   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 183b2ff719364a17f1f21d7ba445e12c55d94871
Author: Stephan Bergmann 
Date:   Wed Oct 5 20:38:08 2016 +0200

external/firebird: Fix isinf-check for libc++

...which, at least since version 3.9, defines isinf only as a function, not 
as a
macro, in math.h

Change-Id: I7939d5bebe4b55ac7bd36bb321ad0020352a0e7b

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 0e9277a..b65d041 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-gcc6.patch.1 \
external/firebird/wnt-dbgutil.patch \
external/firebird/debug-gfix-failure.patch \
+   external/firebird/libc++.patch \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/libc++.patch b/external/firebird/libc++.patch
new file mode 100644
index 000..270c077
--- /dev/null
+++ b/external/firebird/libc++.patch
@@ -0,0 +1,11 @@
+--- src/common/classes/FpeControl.h
 src/common/classes/FpeControl.h
+@@ -222,7 +222,7 @@
+ {
+   return (!_finite (x) && !isnan(x));
+ }
+-#else
++#elif !defined _LIBCPP_VERSION || _LIBCPP_VERSION < 3900
+ #ifndef isinf
+ template 
+ inline bool isinf(F x)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-09-23 Thread Stephan Bergmann

 external/firebird/ExternalProject_firebird.mk |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 3ed5847c3e9a6dfee5bb5b7f228822fc1431a54c
Author: Stephan Bergmann 
Date:   Fri Sep 23 10:58:54 2016 +0200

external/firebird: Use gb_Helper_extend_ld_path to add icu dir

Change-Id: If51813fc559a78a54ae5dcae4b8b9213c5e1bae6
Reviewed-on: https://gerrit.libreoffice.org/29215
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 09c4463..c943053 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -26,9 +26,7 @@ ifneq ($(OS),WNT)
 INVOKE_FPA:="CPU=\$$(EMPTY) $${FB_CPU_ARG}"
 endif
 
-MAKE_PRE=$(if $(filter WNT,$(OS)),\
-  PATH="$(shell cygpath -u $(call 
gb_UnpackedTarball_get_dir,icu)/source/lib):$$PATH",\
-  $(gb_Helper_set_ld_path))
+MAKE_PRE=$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib)
 
 MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl 
OOO \
@@ -75,7 +73,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
) \
" \
-   && export 
$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(call
 gb_UnpackedTarball_get_dir,icu)/source/lib" \
&& MAKE=$(MAKE) ./configure \
--without-editline \
--with-wire-compress=no \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-09-14 Thread Stephan Bergmann

 external/firebird/ExternalProject_firebird.mk |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 15f92676f74d58b0af8578d6c45d0faa3de19164
Author: Stephan Bergmann 
Date:   Wed Sep 14 16:18:49 2016 +0200

external/firebird: Hack around detection of clock_gettime on Mac OS X

...where the 10.12 SDK includes clock_gettime, marked as

  __attribute__((availability(macosx,introduced=10.12)))

in time.h.  However, the way firebird's configure checks for it, it gets
detected as available regardless of the used -mmacosx-version-min value (and
even if the configure check would go via the time.h header, the availability
attribute would only cause a -Wpartial-availability warning, not an error, 
so
we'd need to pass CFLAGS=-Werror=partial-availability into firebird's
configure.)

Change-Id: I67e12743e1df0574e7fc4b2121add9fe1fb7677b

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 2fe2e8bc..09c4463 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -86,6 +86,11 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
, \
--enable-shared --disable-static \
) \
+   $(if $(filter MACOSX,$(OS)), \
+   $(if $(filter 1, \
+   $(shell expr 
'$(MAC_OS_X_VERSION_MIN_REQUIRED)' \
+   '<' 101200)), \
+   ac_cv_func_clock_gettime=no)) \
&& if [ -n "$${FB_CPU_ARG}" ]; then \
   $(MAKE_PRE) $(MAKE) $(INVOKE_FPA) SHELL='$(SHELL)' 
$(MAKE_POST); \
else \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-25 Thread Stephan Bergmann

 external/firebird/UnpackedTarball_firebird.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 40b44f7eb25114e5e4e19e571b8781580a938ca6
Author: Stephan Bergmann 
Date:   Thu Aug 25 10:00:20 2016 +0200

Remove line again that was committed in error

Change-Id: I66c140a72bbbafe0227d2265ae9c4da73a39e0fa

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index b746f1b..0e9277a 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-gcc6.patch.1 \
external/firebird/wnt-dbgutil.patch \
external/firebird/debug-gfix-failure.patch \
-   external/firebird/macosx-elcapitan-dyld.patch \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-25 Thread Stephan Bergmann

 external/firebird/UnpackedTarball_firebird.mk |2 ++
 external/firebird/debug-gfix-failure.patch|   22 ++
 external/firebird/macosx-elcapitan-dyld.patch |6 +++---
 3 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit 128e7ce3ffa50b11b2d5ff9777a27b095a84e5d7
Author: Stephan Bergmann 
Date:   Thu Aug 25 09:43:10 2016 +0200

external/firebird: Try track down "Couldn't turn forced writes off" failure

...that is sporadically observed on tinderboxes.  (Can be reverted once the
cause is found.)

Change-Id: I74135b3159fe686b7d7da33da569bde6c73b89e2

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 861b212..b746f1b 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -20,6 +20,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-cloop-compiler.patch.1 \
external/firebird/firebird-gcc6.patch.1 \
external/firebird/wnt-dbgutil.patch \
+   external/firebird/debug-gfix-failure.patch \
+   external/firebird/macosx-elcapitan-dyld.patch \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/debug-gfix-failure.patch 
b/external/firebird/debug-gfix-failure.patch
new file mode 100644
index 000..8b0c121
--- /dev/null
+++ b/external/firebird/debug-gfix-failure.patch
@@ -0,0 +1,22 @@
+--- examples/empbuild/empbuild.e
 examples/empbuild/empbuild.e
+@@ -65,6 +65,7 @@
+  *
+  **/
+ TEXT  cmd [140];
++int status;
+ 
+ if (argc > 1)
+ strcpy (Db_name, argv[1]);
+@@ -95,9 +96,9 @@
+ 
+ printf ("Turning forced writes off\n");
+ sprintf (cmd, "gfix -write async %s", Db_name);
+-if (system (cmd))
++if ((status = system (cmd)))
+ {
+-printf ("Couldn't turn forced writes off\n");
++printf ("Couldn't turn forced writes off (%d)\n", status);
+ exit (FINI_ERROR);
+ }
+ 
diff --git a/external/firebird/macosx-elcapitan-dyld.patch 
b/external/firebird/macosx-elcapitan-dyld.patch
index 134cdd9..d8c0b2b 100644
--- a/external/firebird/macosx-elcapitan-dyld.patch
+++ b/external/firebird/macosx-elcapitan-dyld.patch
@@ -6,9 +6,9 @@
   **/
 -TEXT  cmd [140];
 +TEXT  cmd [8000];
+ int status;
  
  if (argc > 1)
- strcpy (Db_name, argv[1]);
 @@ -94,7 +94,9 @@
  }
  
@@ -17,9 +17,9 @@
 +if (!lp) lp = "";
 -sprintf (cmd, "gfix -write async %s", Db_name);
 +sprintf (cmd, "DYLD_LIBRARY_PATH=%s gfix -write async %s", lp, Db_name);
- if (system (cmd))
+ if ((status = system (cmd)))
  {
- printf ("Couldn't turn forced writes off\n");
+ printf ("Couldn't turn forced writes off (%d)\n", status);
 @@ -104,7 +106,7 @@
  }
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-19 Thread Stephan Bergmann

 external/firebird/UnpackedTarball_firebird.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 3f8b89e2b0c598c1a8a6e09b0b7d3cc1dc3133a6
Author: Stephan Bergmann 
Date:   Fri Aug 19 15:04:51 2016 +0200

Undo inadvertent add

Change-Id: I2c991387dae67ee1bb2fa97e94cd8f2fcca81a60

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 29ad0da..861b212 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-cloop-compiler.patch.1 \
external/firebird/firebird-gcc6.patch.1 \
external/firebird/wnt-dbgutil.patch \
-   external/firebird/libc++.patch \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-19 Thread Stephan Bergmann

 external/firebird/UnpackedTarball_firebird.mk |1 +
 external/firebird/firebird-macosx.patch.1 |6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e73dc86924ad33a1522c7e4a284a66dabf54c160
Author: Stephan Bergmann 
Date:   Fri Aug 19 15:02:52 2016 +0200

Why not just drop that $(HOME)/icu54/icu/source/lib nonsense

Change-Id: I2fed34ae680eb0bc01de90a7ef525cf8446cd940

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 861b212..29ad0da 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-cloop-compiler.patch.1 \
external/firebird/firebird-gcc6.patch.1 \
external/firebird/wnt-dbgutil.patch \
+   external/firebird/libc++.patch \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/firebird-macosx.patch.1 
b/external/firebird/firebird-macosx.patch.1
index 75f86e2..b9a685b 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -11,15 +11,15 @@
  #ifdef WIN32
 --- firebird.org/builds/posix/prefix.darwin_x86_64 2016-08-01 
20:02:48.0 +0200
 +++ firebird/builds/posix/prefix.darwin_x86_64 2016-08-01 21:42:45.0 
+0200
-@@ -19,7 +19,7 @@
+@@ -19,8 +19,6 @@
  #
  # Default build from 10.7 using Clang
  
 -DYLD_LIBRARY_PATH=$(HOME)/icu54/icu/source/lib
-+DYLD_LIBRARY_PATH:=$(HOME)/icu54/icu/source/lib:$(DYLD_LIBRARY_PATH)
- export DYLD_LIBRARY_PATH
+-export DYLD_LIBRARY_PATH
  
  #DYLD_PRINT_ENV=1
+ #export DYLD_PRINT_ENV
 @@ -31,15 +31,15 @@
  MACOSX_DEPLOYMENT_TARGET=10.7
  export MACOSX_DEPLOYMENT_TARGET
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-19 Thread Stephan Bergmann

 external/firebird/UnpackedTarball_firebird.mk |1 
 external/firebird/macosx-elcapitan-dyld.patch |   35 --
 2 files changed, 28 insertions(+), 8 deletions(-)

New commits:
commit e1c16a523eeb612cd25191a9c2994d8eded64b72
Author: Stephan Bergmann 
Date:   Fri Aug 19 15:02:05 2016 +0200

Revive external/firebird/macosx-elcapitan-dyld.patch

Change-Id: I382080f89b59a6cc642c829377954b72dae44abe

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index ba62597..861b212 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -32,6 +32,7 @@ ifeq ($(OS),MACOSX)
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-configure-x86-64-macosx.patch.1 \
external/firebird/firebird-macosx.patch.1 \
+   external/firebird/macosx-elcapitan-dyld.patch \
 ))
 endif
 
diff --git a/external/firebird/macosx-elcapitan-dyld.patch 
b/external/firebird/macosx-elcapitan-dyld.patch
index b8c4c1c..134cdd9 100644
--- a/external/firebird/macosx-elcapitan-dyld.patch
+++ b/external/firebird/macosx-elcapitan-dyld.patch
@@ -9,31 +9,50 @@
  
  if (argc > 1)
  strcpy (Db_name, argv[1]);
-@@ -94,21 +94,23 @@
+@@ -94,7 +94,9 @@
  }
  
- printf ("Creating tables\n");
+ printf ("Turning forced writes off\n");
 +char const * lp = getenv("DYLD_LIBRARY_PATH");
 +if (!lp) lp = "";
+-sprintf (cmd, "gfix -write async %s", Db_name);
++sprintf (cmd, "DYLD_LIBRARY_PATH=%s gfix -write async %s", lp, Db_name);
+ if (system (cmd))
+ {
+ printf ("Couldn't turn forced writes off\n");
+@@ -104,7 +106,7 @@
+ }
+ 
+ printf ("Creating tables\n");
 -sprintf (cmd, "isql %s -q -i empddl.sql", Db_name);
 +sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -q -i empddl.sql", lp, Db_name);
  if (system (cmd))
  {
  printf ("Couldn't create tables \n");
- exit (FINI_ERROR);
+@@ -120,7 +122,7 @@
  }
  
  printf ("Turning  off indices and triggers \n");
 -sprintf (cmd, "isql %s -i indexoff.sql", Db_name);
 +sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -i indexoff.sql", lp, Db_name);
- system (cmd);
+ if (system (cmd))
+ {
+ printf ("Couldn't turn off indices and triggers \n");
+@@ -128,7 +130,7 @@
+ }
+
  printf ("Loading  column data\n");
 -sprintf (cmd, "isql %s -i empdml.sql", Db_name);
 +sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -i empdml.sql", lp, Db_name);
- system (cmd);
+ if (system (cmd))
+ {
+ printf ("Couldn't load column data \n");
+@@ -136,7 +138,7 @@
+ }
+ 
  printf ("Turning  on indices and triggers \n");
 -sprintf (cmd, "isql %s -i indexon.sql", Db_name);
 +sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -i indexon.sql", lp, Db_name);
- system (cmd);
- 
- EXEC SQL CONNECT DB;
+ if (system (cmd))
+ {
+ printf ("Couldn't turn on indices and triggers \n");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-19 Thread Stephan Bergmann

 external/firebird/ExternalProject_firebird.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit af9800b7bf6d19b15fff9ef9c50b4b696f7dc3b9
Author: Stephan Bergmann 
Date:   Fri Aug 19 15:00:25 2016 +0200

Excess separator

Change-Id: If86dc074ab1617837fbf771bb33e93ec1dc6ea2b

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 2803f69..2fe2e8bc 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -75,7 +75,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
) \
" \
-   && export 
$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}":$(call
 gb_UnpackedTarball_get_dir,icu)/source/lib" \
+   && export 
$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(call
 gb_UnpackedTarball_get_dir,icu)/source/lib" \
&& MAKE=$(MAKE) ./configure \
--without-editline \
--with-wire-compress=no \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-19 Thread Stephan Bergmann

 external/firebird/ExternalProject_firebird.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 514c88a33bcbe5deae00a6b9e17a89b0044a8d2a
Author: Stephan Bergmann 
Date:   Thu Aug 18 15:59:46 2016 +0200

external/firebird: --with-fbsample[-db] is apparently about specifying dirs

...not about specifying whether to build the examples at all (which would be
useful for us, but for which there seems to be no switch).

Change-Id: I511b2228a6e5e2df7e0ecb83135ad27945bb04b6
Reviewed-on: https://gerrit.libreoffice.org/28221
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index d9de091..2803f69 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -78,7 +78,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
&& export 
$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}":$(call
 gb_UnpackedTarball_get_dir,icu)/source/lib" \
&& MAKE=$(MAKE) ./configure \
--without-editline \
-   --without-fbsample --without-fbsample-db \
--with-wire-compress=no \
$(if $(filter-out MSC,$(COM)),$(if 
$(ENABLE_DEBUG),--enable-debug)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-18 Thread Stephan Bergmann

 external/firebird/ExternalProject_firebird.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3323937085939952aaf0a98147d231dfdfb85321
Author: Stephan Bergmann 
Date:   Thu Aug 18 15:12:18 2016 +0200

Missing &&

Change-Id: Ib7471e8050b2fb7e97bd90797d3839dca80b9689

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index f3e6c9c..d9de091 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -75,7 +75,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
) \
" \
-   export 
$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}":$(call
 gb_UnpackedTarball_get_dir,icu)/source/lib" \
+   && export 
$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}":$(call
 gb_UnpackedTarball_get_dir,icu)/source/lib" \
&& MAKE=$(MAKE) ./configure \
--without-editline \
--without-fbsample --without-fbsample-db \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-18 Thread Caolán McNamara

 external/firebird/ExternalProject_firebird.mk |1 
 external/firebird/UnpackedTarball_firebird.mk |1 
 external/firebird/wnt-dbgutil.patch   |   63 ++
 3 files changed, 65 insertions(+)

New commits:
commit 052e3ebbf7aab404dd6db9960f2e9374aefa9a1b
Author: CaolÃ¡n McNamara 
Date:   Thu Aug 18 10:15:52 2016 +0100

skip checking for icuuc lib

cause its called icuucd under debug windows

and change the runtime load to try icuucd if MSVC_USE_DEBUG_RUNTIME
was in use at compile time

Change-Id: I10fbe4890a24364a45ae5993ad7e8079ac3fd182
Reviewed-on: https://gerrit.libreoffice.org/28210
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index c6fc7d4..b30fe92 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -55,6 +55,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
) \
" \
&& export CXXFLAGS=" \
+   $(if $(filter MSC,$(COM)),$(if 
$(MSVC_USE_DEBUG_RUNTIME),-DMSVC_USE_DEBUG_RUNTIME)) \
$(if $(shell test '$(GCC_VERSION)' -ge 600 && echo 
yes),-fno-sized-deallocation -fno-delete-null-pointer-checks,) \
$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \
$(BOOST_CPPFLAGS) \
diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index f015a91..ba62597 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-rpath.patch.0 \
external/firebird/firebird-cloop-compiler.patch.1 \
external/firebird/firebird-gcc6.patch.1 \
+   external/firebird/wnt-dbgutil.patch \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/wnt-dbgutil.patch 
b/external/firebird/wnt-dbgutil.patch
new file mode 100644
index 000..db859b6
--- /dev/null
+++ b/external/firebird/wnt-dbgutil.patch
@@ -0,0 +1,63 @@
+--- configure
 configure
+@@ -18402,44 +18402,6 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -licuuc" >&5
+-$as_echo_n "checking for main in -licuuc... " >&6; }
+-if ${ac_cv_lib_icuuc_main+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-licuuc  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-
+-int
+-main ()
+-{
+-return main ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_icuuc_main=yes
+-else
+-  ac_cv_lib_icuuc_main=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_main" >&5
+-$as_echo "$ac_cv_lib_icuuc_main" >&6; }
+-if test "x$ac_cv_lib_icuuc_main" = xyes; then :
+-  ICU_OK=yes
+-else
+-  as_fn_error $? "ICU support not found - please install development ICU 
package" "$LINENO" 5
+-fi
+-
+-
+-
+ pre_save_restore_cflags=$CFLAGS
+ pre_save_restore_cxxflags=$CXXFLAGS
+ pre_save_restore_libs=$LIBS
+--- src/common/unicode_util.cpp
 src/common/unicode_util.cpp
+@@ -58,8 +58,13 @@
+ 
+ namespace {
+ #if defined(WIN_NT)
++#if defined(MSVC_USE_DEBUG_RUNTIME)
++const char* const inTemplate = "icuind%s.dll";
++const char* const ucTemplate = "icuucd%s.dll";
++#else
+ const char* const inTemplate = "icuin%s.dll";
+ const char* const ucTemplate = "icuuc%s.dll";
++#endif
+ #elif defined(DARWIN)
+ //const char* const inTemplate = 
"/Library/Frameworks/Firebird.framework/Versions/A/Libraries/libicui18n.dylib";
+ //const char* const ucTemplate = 
"/Library/Frameworks/Firebird.framework/versions/A/Libraries/libicuuc.dylib";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-18 Thread Caolán McNamara

 external/firebird/ExternalProject_firebird.mk |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 6f069cc1b7b566886d47c65d2e70580eb15fafd8
Author: CaolÃ¡n McNamara 
Date:   Wed Aug 17 16:32:12 2016 +0100

use preexisting helper to get DYLD_LIBRARY_PATH vs LD_LIBRARY_PATH

plus line noise to extend the existing variable with another
path if its already set

Change-Id: I3e16a0a79da5d6c8c83fbad9c8d65abd9b7e2ca3
Reviewed-on: https://gerrit.libreoffice.org/28196
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 6b3e689..c6fc7d4 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -74,12 +74,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
) \
" \
-   $(if $(filter MACOSX,$(OS)), \
-   && export DYLD_LIBRARY_PATH="$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib" \
-   )\
-   $(if $(filter-out WNT MACOSX IOS,$(OS)), \
-   && export LD_LIBRARY_PATH="$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib" \
-   )\
+   export 
$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}":$(call
 gb_UnpackedTarball_get_dir,icu)/source/lib" \
&& MAKE=$(MAKE) ./configure \
--without-editline \
--without-fbsample --without-fbsample-db \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-17 Thread Lionel Elie Mamane

 external/firebird/firebird-cygwin-msvc.patch |   31 +--
 1 file changed, 2 insertions(+), 29 deletions(-)

New commits:
commit 2a871f0f24de805d8d11ae75a896004a5e522b8e
Author: Lionel Elie Mamane 
Date:   Wed Aug 17 19:51:41 2016 +0200

firebird: fixup cloop on Windows

newly added patch was already essentially included in 
firebird-cygwin-msvc.patch

Change-Id: Ibb4d17ced8fd58dd46ff8ca54c8a0d9d0422345e

diff --git a/external/firebird/firebird-cygwin-msvc.patch 
b/external/firebird/firebird-cygwin-msvc.patch
index 10c1dfe..3e769c8 100644
--- a/external/firebird/firebird-cygwin-msvc.patch
+++ b/external/firebird/firebird-cygwin-msvc.patch
@@ -532,17 +532,7 @@ diff -ur extern/btyacc/Makefile extern/btyacc/Makefile
  #define DLL_EXPORT __declspec(dllexport)
 --- extern/cloop/Makefile  2016-07-07 15:56:28.279136300 +0200
 +++ extern/cloop/Makefile  2016-07-13 16:22:38.493479800 +0200
-@@ -4,15 +4,15 @@
- 
- TARGET:= release
- 
--CC:= gcc
--CXX   := g++
--LD:= $(CXX)
-+#CC   := gcc
-+#CXX  := g++
-+#LD   := $(CXX)
- 
+@@ -11,8 +11,8 @@
  SRC_DIR   := src
  BUILD_DIR := build
  OUT_DIR   := output
@@ -553,7 +543,7 @@ diff -ur extern/btyacc/Makefile extern/btyacc/Makefile
  
  OBJ_DIR := $(BUILD_DIR)/$(TARGET)
  BIN_DIR := $(OUT_DIR)/$(TARGET)/bin
-@@ -27,17 +27,17 @@
+@@ -27,7 +27,7 @@
  OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C))
  OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP))
  
@@ -562,23 +552,6 @@ diff -ur extern/btyacc/Makefile extern/btyacc/Makefile
  CXX_FLAGS := $(C_FLAGS)
  FPC_FLAGS := -Mdelphi
  
--ifeq ($(TARGET),release)
--  CXX_FLAGS += -O3
--endif
--
--ifeq ($(TARGET),debug)
--  FPC_FLAGS += -g
--endif
-+#ifeq ($(TARGET),release)
-+# CXX_FLAGS += -O3
-+#endif
-+
-+#ifeq ($(TARGET),debug)
-+# FPC_FLAGS += -g
-+#endif
- 
- vpath %.c $(SRC_DIRS)
- vpath %.cpp $(SRC_DIRS)
 @@ -53,7 +53,7 @@
  .PHONY: all mkdirs clean
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-17 Thread Lionel Elie Mamane

 external/firebird/ExternalProject_firebird.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 40bab0a345305ec271baa374cab20d55eeb2661d
Author: Lionel Elie Mamane 
Date:   Wed Aug 17 19:30:41 2016 +0200

firebird: gcc6 compatibility part 2

Change-Id: I78ef547f4996050bffe83ab7e0e6acd046264bf8

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 11a289b..6b3e689 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -55,6 +55,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
) \
" \
&& export CXXFLAGS=" \
+   $(if $(shell test '$(GCC_VERSION)' -ge 600 && echo 
yes),-fno-sized-deallocation -fno-delete-null-pointer-checks,) \
$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \
$(BOOST_CPPFLAGS) \
-L$(call 
gb_UnpackedTarball_get_dir,boost)/source/lib \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-17 Thread Lionel Elie Mamane

 external/firebird/UnpackedTarball_firebird.mk |1 +
 external/firebird/firebird-gcc6.patch.1   |   19 +++
 2 files changed, 20 insertions(+)

New commits:
commit 31b13ed9ef5c46e732208be17d7c90c3af89ed42
Author: Lionel Elie Mamane 
Date:   Wed Aug 17 19:21:14 2016 +0200

firebird: gcc6 compatibility part 1

Change-Id: I4fbb131a629275626510d5311550e8bf8cdef6d5

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 5715d0c..f015a91 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-Engine12.patch \
external/firebird/firebird-rpath.patch.0 \
external/firebird/firebird-cloop-compiler.patch.1 \
+   external/firebird/firebird-gcc6.patch.1 \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/firebird-gcc6.patch.1 
b/external/firebird/firebird-gcc6.patch.1
new file mode 100644
index 000..e136141
--- /dev/null
+++ b/external/firebird/firebird-gcc6.patch.1
@@ -0,0 +1,19 @@
+commit 3618aa2171674babf79ef935aa049c40a3db1321
+Author: asfernandes 
+Date:   Sat Mar 5 03:39:36 2016 +
+
+Make the generated code compatible with gcc 6 in C++-14 mode.
+
+diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp
+index 2af96c6..2dcffd6 100644
+--- a/src/gpre/c_cxx.cpp
 b/src/gpre/c_cxx.cpp
+@@ -2820,7 +2820,7 @@ static void gen_request(const gpre_req* request)
+   printa(0, "static %sshort\n   isc_%dl = %d;",
+  (request->req_flags & REQ_extend_dpb) ? "" : 
CONST_STR,
+  request->req_ident, request->req_length);
+-  printa(0, "static %schar\n   isc_%d [] = {", CONST_STR, 
request->req_ident);
++  printa(0, "static %sunsigned char\n   isc_%d [] = {", 
CONST_STR, request->req_ident);
+ 
+   const TEXT* string_type = "blr";
+   if (gpreGlob.sw_raw)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-17 Thread Lionel Elie Mamane

 external/firebird/UnpackedTarball_firebird.mk |1 +
 external/firebird/firebird-cloop-compiler.patch.1 |   12 
 2 files changed, 13 insertions(+)

New commits:
commit 5dad45d798eaaeaa4c6e480e4ce4cd06964e7a1f
Author: Lionel Elie Mamane 
Date:   Wed Aug 17 18:36:04 2016 +0200

firebird: have built-in cloop use same compiler as everyone else

Change-Id: I44cbbc82e34b9f4047a2fbebc3b959e3e148452a

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index eebe4d0..5715d0c 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 external/firebird/firebird.disable-ib-util-not-found.patch.1 \
external/firebird/firebird-Engine12.patch \
external/firebird/firebird-rpath.patch.0 \
+   external/firebird/firebird-cloop-compiler.patch.1 \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/firebird-cloop-compiler.patch.1 
b/external/firebird/firebird-cloop-compiler.patch.1
new file mode 100644
index 000..ac82bb0
--- /dev/null
+++ b/external/firebird/firebird-cloop-compiler.patch.1
@@ -0,0 +1,12 @@
+diff -ur firebird.org/extern/cloop/Makefile firebird/extern/cloop/Makefile
+--- firebird.org/extern/cloop/Makefile 2016-08-17 18:32:59.078044357 +0200
 firebird/extern/cloop/Makefile 2016-08-17 18:33:14.430518561 +0200
+@@ -4,8 +4,6 @@
+ 
+ TARGET:= release
+ 
+-CC:= gcc
+-CXX   := g++
+ LD:= $(CXX)
+ 
+ SRC_DIR   := src
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-17 Thread Lionel Elie Mamane

 external/firebird/ExternalProject_firebird.mk |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 64ccdbe5060986feda35d035012b1ed1016139a7
Author: Lionel Elie Mamane 
Date:   Wed Aug 17 17:25:49 2016 +0200

fixup firebird with internal icu: link time

Let us see whether firebird uses LDFLAGS on MacOSX now...

Change-Id: If1a2d1f11f1c17d8e4cc21f0bae87ec042333e8e

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 670041b..11a289b 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -35,7 +35,6 @@ MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \

$(gb_Package_SOURCEDIR_firebird)/gen/Release/firebird/plugins/libEngine12.dylib 
\

$(gb_Package_SOURCEDIR_firebird)/gen/Release/firebird/lib/libfbclient.dylib.3.0.0)
 
-# do not set LDFLAGS - it is mysteriously not used by firebird on MacOSX
 $(call gb_ExternalProject_get_state_target,firebird,build):
$(call gb_ExternalProject_run,build,\
unset MAKEFLAGS \
@@ -53,7 +52,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-I$(call gb_UnpackedTarball_get_dir,icu)/source 
\
-I$(call 
gb_UnpackedTarball_get_dir,icu)/source/i18n \
-I$(call 
gb_UnpackedTarball_get_dir,icu)/source/common \
-   -L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
) \
" \
&& export CXXFLAGS=" \
@@ -65,15 +63,22 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-I$(call gb_UnpackedTarball_get_dir,icu)/source 
\
-I$(call 
gb_UnpackedTarball_get_dir,icu)/source/i18n \
-I$(call 
gb_UnpackedTarball_get_dir,icu)/source/common \
-   -L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
) \
$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \
-L$(call gb_UnpackedTarball_get_dir,libtommath) 
\
) \
" \
+   && export LDFLAGS=" \
+   $(if $(SYSTEM_ICU),$(ICU_LIBS), \
+   -L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
+   ) \
+   " \
$(if $(filter MACOSX,$(OS)), \
&& export DYLD_LIBRARY_PATH="$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib" \
)\
+   $(if $(filter-out WNT MACOSX IOS,$(OS)), \
+   && export LD_LIBRARY_PATH="$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib" \
+   )\
&& MAKE=$(MAKE) ./configure \
--without-editline \
--without-fbsample --without-fbsample-db \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-08-17 Thread Lionel Elie Mamane

 external/firebird/ExternalProject_firebird.mk |   26 --
 1 file changed, 12 insertions(+), 14 deletions(-)

New commits:
commit ebe4259437254123697d6d62a4475f112efff31c
Author: Lionel Elie Mamane 
Date:   Wed Aug 17 16:54:03 2016 +0200

fixup firebird with internal icu

Change-Id: I38e44875234aa0c8382ab6e01b4f4c5cc16b834e

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 82de2d3..670041b 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -49,26 +49,24 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-I$(call gb_UnpackedTarball_get_dir,libtommath) 
\
-L$(call gb_UnpackedTarball_get_dir,libtommath) 
\
) \
-   $(if $(filter WNT MACOSX,$(OS)), \
-   $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \
-   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source \
-   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/i18n \
-   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/common \
-   -L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
-   )) \
+   $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \
+   -I$(call gb_UnpackedTarball_get_dir,icu)/source 
\
+   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/i18n \
+   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/common \
+   -L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
+   ) \
" \
&& export CXXFLAGS=" \
$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \
$(BOOST_CPPFLAGS) \
-L$(call 
gb_UnpackedTarball_get_dir,boost)/source/lib \
) \
-   $(if $(filter-out WNT MACOSX,$(OS)), \
-   $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \
-   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source \
-   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/i18n \
-   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/common \
-   -L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
-   )) \
+   $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \
+   -I$(call gb_UnpackedTarball_get_dir,icu)/source 
\
+   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/i18n \
+   -I$(call 
gb_UnpackedTarball_get_dir,icu)/source/common \
+   -L$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib \
+   ) \
$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \
-L$(call gb_UnpackedTarball_get_dir,libtommath) 
\
) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird external/glew external/glyphy external/openldap external/ucpp

2016-03-09 Thread Michael Stahl

 external/firebird/README |3 +++
 external/glew/README |6 ++
 external/glyphy/README   |3 +++
 external/openldap/README |3 +++
 external/ucpp/README |3 +++
 5 files changed, 18 insertions(+)

New commits:
commit 45bf6d0f87aba113e0f9d5002bc130c286d50f27
Author: Michael Stahl 
Date:   Wed Mar 9 14:05:49 2016 +0100

external: add some READMEs

Change-Id: If4ba9ff89d3fa1e092bc20abb72a9a0dbef5396a

diff --git a/external/firebird/README b/external/firebird/README
new file mode 100644
index 000..cc7c727
--- /dev/null
+++ b/external/firebird/README
@@ -0,0 +1,3 @@
+Firebird is an embeddable SQL RDBMS implemented in C++
+
+http://firebirdsql.org/
diff --git a/external/glew/README b/external/glew/README
new file mode 100644
index 000..34b2d24
--- /dev/null
+++ b/external/glew/README
@@ -0,0 +1,6 @@
+GLEW is the OpenGL Extension Wrangler
+
+GLEW provides efficient run-time mechanisms for determining which OpenGL
+extensions are supported on the target platform.
+
+http://glew.sourceforge.net/
diff --git a/external/glyphy/README b/external/glyphy/README
new file mode 100644
index 000..7d6445c
--- /dev/null
+++ b/external/glyphy/README
@@ -0,0 +1,3 @@
+GLyphy is a text renderer that uses OpenGL
+
+https://github.com/behdad/glyphy
diff --git a/external/openldap/README b/external/openldap/README
new file mode 100644
index 000..0c1828c1
--- /dev/null
+++ b/external/openldap/README
@@ -0,0 +1,3 @@
+OpenLDAP provides an LDAP client library
+
+http://www.openldap.org/
diff --git a/external/ucpp/README b/external/ucpp/README
new file mode 100644
index 000..9246c70
--- /dev/null
+++ b/external/ucpp/README
@@ -0,0 +1,3 @@
+ucpp is a C99 preprocessor
+
+Used to be hosted at https://code.google.com/p/ucpp/ - not sure where it's gone
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-02-28 Thread Caolán McNamara

 external/firebird/firebird-c++14.patch |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 5ab4233169de4af33edfccd3c287436b58157414
Author: CaolÃ¡n McNamara 
Date:   Sat Feb 27 20:50:42 2016 +

make firebird build on gcc 6 again

Change-Id: Ie9bf5003dd5ed2698c2bde58fd6767f3852adeae
Reviewed-on: https://gerrit.libreoffice.org/22738
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/external/firebird/firebird-c++14.patch 
b/external/firebird/firebird-c++14.patch
index ad095bf..d978cef 100644
--- a/external/firebird/firebird-c++14.patch
+++ b/external/firebird/firebird-c++14.patch
@@ -12,3 +12,19 @@
 +{
 +  Firebird::MemoryPool::globalFree(mem);
 +}
+--- src/common/classes/alloc.h
 src/common/classes/alloc.h
+@@ -491,13 +491,6 @@
+ 
+ inline static MemoryPool* getDefaultMemoryPool() { return 
Firebird::MemoryPool::processMemoryPool; }
+ 
+-// Global versions of operators new and delete
+-void* operator new(size_t s) THROW_BAD_ALLOC;
+-void* operator new[](size_t s) THROW_BAD_ALLOC;
+-
+-void operator delete(void* mem) throw();
+-void operator delete[](void* mem) throw();
+-
+ #ifdef DEBUG_GDS_ALLOC
+ inline void* operator new(size_t s, Firebird::MemoryPool& pool, const char* 
file, int line)
+ {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-02-03 Thread Lionel Elie Mamane

 external/firebird/ExternalProject_firebird.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 91a7580e03d5b47c6e2513afce85ddee45e730b6
Author: Lionel Elie Mamane 
Date:   Thu Feb 4 00:23:33 2016 +0100

apparently breaks Win-x86@42 tinderbox... disable on Windows.

Note it works well on the Windows Jenkins build check. Go figure.

Change-Id: I05990274d85b1044a94ec7371130bf918f8fd09e

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 0e80811..6aa992f 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -24,11 +24,15 @@ $(eval $(call gb_ExternalProject_register_targets,firebird,\
 # note: this can intentionally only build against internal atomic_op
 # note: this can intentionally only build against internal tommath
 
+ifneq ($(OS),WNT)
+SET_FCA=&& FB_CPU_ARG='$(filter --jobserver-fds=%,$(MAKEFLAGS))'
+endif
+
 # do not set LDFLAGS - it is mysteriously not used by firebird on MacOSX
 $(call gb_ExternalProject_get_state_target,firebird,build):
$(call gb_ExternalProject_run,build,\
unset MAKEFLAGS \
-   && FB_CPU_ARG='$(filter --jobserver-fds=%,$(MAKEFLAGS))' \
+   $(SET_FCA) \
&& if [ -n "$${FB_CPU_ARG}" ]; then \
  FB_PRLL_ARG="CPU=\$$(EMPTY) $${FB_CPU_ARG}"; \
else \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-02-03 Thread Lionel Elie Mamane

 external/firebird/ExternalProject_firebird.mk |   29 +-
 1 file changed, 15 insertions(+), 14 deletions(-)

New commits:
commit 198f20238330e60172f67e9c6a21aeefc50136c4
Author: Lionel Elie Mamane 
Date:   Thu Feb 4 01:21:09 2016 +0100

firebird: avoid using ignored -m option to make

Change-Id: Ic24c295a84f402ec5478bafbdebc54f976b1a72c
Reviewed-on: https://gerrit.libreoffice.org/22092
Tested-by: Jenkins 
Reviewed-by: Lionel Elie Mamane 

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 6aa992f..cd89dfb 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -25,19 +25,22 @@ $(eval $(call gb_ExternalProject_register_targets,firebird,\
 # note: this can intentionally only build against internal tommath
 
 ifneq ($(OS),WNT)
-SET_FCA=&& FB_CPU_ARG='$(filter --jobserver-fds=%,$(MAKEFLAGS))'
+INVOKE_FPA:="CPU=\$$(EMPTY) $${FB_CPU_ARG}"
 endif
 
+MAKE_PRE=$(if $(filter WNT,$(OS)),\
+  PATH="$(shell cygpath -u $(call 
gb_UnpackedTarball_get_dir,icu)/source/lib):$$PATH",\
+  $(gb_Helper_set_ld_path))
+
+MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \
+   $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl 
OOO \
+   
$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.5)
+
 # do not set LDFLAGS - it is mysteriously not used by firebird on MacOSX
 $(call gb_ExternalProject_get_state_target,firebird,build):
$(call gb_ExternalProject_run,build,\
unset MAKEFLAGS \
-   $(SET_FCA) \
-   && if [ -n "$${FB_CPU_ARG}" ]; then \
- FB_PRLL_ARG="CPU=\$$(EMPTY) $${FB_CPU_ARG}"; \
-   else \
- FB_PRLL_ARG="-m"; \
-   fi \
+   && FB_CPU_ARG='$(filter --jobserver-fds=%,$(MAKEFLAGS))' \
&& export PKG_CONFIG="" \
&& export CPPFLAGS=" \
$(if $(SYSTEM_LIBATOMIC_OPS),$(LIBATOMIC_OPS_CFLAGS), \
@@ -67,12 +70,10 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
, \
--enable-shared --disable-static \
) \
-   && $(if $(filter WNT,$(OS)),\
-  PATH="$(shell cygpath -u $(call 
gb_UnpackedTarball_get_dir,icu)/source/lib):$$PATH",\
-  $(gb_Helper_set_ld_path)) \
-  $(MAKE) "$${FB_PRLL_ARG}" SHELL='$(SHELL)' firebird_embedded 
\
-   $(if $(filter MACOSX,$(OS)),&& $(PERL) \
-   $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl 
OOO \
-   
$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.5) \
+   && if [ -n "$${FB_CPU_ARG}" ]; then \
+  $(MAKE_PRE) $(MAKE) $(INVOKE_FPA) SHELL='$(SHELL)' 
firebird_embedded $(MAKE_POST); \
+   else \
+  $(MAKE_PRE) $(MAKE) SHELL='$(SHELL)' 
firebird_embedded $(MAKE_POST); \
+   fi \
)
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-02-03 Thread Lionel Elie Mamane

 external/firebird/ExternalProject_firebird.mk |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 1487b9ddc80ff0e5449fc6e26f7529ed293eed89
Author: Lionel Elie Mamane 
Date:   Tue Feb 2 16:49:54 2016 +0100

better integrate parallelisation of firebird builds

Change-Id: If9bf9d2a36aa564700b032c417869a8cfac65f88

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 939b29d..0e80811 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -21,8 +21,6 @@ $(eval $(call gb_ExternalProject_register_targets,firebird,\
build \
 ))
 
-FB_PRLL_ARG:=$(shell if [ "0$(PARALLELISM)" -gt 0 ]; then echo 
"CPU=$(PARALLELISM)"; fi)
-
 # note: this can intentionally only build against internal atomic_op
 # note: this can intentionally only build against internal tommath
 
@@ -30,6 +28,12 @@ FB_PRLL_ARG:=$(shell if [ "0$(PARALLELISM)" -gt 0 ]; then 
echo "CPU=$(PARALLELIS
 $(call gb_ExternalProject_get_state_target,firebird,build):
$(call gb_ExternalProject_run,build,\
unset MAKEFLAGS \
+   && FB_CPU_ARG='$(filter --jobserver-fds=%,$(MAKEFLAGS))' \
+   && if [ -n "$${FB_CPU_ARG}" ]; then \
+ FB_PRLL_ARG="CPU=\$$(EMPTY) $${FB_CPU_ARG}"; \
+   else \
+ FB_PRLL_ARG="-m"; \
+   fi \
&& export PKG_CONFIG="" \
&& export CPPFLAGS=" \
$(if $(SYSTEM_LIBATOMIC_OPS),$(LIBATOMIC_OPS_CFLAGS), \
@@ -62,7 +66,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
&& $(if $(filter WNT,$(OS)),\
   PATH="$(shell cygpath -u $(call 
gb_UnpackedTarball_get_dir,icu)/source/lib):$$PATH",\
   $(gb_Helper_set_ld_path)) \
-  $(MAKE) $(FB_PRLL_ARG) SHELL=$(SHELL) firebird_embedded \
+  $(MAKE) "$${FB_PRLL_ARG}" SHELL='$(SHELL)' firebird_embedded 
\
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl 
OOO \

$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.5) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-01-30 Thread Lionel Elie Mamane

 external/firebird/ExternalProject_firebird.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1e38737b72ab3c3b550675ece22130c07b14577a
Author: Lionel Elie Mamane 
Date:   Sat Jan 30 12:06:09 2016 +0100

fix internal firebird with --no-parallelism

Change-Id: I013864b9dd8baeb572b43ca7794be193a23398a3

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 353786a..939b29d 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -21,6 +21,8 @@ $(eval $(call gb_ExternalProject_register_targets,firebird,\
build \
 ))
 
+FB_PRLL_ARG:=$(shell if [ "0$(PARALLELISM)" -gt 0 ]; then echo 
"CPU=$(PARALLELISM)"; fi)
+
 # note: this can intentionally only build against internal atomic_op
 # note: this can intentionally only build against internal tommath
 
@@ -60,7 +62,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
&& $(if $(filter WNT,$(OS)),\
   PATH="$(shell cygpath -u $(call 
gb_UnpackedTarball_get_dir,icu)/source/lib):$$PATH",\
   $(gb_Helper_set_ld_path)) \
-  $(MAKE) CPU=$(PARALLELISM) SHELL=$(SHELL) firebird_embedded \
+  $(MAKE) $(FB_PRLL_ARG) SHELL=$(SHELL) firebird_embedded \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl 
OOO \

$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.5) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2016-01-19 Thread Stephan Bergmann

 external/firebird/firebird-c++11.patch.1   |   26 +
 external/firebird/firebird-c++11replfn.patch.0 |6 -
 2 files changed, 27 insertions(+), 5 deletions(-)

New commits:
commit 3179e8f7e6ce550bbe766ed730e68b0374944dd5
Author: Stephan Bergmann 
Date:   Tue Jan 19 16:19:44 2016 +0100

external/firebird: Adapt to GCC 6

...which switched defaults from C++03 to C++14, so causes some errors now.

Curiously, the throw(std::bad_alloc) vs. throw-anything mismatch between the
global operator new replacements and the standard headers is OK for GCC only
when there is no further declaration in between the standard header and the
replacmenet definition.

Change-Id: Ib54727fecf4ad07426b811a9cc04b08ea80e59dc

diff --git a/external/firebird/firebird-c++11.patch.1 
b/external/firebird/firebird-c++11.patch.1
index e8cb52d..2890577 100644
--- a/external/firebird/firebird-c++11.patch.1
+++ b/external/firebird/firebird-c++11.patch.1
@@ -1,4 +1,19 @@
 # -*- Mode: Diff -*-
+--- firebird/src/dudley/exe.epp
 firebird/src/dudley/exe.epp
+@@ -2884,9 +2884,9 @@
+   blr_parameter, 0, 0, 0,
+   blr_parameter, 0, 1, 0,
+   blr_parameter, 1, 0, 0,
+-  blr_end,
+-  blr_end,
+-  blr_end,
++  SCHAR(blr_end),
++  SCHAR(blr_end),
++  SCHAR(blr_end),
+   blr_eoc
+   };
+   static FB_API_HANDLE req_handle;
 --- firebird/src/gpre/c_cxx.cpp
 +++ firebird/src/gpre/c_cxx.cpp
 @@ -876,7 +876,7 @@
@@ -156,6 +171,17 @@
}
else {
sprintf(p, "%d", value);
+--- firebird/src/gpre/sqe.cpp
 firebird/src/gpre/sqe.cpp
+@@ -2529,7 +2529,7 @@
+   return par_stat(request);
+ 
+   if (MSC_match(KW_MINUS))
+-  return MSC_unary(nod_negate, par_primitive_value(request, 
false, paren_count, false));
++  return MSC_unary(nod_negate, par_primitive_value(request, 
false, paren_count, NULL));
+ 
+   MSC_match(KW_PLUS);
+ 
 --- firebird/src/common/classes/alloc.cpp
 +++ firebird/src/common/classes/alloc.cpp
 @@ -1100,7 +1100,7 @@
diff --git a/external/firebird/firebird-c++11replfn.patch.0 
b/external/firebird/firebird-c++11replfn.patch.0
index d14296c..53b1dd0 100644
--- a/external/firebird/firebird-c++11replfn.patch.0
+++ b/external/firebird/firebird-c++11replfn.patch.0
@@ -1,6 +1,6 @@
 --- src/common/classes/alloc.h
 +++ src/common/classes/alloc.h
-@@ -489,23 +489,11 @@
+@@ -489,23 +489,7 @@
  inline static MemoryPool* getDefaultMemoryPool() { return 
Firebird::MemoryPool::processMemoryPool; }
  
  // Global versions of operators new and delete
@@ -12,8 +12,6 @@
 -{
 -  return Firebird::MemoryPool::globalAlloc(s);
 -}
-+void* operator new(size_t s) THROW_BAD_ALLOC;
-+void* operator new[](size_t s) THROW_BAD_ALLOC;
  
 -inline void operator delete(void* mem) throw()
 -{
@@ -23,8 +21,6 @@
 -{
 -  Firebird::MemoryPool::globalFree(mem);
 -}
-+void operator delete(void* mem) throw();
-+void operator delete[](void* mem) throw();
  
  #ifdef DEBUG_GDS_ALLOC
  inline void* operator new(size_t s, Firebird::MemoryPool& pool, const char* 
file, int line)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2015-10-02 Thread Stephan Bergmann

 external/firebird/UnpackedTarball_firebird.mk |3 +++
 external/firebird/firebird-c++14.patch|   14 ++
 2 files changed, 17 insertions(+)

New commits:
commit 01fd60b8fa614f5911d96bb34b40c62ebe1c20fb
Author: Stephan Bergmann 
Date:   Thu Oct 1 18:14:56 2015 +0200

Make external/firebird work with C++14 sized deallocation

...where firebird's replacements of global new/delete would still be called 
for
"new" but not for "delete".  Lets hope that always adding the C++14 size_t
overloads of operator delete is harmless in all relevant pre-C++14 
environments,
and only causes harmless warnings like -Wimplicit-exception-spec-mismatch 
in all
relevant C++14 environments.

(But why does a /library/ replace global new/delete in the first place?)

Change-Id: Ib0b0ad748c6641c07ffed6cec3d6809a1530679f
Reviewed-on: https://gerrit.libreoffice.org/19081
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 79fe914..c42cbd5 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -11,11 +11,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,firebird))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,firebird,$(FIREBIRD_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,firebird,0))
+
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-rpath.patch.0 \
external/firebird/firebird-c++11.patch.1 \
external/firebird/firebird-c++11replfn.patch.0 \
 external/firebird/firebird.disable-ib-util-not-found.patch.1 \
+   external/firebird/firebird-c++14.patch \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/firebird-c++14.patch 
b/external/firebird/firebird-c++14.patch
new file mode 100644
index 000..ad095bf
--- /dev/null
+++ b/external/firebird/firebird-c++14.patch
@@ -0,0 +1,14 @@
+--- src/common/classes/alloc.cpp
 src/common/classes/alloc.cpp
+@@ -2121,3 +2121,11 @@
+ {
+   Firebird::MemoryPool::globalFree(mem);
+ }
++void operator delete(void* mem, size_t) throw()
++{
++  Firebird::MemoryPool::globalFree(mem);
++}
++void operator delete[](void* mem, size_t) throw()
++{
++  Firebird::MemoryPool::globalFree(mem);
++}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2015-10-02 Thread Stephan Bergmann

 external/firebird/ExternalProject_firebird.mk |2 -
 external/firebird/UnpackedTarball_firebird.mk |1 
 external/firebird/macosx-elcapitan-dyld.patch |   39 ++
 3 files changed, 41 insertions(+), 1 deletion(-)

New commits:
commit ce170cf1f264c69e91cde268ee490584c8fbcd04
Author: Stephan Bergmann 
Date:   Fri Oct 2 11:04:40 2015 +0200

Allow external/firebird to be built with a custom SHELL under Mac OS X 10.11

...which broke all the stock /bin shells to no longer pass through any 
DYLD_*
environment variables, so the DYLD_LIBRARY_PATH passed into the firebird 
Make
would not be passed to all the places that need it (to find the external/icu
libraries that some executables link against which are built and run as 
part of
building firebird).

What works with two little tweaks is to build your own bash and pass it to 
make
with SHELL=...:

* For one, there is an empbuild executable that uses system(...) to call 
another
  isql executable, where the latter needs DYLD_LIBRARY_PATH set, but which 
would
  not pass through the system(...) call (which implicityl uses /bin/sh).

* For another, it is still necessary to invoke Firebird's make with an 
explicit
  SHELL=$(SHELL), for reasons that are not entirely clear to me.  (There are
  some Makefile.in in Firebird's extern/ sub-tree that set "SHELL = 
@SHELL@" to
  configure's CONFIG_SHELL, unless overriden via an explicit command line
  arguemnt, but I don't think those are relevant here.)

Change-Id: I1e68faa898e758f09efb602d96fd6b35657e0480

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index f24d0f7..35e63ab 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -60,7 +60,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
&& $(if $(filter WNT,$(OS)),\
   PATH="$(shell cygpath -u $(call 
gb_UnpackedTarball_get_dir,icu)/source/lib):$$PATH",\
   $(gb_Helper_set_ld_path)) \
-  $(MAKE) firebird_embedded \
+  $(MAKE) SHELL=$(SHELL) firebird_embedded \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl 
OOO \

$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.4) \
diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index c42cbd5..9701fc2 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -31,6 +31,7 @@ ifeq ($(OS),MACOSX)
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-macosx.patch.1 \
external/firebird/firebird-configure-x86-64-macosx.patch.1 \
+   external/firebird/macosx-elcapitan-dyld.patch \
 ))
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/external/firebird/macosx-elcapitan-dyld.patch 
b/external/firebird/macosx-elcapitan-dyld.patch
new file mode 100644
index 000..b8c4c1c
--- /dev/null
+++ b/external/firebird/macosx-elcapitan-dyld.patch
@@ -0,0 +1,39 @@
+--- examples/empbuild/empbuild.e
 examples/empbuild/empbuild.e
+@@ -64,7 +64,7 @@
+  * Functional description
+  *
+  **/
+-TEXT  cmd [140];
++TEXT  cmd [8000];
+ 
+ if (argc > 1)
+ strcpy (Db_name, argv[1]);
+@@ -94,21 +94,23 @@
+ }
+ 
+ printf ("Creating tables\n");
++char const * lp = getenv("DYLD_LIBRARY_PATH");
++if (!lp) lp = "";
+-sprintf (cmd, "isql %s -q -i empddl.sql", Db_name);
++sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -q -i empddl.sql", lp, Db_name);
+ if (system (cmd))
+ {
+ printf ("Couldn't create tables \n");
+ exit (FINI_ERROR);
+ }
+ 
+ printf ("Turning  off indices and triggers \n");
+-sprintf (cmd, "isql %s -i indexoff.sql", Db_name);
++sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -i indexoff.sql", lp, Db_name);
+ system (cmd);
+ printf ("Loading  column data\n");
+-sprintf (cmd, "isql %s -i empdml.sql", Db_name);
++sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -i empdml.sql", lp, Db_name);
+ system (cmd);
+ printf ("Turning  on indices and triggers \n");
+-sprintf (cmd, "isql %s -i indexon.sql", Db_name);
++sprintf (cmd, "DYLD_LIBRARY_PATH=%s isql %s -i indexon.sql", lp, Db_name);
+ system (cmd);
+ 
+ EXEC SQL CONNECT DB;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2015-07-30 Thread Christian Lohmaier

 external/firebird/UnpackedTarball_firebird.mk  |1 
 external/firebird/firebird-cygwin-msvc.patch.1 |  542 +
 2 files changed, 128 insertions(+), 415 deletions(-)

New commits:
commit 8dfe1a177eb437e751def99eea8bee08a7e49acc
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Thu Jul 30 21:57:11 2015 +0200

fix firebird build on Win64

use defines from static version of autoconfig.h for msvc instead of
fiddling with configure. Removes the need for adding some defines/checks
in the sources.

Change-Id: I21d4217ebb687eb13f7e7db2519a209f3b178a90

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index abee5ec..79fe914 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 ifeq ($(OS)-$(COM),WNT-MSC)
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-cygwin-msvc.patch.1 \
-   external/firebird/firebird-vs2013.patch.1 \
 ))
 endif
 
diff --git a/external/firebird/firebird-cygwin-msvc.patch.1 
b/external/firebird/firebird-cygwin-msvc.patch.1
index 9c24ebf..653360c 100644
--- a/external/firebird/firebird-cygwin-msvc.patch.1
+++ b/external/firebird/firebird-cygwin-msvc.patch.1
@@ -1,6 +1,47 @@
-diff -u firebird/builds/posix/make.defaults firebird/builds/posix/make.defaults
 firebird/builds/posix/make.defaults2013-07-03 16:23:44.804062000 
+0100
-+++ firebird/builds/posix/make.defaults2013-07-05 12:30:01.607151400 
+0100
+diff -ur firebird.org/builds/make.new/config/config.h.in 
firebird/builds/make.new/config/config.h.in
+--- firebird.org/builds/make.new/config/config.h.in2015-07-30 
18:57:00.826593100 +0200
 firebird/builds/make.new/config/config.h.in2015-07-30 
19:27:52.139226300 +0200
+@@ -668,3 +668,37 @@
+ #ifndef HAVE_SOCKLEN_T
+ typedef int socklen_t;
+ #endif
++
++/* taken from src/include/gen/autoconfig_msvc.h */
++#define WIN32_LEAN_AND_MEAN   // Exclude rarely-used stuff from 
Windows headers
++/* target architecture */
++#if defined(_M_IX86)
++/* sizeof(void *) */
++#define SIZEOF_VOID_P 4
++/* sizeof(size_t) */
++#define SIZEOF_SIZE_T 4
++/* alignment of long */
++#define FB_ALIGNMENT 4
++#elif defined(_M_AMD64)
++#define AMD64
++/* sizeof(void *) */
++#define SIZEOF_VOID_P 8
++/* sizeof(size_t) */
++#define SIZEOF_SIZE_T 8
++/* alignment of long */
++#define FB_ALIGNMENT 8
++#else
++#error unknown target platform
++#endif
++
++#define HAVE_IO_H
++
++#define HAVE_GETPAGESIZE
++
++#if defined _MSC_VER
++#if _MSC_VER  1500
++#define vsnprintf _vsnprintf
++#endif
++#define isnan _isnan
++#endif
++#define snprintf _snprintf
+diff -ur firebird.org/builds/posix/make.defaults 
firebird/builds/posix/make.defaults
+--- firebird.org/builds/posix/make.defaults2015-07-30 18:56:58.936120900 
+0200
 firebird/builds/posix/make.defaults2015-07-30 19:29:23.420338600 
+0200
 @@ -49,7 +49,11 @@
  
  FIREBIRD=$(GEN_ROOT)/firebird
@@ -58,7 +99,7 @@ diff -u firebird/builds/posix/make.defaults 
firebird/builds/posix/make.defaults
  SHRLIB_FOREIGN_EXT=   $(SHRLIB_EXT)
  
  #_
-@@ -179,6 +199,7 @@
+@@ -179,6 +203,7 @@
  vpath %.so $(LIB)
  vpath %.a $(LIB)
  vpath %.dll $(LIB)
@@ -66,7 +107,7 @@ diff -u firebird/builds/posix/make.defaults 
firebird/builds/posix/make.defaults
  
  #_
  
-@@ -193,9 +214,9 @@
+@@ -193,9 +218,9 @@
  # Scold me, but I don't want library names to be in configure.in
  # 
  
@@ -79,7 +120,7 @@ diff -u firebird/builds/posix/make.defaults 
firebird/builds/posix/make.defaults
  
  LIBFBEMBED_SO = $(LIB)/$(SharedLibraryName)
  LIBFBEMBED_SOBASENAME = $(LIB)/$(SharedLibrarySoName)
-@@ -219,7 +240,11 @@
+@@ -219,7 +244,11 @@
  
  LIBFBINTL_SO = $(FIREBIRD)/intl/$(LIB_PREFIX)fbintl.$(SHRLIB_EXT)
  
@@ -91,22 +132,18 @@ diff -u firebird/builds/posix/make.defaults 
firebird/builds/posix/make.defaults
  
  ifeq ($(EDITLINE_FLG),Y)
ifeq ($(STD_EDITLINE), true)
-unchanged:
 firebird.org/builds/posix/make.shared.variables2013-06-26 
10:05:19.351343000 +0100
-+++ firebird/builds/posix/make.shared.variables2013-07-04 
08:12:24.432879700 +0100
-@@ -291,7 +291,8 @@
- OS_SPECIFIC_Sources += $(ROOT)/extern/binreloc/binreloc.c
- endif
- OS_SPECIFIC_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename 
$(OS_SPECIFIC_Sources
--
-+#FBCOMMON_ClientFiles+=$(OS_SPECIFIC_Files)
-+#FBCOMMON_Objects+=$(OS_SPECIFIC_Objects)
- 
- #
- #
-unchanged:
 firebird/builds/posix/Makefile.in.examples 2013-07-04 14:22:42.262676600 
+0100
-+++ firebird/builds/posix/Makefile.in.examples 2013-07-05 10:14:02.897675100 
+0100

[Libreoffice-commits] core.git: external/firebird

2015-07-27 Thread Michael Stahl

 external/firebird/ExternalProject_firebird.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f58f10fc89e19d182b5a415bb69af5ecc7de080a
Author: Michael Stahl mst...@redhat.com
Date:   Mon Jul 27 23:52:44 2015 +0200

firebird: --enable-debug breaks the build with MSVC

With the 2.5.4 upgrade somehow this fails to link fbintl.lib with
unresolved symbols.

Debugging is overrated anyway, let's just disable that for now.

Change-Id: I265c705c10ca7c70baa18232f6f740120d6b397e

diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index f1dbb2f..f24d0f7 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--without-editline \
--disable-superserver \
--with-system-icu --without-fbsample 
--without-fbsample-db \
-   $(if $(ENABLE_DEBUG),--enable-debug) \
+   $(if $(filter-out MSC,$(COM)),$(if 
$(ENABLE_DEBUG),--enable-debug)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(DISABLE_DYNLOADING), \
--enable-static --disable-shared \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2015-01-23 Thread Julien Nabet

 external/firebird/UnpackedTarball_firebird.mk|1 
 external/firebird/firebird.disable-ib-util-not-found.patch.1 |   19 +++
 2 files changed, 20 insertions(+)

New commits:
commit e3c0025461bdf55e62a308a76c3aa0a35109f076
Author: Julien Nabet serval2...@yahoo.fr
Date:   Fri Jan 23 22:28:55 2015 +0100

Resolves fdo#72543: ib_util not found when creating or accessing new 
firebird

... embedded database
See https://bugs.freedesktop.org/show_bug.cgi?id=72543#c8
and https://bugs.freedesktop.org/show_bug.cgi?id=72543#c13

Change-Id: I299ab19f43ff9aa87362adf76d3a362279fc
Reviewed-on: https://gerrit.libreoffice.org/14146
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 4e3aec4..ee29b09 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-c++11.patch.1 \
external/firebird/firebird-c++11replfn.patch.0 \
external/firebird/firebird-no-open-temp-on-shutdown.patch.1 \
+external/firebird/firebird.disable-ib-util-not-found.patch.1 \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/firebird.disable-ib-util-not-found.patch.1 
b/external/firebird/firebird.disable-ib-util-not-found.patch.1
new file mode 100644
index 000..c0c4bb6
--- /dev/null
+++ b/external/firebird/firebird.disable-ib-util-not-found.patch.1
@@ -0,0 +1,19 @@
+--- firebird.org/src/jrd/fun.epp   2015-01-23 22:11:26.751475044 +0100
 firebird/src/jrd/fun.epp   2015-01-23 22:16:42.507322568 +0100
+@@ -160,10 +160,14 @@
+   if (tryLibrary(LIBNAME, message[3]))
+   return;
+ 
++/* fdo#72543: quote from 
https://bugs.freedesktop.org/show_bug.cgi?id=72543#c8
++   we don't need UDF support for embedded firebird,
++ hence the lack of ib_util isn't an issue and can safely be 
ignored
+   // all failed - log error
+   gds__log(ib_util init failed, UDFs can't be used - looks like firebird 
misconfigured\n
+\t%s\n\t%s\n\t%s\n\t%s, message[0].c_str(), 
message[1].c_str(),
+  
message[2].c_str(), message[3].c_str());
++*/
+ #endif// !BOOT_BUILD
+ }
+ 
+Seulement dans firebird/src/misc: codes.cpp
+Seulement dans firebird: temp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2014-09-26 Thread Peter Foley

 external/firebird/firebird-cygwin-msvc.patch.1 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fee691380bf6a6335c274b13865b9a7f71581331
Author: Peter Foley pefol...@pefoley.com
Date:   Tue Sep 23 21:57:15 2014 -0400

Fix firebird without cygwin gcc

The firebuild buildsystem calls windres, which depends on cygwin gcc,
use rc.exe so that a windows build without cygwin gcc will succeed.

Change-Id: Ic7719749b3806232912e3eb8b1ede11e6eb3c10c
Reviewed-on: https://gerrit.libreoffice.org/11619
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/external/firebird/firebird-cygwin-msvc.patch.1 
b/external/firebird/firebird-cygwin-msvc.patch.1
index 5e2368b..b563a10 100644
--- a/external/firebird/firebird-cygwin-msvc.patch.1
+++ b/external/firebird/firebird-cygwin-msvc.patch.1
@@ -790,5 +790,5 @@ unchanged:
  
  $(GEN_ROOT)/%.res: $(SRC_ROOT)/%.rc
 -  windres --output-format=coff --include-dir=$(D) $ $@
-+  windres --output-format=coff --include-dir=$(D) --target=pe-i386 $ $@
++  rc.exe $(SOLARINC) /fo $@ $
 only in patch2:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2014-07-07 Thread Tor Lillqvist

 external/firebird/UnpackedTarball_firebird.mk |1 +
 external/firebird/firebird-vs2013.patch.1 |   12 
 2 files changed, 13 insertions(+)

New commits:
commit 8159e3bd1a68c17e39cac10ecbb1ef880081c176
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Jul 7 23:14:31 2014 +0300

Adapt for VS 2013

Change-Id: Icd7a3d0cbcb994986ea53a5fe91d3996b26cbe0c

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 8f06102..4e3aec4 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 ifeq ($(OS)-$(COM),WNT-MSC)
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-cygwin-msvc.patch.1 \
+   external/firebird/firebird-vs2013.patch.1 \
 ))
 endif
 
diff --git a/external/firebird/firebird-vs2013.patch.1 
b/external/firebird/firebird-vs2013.patch.1
new file mode 100644
index 000..4b930d1
--- /dev/null
+++ b/external/firebird/firebird-vs2013.patch.1
@@ -0,0 +1,12 @@
+# -*- Mode: Diff -*-
+--- firebird/src/jrd/os/win32/mod_loader.cpp
 firebird/src/jrd/os/win32/mod_loader.cpp
+@@ -97,6 +97,8 @@
+   mscvr100.dll,
+ #elif _MSC_VER == 1700
+   mscvr110.dll,
++#elif _MSC_VER == 1800
++  mscvr120.dll,
+ #else
+ #error Specify CRT DLL name here !
+ #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2014-02-10 Thread Tor Lillqvist

 external/firebird/firebird-macosx.patch.1 |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit dd06463eadd9fe5e3e33e01be3d1aa3bd7c33abc
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Feb 10 11:22:05 2014 +0200

Seems that -fno-weak is unknown in upcoming Clang on OS X

Change-Id: I43bb17757f2b477674c49ad989393bb861c8d934

diff --git a/external/firebird/firebird-macosx.patch.1 
b/external/firebird/firebird-macosx.patch.1
index adede1c..0ad9bd9 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -87,14 +87,16 @@ diff -ur firebird.org/builds/posix/postfix.darwin 
firebird/builds/posix/postfix.
  export DYLD_LIBRARY_PATH
  
  MACOSX_DEPLOYMENT_TARGET=10.6
-@@ -27,8 +27,8 @@
+@@ -27,9 +27,9 @@
  
  OS_ServerFiles=inet_server.cpp
  
 -PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common 
-mmacosx-version-min=10.6
 -DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall 
-mmacosx-version-min=10.6
+-CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden 
-fno-weak
 +PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common
 +DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall
- CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden 
-fno-weak
++CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden
  EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print 
fbsvcmgr fbtracemgr
  CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup 
fb_lock_print fbsvcmgr \
+   fbtracemgr
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2013-10-30 Thread Stephan Bergmann

 external/firebird/UnpackedTarball_firebird.mk  |4 -
 external/firebird/firebird-c++11replfn.patch.0 |   54 +
 2 files changed, 55 insertions(+), 3 deletions(-)

New commits:
commit 542a3291005dc1db011c76f437d5e0b945fa726e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Oct 30 09:22:49 2013 +0100

C++11: new/delete replacement functions cannot be inline

...as clarified by a new sentence added to paragraph 3 of 17.6.4.6
[replacement.functions]: The programâs definitions shall not be 
specified as
inline.  Clang trunk towards 3.4 now generates errors for this.

Having these replacement functions in the fbembed dynamic library is 
extremely
fishy anyway; at least on Linux those symbols are not exported, and 
hopefully on
no other platforms either.  (If it turns out that this change causes the 
symbols
to change from non-exported to exported on some other platform, the best fix
would probably be to remove those replacement functions completely.)

Change-Id: I590d55e44814a6707030c42e1087377e75819666

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index c4119a0..77e691c 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -14,10 +14,8 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,firebird,$(FIREBIRD_TARBALL)))
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-icu.patch.1 \
external/firebird/firebird-rpath.patch.0 \
-))
-
-$(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-c++11.patch.1 \
+   external/firebird/firebird-c++11replfn.patch.0 \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/firebird/firebird-c++11replfn.patch.0 
b/external/firebird/firebird-c++11replfn.patch.0
new file mode 100644
index 000..d14296c
--- /dev/null
+++ b/external/firebird/firebird-c++11replfn.patch.0
@@ -0,0 +1,54 @@
+--- src/common/classes/alloc.h
 src/common/classes/alloc.h
+@@ -489,23 +489,11 @@
+ inline static MemoryPool* getDefaultMemoryPool() { return 
Firebird::MemoryPool::processMemoryPool; }
+ 
+ // Global versions of operators new and delete
+-inline void* operator new(size_t s) THROW_BAD_ALLOC
+-{
+-  return Firebird::MemoryPool::globalAlloc(s);
+-}
+-inline void* operator new[](size_t s) THROW_BAD_ALLOC
+-{
+-  return Firebird::MemoryPool::globalAlloc(s);
+-}
++void* operator new(size_t s) THROW_BAD_ALLOC;
++void* operator new[](size_t s) THROW_BAD_ALLOC;
+ 
+-inline void operator delete(void* mem) throw()
+-{
+-  Firebird::MemoryPool::globalFree(mem);
+-}
+-inline void operator delete[](void* mem) throw()
+-{
+-  Firebird::MemoryPool::globalFree(mem);
+-}
++void operator delete(void* mem) throw();
++void operator delete[](void* mem) throw();
+ 
+ #ifdef DEBUG_GDS_ALLOC
+ inline void* operator new(size_t s, Firebird::MemoryPool pool, const char* 
file, int line)
+--- src/common/classes/alloc.cpp
 src/common/classes/alloc.cpp
+@@ -2080,3 +2080,21 @@
+ #endif
+ 
+ } // namespace Firebird
++
++void* operator new(size_t s) THROW_BAD_ALLOC
++{
++  return Firebird::MemoryPool::globalAlloc(s);
++}
++void* operator new[](size_t s) THROW_BAD_ALLOC
++{
++  return Firebird::MemoryPool::globalAlloc(s);
++}
++
++void operator delete(void* mem) throw()
++{
++  Firebird::MemoryPool::globalFree(mem);
++}
++void operator delete[](void* mem) throw()
++{
++  Firebird::MemoryPool::globalFree(mem);
++}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird

2013-10-22 Thread Stephan Bergmann

 external/firebird/ExternalPackage_firebird.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b0f00d38254eca70e196e1580faac4a215bc2b12
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Oct 22 10:05:14 2013 +0200

Copy fbembed library to instdir

Change-Id: I2923ec4c5f0516fb3048622dc3e74692ef7a5959

diff --git a/external/firebird/ExternalPackage_firebird.mk 
b/external/firebird/ExternalPackage_firebird.mk
index 6419c30..6eaaf1c 100644
--- a/external/firebird/ExternalPackage_firebird.mk
+++ b/external/firebird/ExternalPackage_firebird.mk
@@ -12,12 +12,12 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,firebird,firebird))
 $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,bin/ifbembed.dll,gen/firebird/bin/ifbembed.dll))
+$(eval $(call 
gb_ExternalPackage_add_library_for_install,firebird,bin/ifbembed.dll,gen/firebird/bin/ifbembed.dll))
 $(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/ifbembed.lib,gen/firebird/bin/ifbembed.lib))
 else ifeq ($(OS),MACOSX)
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2))
+$(eval $(call 
gb_ExternalPackage_add_library_for_intsall,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2))
 else
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.2))
+$(eval $(call 
gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.2))
 $(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so.2.5.2))
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/firebird external/Module_external.mk firebird/ExternalPackage_firebird.mk firebird/ExternalProject_firebird.mk firebird/firebird-c++11.patch.1 firebird/firebir

2013-10-18 Thread Khaled Hosny

 RepositoryModule_host.mk   |1 
 external/Module_external.mk|1 
 external/firebird/ExternalPackage_firebird.mk  |   24 
 external/firebird/ExternalProject_firebird.mk  |   57 +
 external/firebird/Makefile |7 
 external/firebird/Module_firebird.mk   |   18 
 external/firebird/UnpackedTarball_firebird.mk  |   34 +
 external/firebird/firebird-c++11.patch.1   |  215 ++
 external/firebird/firebird-cygwin-msvc.patch.1 |  794 +
 external/firebird/firebird-icu.patch.1 |   28 
 external/firebird/firebird-macosx.patch.1  |  100 +++
 external/firebird/firebird-rpath.patch.0   |   11 
 firebird/ExternalPackage_firebird.mk   |   24 
 firebird/ExternalProject_firebird.mk   |   57 -
 firebird/Makefile  |7 
 firebird/Module_firebird.mk|   20 
 firebird/UnpackedTarball_firebird.mk   |   34 -
 firebird/firebird-c++11.patch.1|  215 --
 firebird/firebird-cygwin-msvc.patch.1  |  794 -
 firebird/firebird-icu.patch.1  |   28 
 firebird/firebird-macosx.patch.1   |  100 ---
 firebird/firebird-rpath.patch.0|   11 
 22 files changed, 1289 insertions(+), 1291 deletions(-)

New commits:
commit 1fdb6185a18990818199ad355b89c72102c6a0da
Author: Khaled Hosny khaledho...@eglug.org
Date:   Thu Oct 17 19:42:29 2013 +0200

fdo#70393: move firebird to a subdir of external

Change-Id: I2cb4f4b63ab526c3d034adf8c006103cde7e7304
Reviewed-on: https://gerrit.libreoffice.org/6302
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 7b6cb07..4701511 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
extras \
fileaccess \
filter \
-   $(call gb_Helper_optional,FIREBIRD,firebird) \
$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
$(call gb_Helper_optional,DBCONNECTIVITY,forms) \
formula \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index db245e5..97a2181 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,CURL,curl) \
$(call gb_Helper_optional,EPM,epm) \
$(call gb_Helper_optional,EXPAT,expat) \
+   $(call gb_Helper_optional,FIREBIRD,firebird) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
$(call gb_Helper_optional,LIBPNG,libpng) \
diff --git a/firebird/ExternalPackage_firebird.mk 
b/external/firebird/ExternalPackage_firebird.mk
similarity index 100%
rename from firebird/ExternalPackage_firebird.mk
rename to external/firebird/ExternalPackage_firebird.mk
diff --git a/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
similarity index 100%
rename from firebird/ExternalProject_firebird.mk
rename to external/firebird/ExternalProject_firebird.mk
diff --git a/firebird/Makefile b/external/firebird/Makefile
similarity index 100%
rename from firebird/Makefile
rename to external/firebird/Makefile
diff --git a/firebird/Module_firebird.mk b/external/firebird/Module_firebird.mk
similarity index 93%
rename from firebird/Module_firebird.mk
rename to external/firebird/Module_firebird.mk
index b1b1455..d74963f 100644
--- a/firebird/Module_firebird.mk
+++ b/external/firebird/Module_firebird.mk
@@ -9,12 +9,10 @@
 
 $(eval $(call gb_Module_Module,firebird))
 
-ifeq ($(SYSTEM_FIREBIRD),NO)
 $(eval $(call gb_Module_add_targets,firebird,\
ExternalPackage_firebird \
ExternalProject_firebird \
UnpackedTarball_firebird \
 ))
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
similarity index 77%
rename from firebird/UnpackedTarball_firebird.mk
rename to external/firebird/UnpackedTarball_firebird.mk
index 46baf71..c4119a0 100644
--- a/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -12,23 +12,23 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,firebird))
 $(eval $(call gb_UnpackedTarball_set_tarball,firebird,$(FIREBIRD_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
-   firebird/firebird-icu.patch.1 \
-   firebird/firebird-rpath.patch.0 \
+   external/firebird/firebird-icu.patch.1 \
+   external/firebird/firebird-rpath.patch.0 \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
-   firebird/firebird-c++11.patch.1 \
+   external/firebird/firebird-c++11.patch.1 \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
 $(eval $(call

87 matches

Mail list logo