diff options
author | Petr Mladek <pmladek@suse.cz> | 2012-02-22 14:56:34 +0100 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2012-02-22 15:12:44 +0100 |
commit | 98c5fe7cb94b249363fc99134def17a735e02c6e (patch) | |
tree | a765f70aab9c5ce92535c1fb21bb7bcce9896197 /scp2/source/ooo | |
parent | aff6db70245a74039b5331810d3ff654b1f6af63 (diff) |
Fix build of the optional stdlibs package on Linux
Diffstat (limited to 'scp2/source/ooo')
-rw-r--r-- | scp2/source/ooo/makefile.mk | 1 | ||||
-rw-r--r-- | scp2/source/ooo/stdlib.scp | 59 |
2 files changed, 0 insertions, 60 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 08ba316e2b96..244cf558d9df 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -328,7 +328,6 @@ PARFILES= \ profile_ooo.par \ profileitem_ooo.par \ ure.par \ - stdlib.par \ ure_into_ooo.par \ ure_standalone.par \ common_brand.par \ diff --git a/scp2/source/ooo/stdlib.scp b/scp2/source/ooo/stdlib.scp deleted file mode 100644 index 700b35b10063..000000000000 --- a/scp2/source/ooo/stdlib.scp +++ /dev/null @@ -1,59 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.inc" - -#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \ - || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY)) -File gid_File_Dl_GccS - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; -#ifdef AIX - Name = "libgcc_s.a"; -#else - Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3)); -#endif - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB"; -End -#endif - -#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \ - || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY)) -File gid_File_Dl_Stdcpp - Dir = SCP2_URE_DL_DIR; - LIB_FILE_BODY; -#ifdef AIX - Name = "libstdc++.a"; -#else - Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3)); -#endif - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996"; -End -#endif - |