mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bundle again C++ stdlibs with generic Linux build

Browse Source
This commit is contained in:
Fridrich Štrba
2012-02-22 09:25:20 +01:00
parent 22e96521da
commit 33eefb2c5e
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distro-configs/LibreOfficeLinux.conf
View File

@@ -2,6 +2,7 @@
--with-system-dicts --with-system-dicts
--without-unix-wrapper --without-unix-wrapper
--without-system-zlib --without-system-zlib
--without-system-stdlibs
--without-system-poppler --without-system-poppler
--without-system-openssl --without-system-openssl
--without-system-mozilla --without-system-mozilla

1
distro-configs/OxygenOfficeLinux.conf
View File

@@ -50,6 +50,7 @@
--with-jdk-home=/usr/local/jdk1.6.0_23/ --with-jdk-home=/usr/local/jdk1.6.0_23/
--without-system-dicts --without-system-dicts
--without-system-zlib --without-system-zlib
--without-system-stdlibs
--without-system-poppler --without-system-poppler
--without-system-openssl --without-system-openssl
--without-system-mozilla --without-system-mozilla

2
external/gcc3_specific/makefile.mk vendored
View File

@@ -6,7 +6,7 @@ TARGET=gcc3_specific
.INCLUDE: settings.mk .INCLUDE: settings.mk
# ------------------------------------------------------------------ # ------------------------------------------------------------------
.IF "$(COMID)"=="gcc3" .IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3"
.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY" .IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"