diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-08-19 15:02:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-08-19 15:02:52 +0200 |
| commit | e73dc86924ad33a1522c7e4a284a66dabf54c160 (patch) | |
| tree | 894f618677db324a67b985b57dc83bb06da6560c /external | |
| parent | e1c16a523eeb612cd25191a9c2994d8eded64b72 (diff) | |
Why not just drop that $(HOME)/icu54/icu/source/lib nonsense
Change-Id: I2fed34ae680eb0bc01de90a7ef525cf8446cd940
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/UnpackedTarball_firebird.mk | 1 | ||||
| -rw-r--r-- | external/firebird/firebird-macosx.patch.1 | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index 861b212dc15d..29ad0dab5e03 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 75f86e238bc0..b9a685b4b040 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.000000000 +0200 +++ firebird/builds/posix/prefix.darwin_x86_64 2016-08-01 21:42:45.000000000 +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 |