diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-17 19:42:29 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-18 06:54:47 +0000 |
| commit | 1fdb6185a18990818199ad355b89c72102c6a0da (patch) | |
| tree | 12faec1605c43726f9d13190afcd7720e67ad6d2 /external/firebird/firebird-icu.patch.1 | |
| parent | 1a6264aa1230239006296247c5b6f098b80b6455 (diff) | |
fdo#70393: move firebird to a subdir of external
Change-Id: I2cb4f4b63ab526c3d034adf8c006103cde7e7304
Reviewed-on: https://gerrit.libreoffice.org/6302
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/firebird/firebird-icu.patch.1')
| -rw-r--r-- | external/firebird/firebird-icu.patch.1 | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/external/firebird/firebird-icu.patch.1 b/external/firebird/firebird-icu.patch.1 new file mode 100644 index 000000000000..6045ee19f0b0 --- /dev/null +++ b/external/firebird/firebird-icu.patch.1 @@ -0,0 +1,28 @@ +diff -ur firebird.org/builds/posix/Makefile.in.examples firebird/builds/posix/Makefile.in.examples +--- firebird.org/builds/posix/Makefile.in.examples 2013-06-21 20:47:17.047657633 +0100 ++++ firebird/builds/posix/Makefile.in.examples 2013-06-21 21:01:45.297638456 +0100 +@@ -53,10 +53,10 @@ + export PATH + + ifeq ($(PLATFORM),DARWIN) +-DYLD_LIBRARY_PATH := $(GEN_ROOT)/firebird/lib ++DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):$(GEN_ROOT)/firebird/lib + export DYLD_LIBRARY_PATH + else +-LD_LIBRARY_PATH := $(GEN_ROOT)/firebird/lib ++LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(GEN_ROOT)/firebird/lib + export LD_LIBRARY_PATH + endif + GPRE_FLAGS= -r -m -z -n +diff -ur firebird.org/builds/posix/Makefile.in.firebird firebird/builds/posix/Makefile.in.firebird +--- firebird.org/builds/posix/Makefile.in.firebird 2013-06-21 20:47:17.060657632 +0100 ++++ firebird/builds/posix/Makefile.in.firebird 2013-06-21 21:12:00.559624868 +0100 +@@ -44,7 +44,7 @@ + TEST_PATH = @FIREBIRD_BUILD_DIR@ + # Firebird libs path set at link time (-R) so do not override local requirements - nmcc 28/12/2002 + #LD_LIBRARY_PATH=$(RealFirebirdPath)/lib +-LD_LIBRARY_PATH=$(LIB) ++LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(LIB) + + #export ISC_USER + #export ISC_PASSWORD |