diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-04-17 10:20:37 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-04-17 20:35:31 +0200 |
| commit | 25812b3eb420b0160b07ae604c5589a305c26938 (patch) | |
| tree | 06fd13d4e5af0ebc9325d52516e3b47bbc4a71d6 | |
| parent | 9a360f993d7a791c548801779d7f444f87541489 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | external/firebird/firebird-macosx.patch.1 | 20 |
1 files changed, 0 insertions, 20 deletions
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.000000000 +0200 -+++ firebird/builds/posix/prefix.darwin_i386 2016-08-01 23:02:46.000000000 +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.000000000 +0200 +++ firebird/builds/posix/Makefile.in 2016-08-08 17:57:17.000000000 +0200 @@ -191,6 +191,9 @@ |