From 4b6e0f08467edc70537c4e33d72e0e1efed7a69d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 10 Nov 2010 21:37:16 +0000 Subject: [PATCH] OpenOffice.org: Force compilation with GCC 4.5. svn path=/nixpkgs/branches/stdenv-updates/; revision=24652 --- pkgs/applications/office/openoffice/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index 67f01f3b972..dae4ebdcc3a 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -21,6 +21,22 @@ stdenv.mkDerivation rec { patches = [ ./oo.patch ./root-required.patch ]; + postPatch = + /* Compiling with GCC 4.5 fails: + + Compiling: cppu/source/AffineBridge/AffineBridge.cxx + [...] + ../../inc/uno/lbnames.h:67:2: error: #error "Supported gcc majors are 2 , 3 and 4 <= 4.4. Unsupported gcc major version." + + However, we can't compile with GCC 4.4 because then we'd end up with + two different versions of libstdc++ (because the deps are compiled + with 4.5), which isn't supported (link time error.) + + Thus, force compilation with 4.5 and hope for the best. */ + '' sed -i *"/cppu/inc/uno/lbnames.h" \ + -es 's/#[[:blank:]]*error "Supported.*$//g' + ''; + src_system = fetchurl { url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_system.tar.bz2"; sha256 = "0giy3sza64ij19w7b06rxcrkrb5kq2fvkz486vh3mv08s8xa8zfc";