Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0E9729D6C for ; Wed, 16 Nov 2011 22:29:06 +0000 (UTC) Received: (qmail 15346 invoked by uid 500); 16 Nov 2011 22:29:06 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 15259 invoked by uid 500); 16 Nov 2011 22:29:05 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 15252 invoked by uid 99); 16 Nov 2011 22:29:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Nov 2011 22:29:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Nov 2011 22:29:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 49AB52388AB9 for ; Wed, 16 Nov 2011 22:28:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r798788 [5/16] - in /websites/staging/ooo-site/trunk/content/porting: ./ __modules/ crashrep/ freebsd/ images/ irix/ irix/build_inst/ irix/build_inst/patches/ irix/build_inst/patches/1/ irix/build_inst/patches/103/ irix/build_inst/patches/B... Date: Wed, 16 Nov 2011 22:28:29 -0000 To: ooo-commits@incubator.apache.org From: buildbot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111116222841.49AB52388AB9@eris.apache.org> Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2504_dbaccess_source_ui_querydesign_TableWindowTitle.cxx_include_algorithm.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2504_dbaccess_source_ui_querydesign_TableWindowTitle.cxx_include_algorithm.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2504_dbaccess_source_ui_querydesign_TableWindowTitle.cxx_include_algorithm.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/641-gcc-debug/source/dbaccess/source/ui/querydesign/TableWindowTitle.cxx Thu Oct 11 18:38:13 2001 ++++ dbaccess/source/ui/querydesign/TableWindowTitle.cxx Mon Nov 26 07:05:51 2001 +@@ -104,6 +104,8 @@ + #include "JoinController.hxx" + #endif + ++#include ++ + using namespace dbaui; + using namespace ::com::sun::star::beans; + using namespace ::com::sun::star::uno; Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2504_forms_source_misc_property.cxx_include_algorithm.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2504_forms_source_misc_property.cxx_include_algorithm.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2504_forms_source_misc_property.cxx_include_algorithm.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,10 @@ +--- /projects/sise/openoffice/devel/workpits/641-gcc-debug/source/forms/source/misc/property.cxx Thu Aug 30 23:24:16 2001 ++++ forms/source/misc/property.cxx Tue Nov 27 10:53:33 2001 +@@ -58,6 +58,7 @@ + * + * + ************************************************************************/ ++#include + + #ifndef _FRM_PROPERTY_HXX_ + #include "property.hxx" Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2504_xmloff_source_forms_elementimport.cxx_include_algorithm.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2504_xmloff_source_forms_elementimport.cxx_include_algorithm.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2504_xmloff_source_forms_elementimport.cxx_include_algorithm.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/641-irix-gcc-STLP/source/xmloff/source/forms/elementimport.cxx Mon Jun 25 23:32:38 2001 ++++ xmloff/source/forms/elementimport.cxx Thu Nov 8 16:36:54 2001 +@@ -100,6 +100,8 @@ + #include + #endif + ++#include ++ + //......................................................................... + namespace xmloff + { Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2505_vcl_unx_source_app_stacktrace.cxx_include_rld_interface.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2505_vcl_unx_source_app_stacktrace.cxx_include_rld_interface.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2505_vcl_unx_source_app_stacktrace.cxx_include_rld_interface.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,34 @@ +--- /projects/sise/openoffice/devel/workpits/OO638C-irix-gcc-STLP/source/vcl/unx/source/app/stacktrace.cxx Fri Feb 16 11:12:12 2001 ++++ vcl/unx/source/app/stacktrace.cxx Mon Oct 8 18:50:47 2001 +@@ -74,6 +74,31 @@ + #undef __USE_GNU + #endif + ++#if defined IRIX ++#include ++#ifndef _RLD_INTERFACE_DLFCN_H_DLADDR ++#define _RLD_INTERFACE_DLFCN_H_DLADDR ++typedef struct DL_INFO { ++ const char * dli_fname; ++ void * dli_fbase; ++ const char * dli_sname; ++ void * dli_saddr; ++ int dli_version; ++ int dli_reserved1; ++ long dli_reserved[4]; ++} Dl_info; ++#endif ++#define _RLD_DLADDR 14 ++int dladdr(void *address, Dl_info *dl); ++ ++int dladdr(void *address, Dl_info *dl) ++{ ++ void *v; ++ v = _rld_new_interface(_RLD_DLADDR,address,dl); ++ return (int)v; ++} ++#endif ++ + #if defined SOLARIS || ( defined(NETBSD) && defined(SPARC) ) + #ifdef GCC + inline void* sal_getFP() Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2506_rsc_source_rscpp_cpp3.c_fix_abort_proto.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2506_rsc_source_rscpp_cpp3.c_fix_abort_proto.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2506_rsc_source_rscpp_cpp3.c_fix_abort_proto.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,14 @@ +--- /projects/sise/openoffice/devel/workpits/641-irix-gcc-STLP/source/rsc/source//rscpp/cpp3.c Wed Apr 18 20:31:56 2001 ++++ rsc/source//rscpp/cpp3.c Fri Nov 16 09:42:54 2001 +@@ -79,7 +79,11 @@ + + #if defined(DEBUG) && (HOST == SYS_VMS || HOST == SYS_UNIX) + #include ++#ifdef IRIX ++extern void abort(void); ++#else + extern int abort(); /* For debugging */ ++#endif + #endif + + void InitCpp3() Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2507_xml2cmp_prj_build.lst_remove_stl.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2507_xml2cmp_prj_build.lst_remove_stl.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2507_xml2cmp_prj_build.lst_remove_stl.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,8 @@ +--- /projects/sise/openoffice/devel/workpits/641-irix-gcc-STLP/source/xml2cmp/prj/build.lst Tue Aug 14 02:14:59 2001 ++++ xml2cmp/prj/build.lst Fri Nov 2 12:21:31 2001 +@@ -1,4 +1,4 @@ +-xc xml2cmp : soltools stlport NULL ++xc xml2cmp : soltools NULL + xc xml2cmp usr1 - all xc_mkout NULL + xc xml2cmp\prj get - all xc_prj NULL + xc xml2cmp\source\support nmake - all xc_supp NULL Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2516_solenv_bin_checkdll.sh_irix_needs_LD_LIBRARYN32_PATH.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2516_solenv_bin_checkdll.sh_irix_needs_LD_LIBRARYN32_PATH.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2516_solenv_bin_checkdll.sh_irix_needs_LD_LIBRARYN32_PATH.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,19 @@ +--- /projects/sise/openoffice/devel/workpits/OO641B_STLP45/source/solenv/bin/checkdll.sh Tue Jun 19 23:07:46 2001 ++++ solenv/bin/checkdll.sh Wed Dec 12 16:34:08 2001 +@@ -35,6 +35,16 @@ + *) DYLD_LIBRARY_PATH=$libpath;; + esac + export DYLD_LIBRARY_PATH;; ++ IRIX) case "${LD_LIBRARYN32_PATH+X}" in ++ X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;; ++ *) LD_LIBRARYN32_PATH=$libpath;; ++ esac ++ export LD_LIBRARYN32_PATH;; ++ IRIX64) case "${LD_LIBRARYN32_PATH+X}" in ++ X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;; ++ *) LD_LIBRARYN32_PATH=$libpath;; ++ esac ++ export LD_LIBRARYN32_PATH;; + *) case "${LD_LIBRARY_PATH+X}" in + X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;; + *) LD_LIBRARY_PATH=$libpath;; Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2573_sal_osl_unx_nlsupport.c_add_irix_codeset.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2573_sal_osl_unx_nlsupport.c_add_irix_codeset.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2573_sal_osl_unx_nlsupport.c_add_irix_codeset.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,51 @@ +--- /projects/sise/openoffice/devel/workpits/OO641B_STLP45/source/sal/osl/unx/nlsupport.c Tue Nov 13 08:21:31 2001 ++++ sal/osl/unx/nlsupport.c Tue Dec 18 12:35:54 2001 +@@ -63,7 +63,7 @@ + #include + #include + +-#if defined(LINUX) || defined(SOLARIS) ++#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) + #include + #include + #include +@@ -242,12 +242,12 @@ + return NULL; + } + +-#if defined(LINUX) || defined(SOLARIS) ++#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) + + /* + * This implementation of osl_getTextEncodingFromLocale maps + * from nl_langinfo(CODESET) to rtl_textencoding defines. +- * nl_langinfo() is supported only on Linux and Solaris. ++ * nl_langinfo() is supported only on Linux, Solaris and IRIX. + * + * This routine is SLOW because of the setlocale call, so + * grab the result and cache it. +@@ -295,6 +295,24 @@ + + /* XXX MS-874 is an extension to tis620, so this is not + * really equivalent */ ++#elif defined(IRIX) ++ ++const _pair _nl_language_list[] = { ++ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */ ++ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */ ++ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ ++ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ ++ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ ++ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */ ++ { "eucJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ ++ { "eucKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */ ++ { "eucCN", RTL_TEXTENCODING_EUC_CN }, /* China */ ++ { "eucTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */ ++ { "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ ++ { "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */ ++ { "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */ ++ { "sjis", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ ++}; + + #elif defined(LINUX) + Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2573_tools_source_string_charset.cxx_add_irix_charset.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2573_tools_source_string_charset.cxx_add_irix_charset.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2573_tools_source_string_charset.cxx_add_irix_charset.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,55 @@ +--- /projects/sise/openoffice/devel/workpits/OO641B_STLP45/source/tools/source/string/charset.cxx Thu May 10 23:35:20 2001 ++++ tools/source/string/charset.cxx Tue Dec 18 12:37:08 2001 +@@ -64,7 +64,7 @@ + #elif defined( OS2 ) + #define INCL_DOSNLS + #include +-#elif defined(LINUX) || defined(SOLARIS) ++#elif defined(LINUX) || defined(SOLARIS) || defined(IRIX) + #include + #include + #include +@@ -323,7 +323,7 @@ + return RTL_TEXTENCODING_DONTKNOW; + } + +-#elif defined(LINUX) || defined(SOLARIS) ++#elif defined(LINUX) || defined(SOLARIS) || defined(IRIX) + + typedef struct { + const char *key; +@@ -363,6 +363,25 @@ + /* XXX MS-874 is an extension to tis620, so this is not + * really equivalent */ + ++#elif defined(IRIX) ++ ++const _pair _nl_language_list[] = { ++ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */ ++ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */ ++ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ ++ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ ++ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ ++ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */ ++ { "eucJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ ++ { "eucKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */ ++ { "eucCN", RTL_TEXTENCODING_EUC_CN }, /* China */ ++ { "eucTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */ ++ { "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ ++ { "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */ ++ { "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */ ++ { "sjis", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ ++}; ++ + #elif defined(LINUX) + + const _pair _nl_language_list[] = { +@@ -541,7 +560,7 @@ + + }; + +-#endif /* LINUX, SOLARIS */ ++#endif /* LINUX, SOLARIS, IRIX */ + + static int + _pair_compare (const char *key, const _pair *pair) Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2594.add_IRIX.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2594.add_IRIX.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/2594.add_IRIX.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,21 @@ +diff -u -r1.15 i18n_ic.cxx +--- vcl/unx/source/app/i18n_ic.cxx 2001/08/28 15:18:56 1.15 ++++ vcl/unx/source/app/i18n_ic.cxx 2001/12/19 20:25:29 +@@ -356,7 +359,7 @@ + + if ( mnPreeditStyle != XIMPreeditNone ) + { +-#if defined LINUX || defined FREEBSD || defined NETBSD ++#if defined LINUX || defined FREEBSD || defined NETBSD || defined IRIX + if ( mpPreeditAttributes != NULL ) + #endif + mpAttributes = XVaAddToNestedList( mpAttributes, +@@ -364,7 +367,7 @@ + } + if ( mnStatusStyle != XIMStatusNone ) + { +-#if defined LINUX || defined FREEBSD || defined NETBSD ++#if defined LINUX || defined FREEBSD || defined NETBSD || defined IRIX + if ( mpStatusAttributes != NULL ) + #endif + mpAttributes = XVaAddToNestedList( mpAttributes, Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/berkeleydb_db-3.2.9.patch_avoid_usr_include.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/berkeleydb_db-3.2.9.patch_avoid_usr_include.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/berkeleydb_db-3.2.9.patch_avoid_usr_include.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,29 @@ +--- /projects/sise/openoffice/devel/workpits/641-irix-gcc-STLP/source/berkeleydb/db-3.2.9.patch Tue Jun 12 00:09:22 2001 ++++ berkeleydb/db-3.2.9.patch Thu Nov 22 10:34:23 2001 +@@ -30,16 +30,23 @@ + *** 8,14 **** + ################################################## + CPPFLAGS= -I$(builddir) -I$(srcdir)/include @CPPFLAGS@ +- CFLAGS= -c $(CPPFLAGS) @CFLAGS@ ++! CFLAGS= -c $(CPPFLAGS) @CFLAGS@ + ! CXXFLAGS= -c $(CPPFLAGS) @CXXFLAGS@ + + CC= @MAKEFILE_CC@ + CCLINK= @MAKEFILE_CCLINK@ +---- 8,14 ---- ++--- 8,20 ---- + ################################################## + CPPFLAGS= -I$(builddir) -I$(srcdir)/include @CPPFLAGS@ +- CFLAGS= -c $(CPPFLAGS) @CFLAGS@ ++! ifeq ($(OS), IRIX) ++! INC= $(filter-out -I/usr/include, $(SOLARINC)) ++! CFLAGS= -c $(INC) $(CPPFLAGS) @CFLAGS@ ++! CXXFLAGS= -c $(INC) $(CPPFLAGS) @CXXFLAGS@ ++! else ++! CFLAGS= -c $(CPPFLAGS) @CFLAGS@ + ! CXXFLAGS= -c $(SOLARINC) $(CPPFLAGS) @CXXFLAGS@ ++! endif ++ + + CC= @MAKEFILE_CC@ + CCLINK= @MAKEFILE_CCLINK@ Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/berkeleydb_makefile.mk_use_gmake.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/berkeleydb_makefile.mk_use_gmake.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/berkeleydb_makefile.mk_use_gmake.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,14 @@ +--- /projects/sise/openoffice/devel/workpits/641-irix-gcc-STLP/source/berkeleydb/makefile.mk Thu Jun 21 04:43:52 2001 ++++ berkeleydb/makefile.mk Thu Nov 22 10:39:06 2001 +@@ -83,7 +83,11 @@ + CONFIGURE_FLAGS=--enable-cxx --enable-java --enable-dynamic --enable-shared + + BUILD_DIR=$(CONFIGURE_DIR) ++.IF "$(OS)"=="IRIX" ++BUILD_ACTION=gmake ++.ELSE + BUILD_ACTION=make ++.ENDIF + + OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*.so + Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/berkeleydb_prj_d.lst_copy_db-3.2_with_trailing_period.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/berkeleydb_prj_d.lst_copy_db-3.2_with_trailing_period.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/berkeleydb_prj_d.lst_copy_db-3.2_with_trailing_period.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,14 @@ +--- /projects/sise/openoffice/devel/workpits/OO641B_STLP45/source/berkeleydb/prj/d.lst Thu Jun 14 22:37:48 2001 ++++ berkeleydb/prj/d.lst Thu Dec 6 09:57:25 2001 +@@ -8,8 +8,11 @@ + ..\%__SRC%\lib\libdb_java32.lib %_DEST%\lib%_EXT%\libdb_java32.lib + + ..\%__SRC%\lib\libdb-3.2.so %_DEST%\lib%_EXT%\libdb-3.2.so ++..\%__SRC%\lib\libdb-3.2.so %_DEST%\lib%_EXT%\libdb-3.2.so. + ..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so ++..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so. + ..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so ++..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so. + + ..\%__SRC%\bin\libdb32.dll %_DEST%\bin%_EXT%\libdb32.dll + ..\%__SRC%\bin\libdb_java32.dll %_DEST%\bin%_EXT%\libdb_java32.dll Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/connectivity_source_parse_makefile.mk_copy_correct_output_file.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/connectivity_source_parse_makefile.mk_copy_correct_output_file.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/connectivity_source_parse_makefile.mk_copy_correct_output_file.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/source/OpenOffice641/connectivity/source/parse/makefile.mk Fri Aug 10 23:09:05 2001 ++++ connectivity/source/parse/makefile.mk Wed Mar 6 16:09:49 2002 +@@ -97,7 +97,7 @@ + $(MISC)$/sqlbison.cxx: sqlbison.y + +bison -v -d -pSQLyy -l -bsql -o$(MISC)$/sqlbison.cxx sqlbison.y + -$(MKDIR) $(OUT)$/inc$/connectivity +- +$(COPY) $(MISC)$/sqlbison.cxx.h $(OUT)$/inc$/connectivity$/sqlbison.hxx ++ +$(COPY) $(MISC)$/sqlbison.hxx $(OUT)$/inc$/connectivity$/sqlbison.hxx + + $(SLO)$/sqlbison.obj : $(MISC)$/sqlbison.cxx + Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/cppu_inc_com_sun_star_uno_Reference.hxx_add_printfs_to_fix_mem_alignment_problem.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/cppu_inc_com_sun_star_uno_Reference.hxx_add_printfs_to_fix_mem_alignment_problem.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/cppu_inc_com_sun_star_uno_Reference.hxx_add_printfs_to_fix_mem_alignment_problem.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,35 @@ +--- /projects/sise/openoffice/devel/workpits/OO641B_STLP45/workarea/cppu/inc/com/sun/star/uno/Reference.hxx Mon Jan 7 11:21:50 2002 ++++ cppu/inc/com/sun/star/uno/Reference.hxx Thu Jan 10 10:03:32 2002 +@@ -71,6 +71,8 @@ + #include + #endif + ++#include ++ + /** */ //for docpp + namespace com + { +@@ -148,6 +150,7 @@ + template< class interface_type > + inline Reference< interface_type >::Reference( const Reference< interface_type > & rRef ) SAL_THROW( () ) + { ++ printf(" \b"); + _pInterface = rRef._pInterface; + if (_pInterface) + _pInterface->acquire(); +@@ -156,6 +159,7 @@ + template< class interface_type > + inline Reference< interface_type >::Reference( interface_type * pInterface ) SAL_THROW( () ) + { ++ printf(" \b"); + _pInterface = pInterface; + if (_pInterface) + _pInterface->acquire(); +@@ -182,6 +186,7 @@ + template< class interface_type > + inline Reference< interface_type >::Reference( XInterface * pInterface, __UnoReference_Query ) SAL_THROW( (RuntimeException) ) + { ++ printf(" \b"); + _pInterface = __query( pInterface ); + } + //__________________________________________________________________________________________________ Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/dbaccess_source_core_api_column.cxx_include_algorithm.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/dbaccess_source_core_api_column.cxx_include_algorithm.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/dbaccess_source_core_api_column.cxx_include_algorithm.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/source/OO641/dbaccess/source/core/api/column.cxx Fri Oct 19 22:52:27 2001 ++++ dbaccess/source/core/api/column.cxx Fri Nov 16 14:33:16 2001 +@@ -59,6 +59,8 @@ + * + ************************************************************************/ + ++#include ++ + #ifndef _DBA_COREAPI_COLUMN_HXX_ + #include "column.hxx" + #endif Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/dbaccess_source_core_dataaccess_datasource.cxx_include_algorithm.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/dbaccess_source_core_dataaccess_datasource.cxx_include_algorithm.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/dbaccess_source_core_dataaccess_datasource.cxx_include_algorithm.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/source/OO641/dbaccess/source/core/dataaccess/datasource.cxx Wed Oct 10 01:41:46 2001 ++++ dbaccess/source/core/dataaccess/datasource.cxx Fri Nov 16 14:35:37 2001 +@@ -59,6 +59,8 @@ + * + ************************************************************************/ + ++#include ++ + #ifndef _DBA_COREDATAACCESS_DATASOURCE_HXX_ + #include "datasource.hxx" + #endif Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/dbaccess_source_ui_browser_genericcontroller.cxx_include_algorithm.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/dbaccess_source_ui_browser_genericcontroller.cxx_include_algorithm.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/dbaccess_source_ui_browser_genericcontroller.cxx_include_algorithm.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,12 @@ +--- /projects/sise/openoffice/devel/workpits/641-irix-gcc-STLP/source/dbaccess/source/ui/browser/genericcontroller.cxx Thu Oct 18 16:47:58 2001 ++++ dbaccess/source/ui/browser/genericcontroller.cxx Fri Nov 9 07:29:55 2001 +@@ -58,6 +58,9 @@ + * + * + ************************************************************************/ ++ ++#include ++ + #ifndef DBAUI_GENERICCONTROLLER_HXX + #include "genericcontroller.hxx" + #endif Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/dbaccess_source_ui_querydesign_JoinTableView.cxx_include_algorithm.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/dbaccess_source_ui_querydesign_JoinTableView.cxx_include_algorithm.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/dbaccess_source_ui_querydesign_JoinTableView.cxx_include_algorithm.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,12 @@ +--- /projects/sise/openoffice/devel/workpits/641-irix-gcc-STLP/source/dbaccess/source/ui/querydesign/JoinTableView.cxx Mon Oct 22 18:09:10 2001 ++++ dbaccess/source/ui/querydesign/JoinTableView.cxx Fri Nov 9 08:15:13 2001 +@@ -58,6 +58,9 @@ + * + * + ************************************************************************/ ++ ++#include ++ + #ifndef DBAUI_QUERYTABLEVIEW_HXX + #include "JoinTableView.hxx" + #endif Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/dbaccess_source_ui_querydesign_TableConnection.cxx_include_algorithm.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/dbaccess_source_ui_querydesign_TableConnection.cxx_include_algorithm.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/dbaccess_source_ui_querydesign_TableConnection.cxx_include_algorithm.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,12 @@ +--- /projects/sise/openoffice/devel/workpits/641-irix-gcc-STLP/source/dbaccess/source/ui/querydesign/TableConnection.cxx Mon Oct 8 17:32:34 2001 ++++ dbaccess/source/ui/querydesign/TableConnection.cxx Tue Nov 13 10:21:55 2001 +@@ -58,6 +58,9 @@ + * + * + ************************************************************************/ ++ ++#include ++ + #ifndef DBAUI_TABLECONNECTION_HXX + #include "TableConnection.hxx" + #endif Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/desktop_source_javaldx_makefile.mk_link_stlport.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/desktop_source_javaldx_makefile.mk_link_stlport.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/desktop_source_javaldx_makefile.mk_link_stlport.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,10 @@ +--- /projects/sise/openoffice/devel/workpits/641-irix-gcc-STLP/source/desktop/source/javaldx/makefile.mk Sat Jul 14 02:22:28 2001 ++++ desktop/source/javaldx/makefile.mk Fri Nov 9 16:44:57 2001 +@@ -66,7 +66,6 @@ + TARGET=javaldx + TARGETTYPE=CUI + +-NO_DEFAULT_STL=TRUE + LIBTARGET=NO + ENABLE_EXCEPTIONS=true + Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/extensions_source_bibliography_formcontrolcontainer.cxx_include_algorithm.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/extensions_source_bibliography_formcontrolcontainer.cxx_include_algorithm.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/extensions_source_bibliography_formcontrolcontainer.cxx_include_algorithm.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/source/OO641/extensions/source/bibliography/formcontrolcontainer.cxx Mon Oct 22 17:32:53 2001 ++++ extensions/source/bibliography/formcontrolcontainer.cxx Fri Nov 16 14:48:28 2001 +@@ -59,6 +59,8 @@ + * + ************************************************************************/ + ++#include ++ + #ifndef EXTENSIONS_BIB_FORMCONTROLCONTAINER_HXX + #include "formcontrolcontainer.hxx" + #endif Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/forms_source_component_GroupManager.cxx_include_algorithm.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/forms_source_component_GroupManager.cxx_include_algorithm.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/forms_source_component_GroupManager.cxx_include_algorithm.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/source/OO641/forms/source/component/GroupManager.cxx Thu Sep 13 03:05:29 2001 ++++ forms/source/component/GroupManager.cxx Fri Nov 16 14:49:31 2001 +@@ -59,6 +59,8 @@ + * + ************************************************************************/ + ++#include ++ + #ifndef _FRM_GROUPMANAGER_HXX_ + #include "GroupManager.hxx" + #endif Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/forms_source_misc_InterfaceContainer.cxx_include_algorithm.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/forms_source_misc_InterfaceContainer.cxx_include_algorithm.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/forms_source_misc_InterfaceContainer.cxx_include_algorithm.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/641-gcc-debug/source/forms/source/misc/InterfaceContainer.cxx Wed Oct 17 02:18:32 2001 ++++ forms/source/misc/InterfaceContainer.cxx Tue Nov 27 10:33:04 2001 +@@ -59,6 +59,8 @@ + * + ************************************************************************/ + ++#include ++ + #ifndef _FRM_INTERFACE_CONTAINER_HXX_ + #include "InterfaceContainer.hxx" + #endif Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/idlc_source_makefile.mk_copy_correct_output_file.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/idlc_source_makefile.mk_copy_correct_output_file.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/idlc_source_makefile.mk_copy_correct_output_file.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,10 @@ +--- /projects/sise/openoffice/devel/workpits/source/OpenOffice641/idlc/source/makefile.mk Wed Apr 18 21:04:25 2001 ++++ idlc/source/makefile.mk Wed Mar 6 16:07:42 2002 +@@ -148,6 +148,6 @@ + + $(MISC)$/parser.cxx: parser.yy + +bison -v -d -o$(MISC)$/parser.cxx parser.yy +- +$(COPY) $(MISC)$/parser.cxx.h $(OUT)$/inc$/parser.h ++ +$(COPY) $(MISC)$/parser.hxx $(OUT)$/inc$/parser.h + # with line statements (for debugging) + # +bison -v -d -o$(MISC)$/parser.cxx parser.yy Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/moz_prj_d.lst_mozilla_missing_from_source_and_dest_path.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/moz_prj_d.lst_mozilla_missing_from_source_and_dest_path.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/moz_prj_d.lst_mozilla_missing_from_source_and_dest_path.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,17 @@ +--- /projects/sise/openoffice/devel/workpits/OO641B_STLP45/source/moz/prj/d.lst Tue Oct 16 20:58:26 2001 ++++ moz/prj/d.lst Wed Dec 5 09:43:23 2001 +@@ -2,9 +2,9 @@ + mkdir: %_DEST%\inc%_EXT%\mozilla\nspr + mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\obsolete + +-..\%__SRC%\inc\* %_DEST%\inc%_EXT%\mozilla +-..\%__SRC%\inc\nspr\* %_DEST%\inc%_EXT%\mozilla\nspr +-..\%__SRC%\inc\nspr\obsolete\* %_DEST%\inc%_EXT%\mozilla\nspr\obsolete +-..\%__SRC%\lib\* %_DEST%\lib%_EXT% +-..\%__SRC%\bin\*.zip %_DEST%\bin%_EXT% ++..\%__SRC%\inc\mozilla\* %_DEST%\inc%_EXT%\mozilla\* ++..\%__SRC%\inc\mozilla\nspr\* %_DEST%\inc%_EXT%\mozilla\nspr\* ++..\%__SRC%\inc\mozilla\nspr\obsolete\* %_DEST%\inc%_EXT%\mozilla\nspr\obsolete\* ++..\%__SRC%\lib\* %_DEST%\lib%_EXT%\* ++..\%__SRC%\bin\*.zip %_DEST%\bin%_EXT%\*.zip + Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/product_examples_cpp_remoteclient_makefile.mk_copy_so_file_before_regmerge.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/product_examples_cpp_remoteclient_makefile.mk_copy_so_file_before_regmerge.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/product_examples_cpp_remoteclient_makefile.mk_copy_so_file_before_regmerge.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,19 @@ +--- /projects/sise/openoffice/devel/workpits/OO641B_STLP45/source/product/examples/cpp/remoteclient/makefile.mk Thu Jul 26 18:18:04 2001 ++++ product/examples/cpp/remoteclient/makefile.mk Thu Dec 13 10:09:37 2001 +@@ -67,6 +67,8 @@ + ENABLE_EXCEPTIONS=TRUE + NO_BSYMBOLIC=TRUE + COMP1TYPELIST=$(TARGET) ++TARGETTYPE=CUI ++NO_DEFAULT_STL=TRUE + + # --- Settings ----------------------------------------------------- + +@@ -127,6 +129,7 @@ + + $(MISC)$/component_remoteclient_registered.flag .SETDIR=$(CURRENTDIR): + -rm -f ..$/misc$/component_remoteclient_registered.flag ++ -cp $(SHL1TARGETN:f) $(SOLARVERSION)$/$(INPATH)$/lib$/$(SHL1TARGETN:f) + regmerge $(PATHPREFIX)$/server.rdb / $(SOLARBINDIR)$/udkapi.rdb + regmerge $(PATHPREFIX)$/client.rdb / $(SOLARBINDIR)$/udkapi.rdb + regcomp -register -r $(PATHPREFIX)$/client.rdb -c $(DLLPREFIX)remoteclientsample$(DLLPOSTFIX) Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/product_prj_d.lst_deliver_so_files.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/product_prj_d.lst_deliver_so_files.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/product_prj_d.lst_deliver_so_files.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,10 @@ +--- /projects/sise/openoffice/devel/workpits/OO641B_STLP45/source/product/prj/d.lst Thu Jun 28 00:07:30 2001 ++++ product/prj/d.lst Tue Dec 4 10:37:06 2001 +@@ -12,6 +12,7 @@ + ..\inc\scp\udk_completefiles.scp %_DEST%\inc%_EXT%\scp\udk_completefiles.scp + + ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib ++..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so + ..\%__SRC%\misc\*staticdatamembers.cxx %_DEST%\inc%_EXT%\*staticdatamembers.cxx + ..\%__SRC%\misc\*staticdatamembers.h* %_DEST%\inc%_EXT%\*staticdatamembers.h* + Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/product_util_makefile.mk_irix_specific.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/product_util_makefile.mk_irix_specific.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/product_util_makefile.mk_irix_specific.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,76 @@ +--- /projects/sise/openoffice/devel/workpits/source/OpenOffice641/product/util/makefile.mk Thu Oct 11 20:10:42 2001 ++++ product/util/makefile.mk Wed Mar 6 15:49:05 2002 +@@ -77,6 +77,9 @@ + STLPORTLIBNAME=libstlport_sunpro.so + .ENDIF + ++ADDITIONAL_DLLS= \ ++ $(DESTDIRDLL)$/$(MY_DLLPREFIX)$(BINDINGDLL)$(MY_DLLPOSTFIX) ++ + .ELIF "$(OS)$(CPU)"=="SOLARISI" + ########## + # SOLARIS INTEL +@@ -91,6 +94,24 @@ + BINDINGDLL=sunpro5_uno + .ENDIF + ++ADDITIONAL_DLLS= \ ++ $(DESTDIRDLL)$/$(MY_DLLPREFIX)$(BINDINGDLL)$(MY_DLLPOSTFIX) ++ ++.ELIF "$(OS)"=="IRIX" ++########### ++# IRIX ++########### ++DESTDIRBIN=$(DESTDIR)$/irix$/bin ++DESTDIRLIB=$(DESTDIR)$/irix$/lib ++DESTDIRDLL=$(DESTDIRLIB) ++.IF "$(COM)"=="GCC" ++#BINDINGDLL=gcc2_uno ++STLPORTLIBNAME=libstlport_gcc.so ++.ELSE ++BINDINGDLL=mips_uno ++STLPORTLIBNAME=libstlport_mips.so ++.ENDIF ++ + .ELIF "$(OS)"=="LINUX" + ########### + # LINUX +@@ -101,6 +122,9 @@ + STLPORTLIBNAME=libstlport_gcc.so + BINDINGDLL=gcc2_uno + ++ADDITIONAL_DLLS= \ ++ $(DESTDIRDLL)$/$(MY_DLLPREFIX)$(BINDINGDLL)$(MY_DLLPOSTFIX) ++ + .ELIF "$(OS)"=="WNT" + ############### + # WINDOWS +@@ -110,7 +134,8 @@ + BINDINGDLL=msci_uno + ADDITIONAL_DLLS= \ + $(DESTDIRDLL)$/stlport_vc6.dll \ +- $(DESTDIRDLL)$/w9xucwrp.dll ++ $(DESTDIRDLL)$/w9xucwrp.dll \ ++ $(DESTDIRDLL)$/$(MY_DLLPREFIX)$(BINDINGDLL)$(MY_DLLPOSTFIX) + .ENDIF + + .IF "$(STLPORTLIBNAME)" != "" +@@ -231,7 +256,6 @@ + $(DESTDIRDLL)$/$(MY_DLLPREFIX)salhelper$(UDK_MAJOR)$(COM)$(MY_DLLPOSTFIX) \ + $(DESTDIRDLL)$/$(MY_DLLPREFIX)javaloader$(MY_DLLPOSTFIX) \ + $(DESTDIRDLL)$/$(MY_DLLPREFIX)juh$(MY_DLLPOSTFIX) \ +- $(DESTDIRDLL)$/$(MY_DLLPREFIX)$(BINDINGDLL)$(MY_DLLPOSTFIX) \ + $(DESTDIRDLL)$/$(MY_DLLPREFIX)java_uno$(MY_DLLPOSTFIX) \ + $(DESTDIRDLL)$/$(MY_DLLPREFIX)prot_uno_uno$(MY_DLLPOSTFIX) \ + $(DESTDIRDLL)$/$(MY_DLLPREFIX)iiop_uno$(MY_DLLPOSTFIX) \ +@@ -360,8 +384,8 @@ + $(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ + + $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST) +- +ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@ +- +ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db) ++ +ln -sf $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@ ++ +ln -sf $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db) + + $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) + $(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/sch_source_ui_view_schdrgmt.cxx_add_brackets.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/sch_source_ui_view_schdrgmt.cxx_add_brackets.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/sch_source_ui_view_schdrgmt.cxx_add_brackets.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/source/OO641/source/sch/source/ui/view/schdrgmt.cxx Thu Oct 11 08:19:43 2001 ++++ sch/source/ui/view/schdrgmt.cxx Thu Oct 11 08:20:08 2001 +@@ -135,7 +135,7 @@ + { + if( DragStat().CheckMinMoved( rPnt ) ) + { +- Vector2D aShiftVector( Vector2D( SAL_STATIC_CAST( Pair, rPnt )) - aTranslationVector ); ++ Vector2D aShiftVector( (Vector2D( SAL_STATIC_CAST( Pair, rPnt )) - aTranslationVector) ); + double fShift = aConstraintVector.Scalar( aShiftVector ) / fConstraintVecScalar; // projection + + if( fShift ) Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/solenv_inc_unxirgm.mk_fix.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/solenv_inc_unxirgm.mk_fix.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/solenv_inc_unxirgm.mk_fix.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,93 @@ +--- /projects/sise/openoffice/devel/workpits/source/OpenOffice641/solenv/inc/unxirgm.mk Fri Jun 22 21:59:44 2001 ++++ solenv/inc/unxirgm.mk Mon Dec 3 12:17:46 2001 +@@ -16,12 +16,13 @@ + #CC= CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 + CC= g++ -c + CFLAGS= $(INCLUDE) +-CDEFS+= -DVCL +-CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE ++CDEFS+= -DVCL -D_PTHREADS -DFORCE_SYSALLOC ++#CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE ++CDEFS+= -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=0x450 + # CFLAGS+= -D__STL_NATIVE_INCLUDE_PATH=/usr/include -D__STL_NATIVE_C_INCLUDE_PATH=/usr/include + # CFLAGS+= -D_STL_NATIVE_INCLUDE_PATH=/usr/include -D_STL_NATIVE_C_INCLUDE_PATH=/usr/include +-CFLAGSCC= -c +-CFLAGSCXX= -fno-for-scope -fpermissive ++CFLAGSCC= -w -c -nostdinc ++CFLAGSCXX= -w -fno-for-scope -fpermissive -nostdinc -nostdinc++ + CFLAGSOBJGUIST= + CFLAGSOBJCUIST= + CFLAGSOBJGUIMT= +@@ -45,20 +46,26 @@ + # **VALID MECHANISM SOMETIMES MISSING FOR LOCAL STANDS** + # + LINK= g++ +-LINKFLAGS= -L/usr/lib32 +-LINKFLAGSAPPGUI= -Wl,-multigot +-LINKFLAGSAPPCUI= -Wl,-multigot ++LINKFLAGS= -L/usr/lib32 -Wl,-no_unresolved + +-LINKFLAGSSHLGUI= -shared +-LINKFLAGSSHLCUI= -shared ++.IF "$(TARGETTHREAD)"=="MT" ++LINKFLAGSAPPGUI= -Wl,-multigot -nodefaultlibs ++LINKFLAGSAPPCUI= -Wl,-multigot -nodefaultlibs ++LINKFLAGSSHLGUI= -shared -nodefaultlibs ++LINKFLAGSSHLCUI= -shared -nodefaultlibs ++.ELSE ++LINKFLAGSAPPGUI= -Wl,-multigot -nodefaultlibs ++LINKFLAGSAPPCUI= -Wl,-multigot -nodefaultlibs ++LINKFLAGSSHLGUI= -shared -nodefaultlibs ++LINKFLAGSSHLCUI= -shared -nodefaultlibs ++.ENDIF + + LINKFLAGSTACK= + LINKFLAGSPROF= + LINKFLAGSDEBUG= -g + LINKFLAGSOPT= + +-LINKFLAGSSHLGUI += -Wl,-Bsymbolic +-LINKFLAGSSHLCUI += -Wl,-Bsymbolic ++SONAME_SWITCH = -Wl,-soname -Wl, + + APPLINKSTATIC=-Bstatic + APPLINKSHARED=-Bsymbolic +@@ -68,17 +75,17 @@ + STDSLOGUI= + STDOBJCUI= + STDSLOCUI= +-# STDLIBGUIST= $(DYNAMIC) -lXt -lXmu -lX11 -lc -lm +-STDLIBGUIST= $(DYNAMIC) -lX11 -lc -lm +-STDLIBCUIST= $(DYNAMIC) -lc -lm +-# STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lXt -lXmu -lX11 -lc -lm +-STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm +-STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lc -lm +-# STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lXt -lXmu -lX11 -lc -lm +-STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm +-STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lc -lm ++STDLIBGUIST= $(DYNAMIC) -lXt -lX11 -lc -lm ++STDLIBCUIST= $(DYNAMIC) -lgcc -lc ++STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lXt -lX11 -lm -lgcc -lc ++STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lgcc -lc -lm ++STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lXt -lX11 -lm -lgcc -lc ++STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lgcc -lc + THREADLIB= -lpthread + ++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc ++LIBSTLPORTST= -lstlport_gcc ++ + LIBMGR= ar + LIBFLAGS= -r + # LIBEXT= .so +@@ -103,9 +110,9 @@ + DLLPOST= .so + + +-LDUMP= ++LDUMP=c++filt + +-STDLIBCPP = -lstdc++ ++#STDLIBCPP = -lstdc++ + + # -------------------------- + # FROM THE OLE ENVIRONMENT: Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/soltools_prj_build.lst_remove_stl.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/soltools_prj_build.lst_remove_stl.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/soltools_prj_build.lst_remove_stl.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,8 @@ +--- /projects/sise/openoffice/devel/workpits/641-irix-gcc-STLP/source/soltools/prj/build.lst Tue Sep 25 02:08:34 2001 ++++ soltools/prj/build.lst Fri Nov 2 12:21:09 2001 +@@ -1,4 +1,4 @@ +-so soltools : stlport NULL ++so soltools : NULL + so soltools usr1 - all so_usr1 NULL + so soltools\inc get - all so_inc NULL + so soltools\ldump nmake - n so_ldump NULL Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/svtools_source_config_viewoptions.cxx_include_stdio.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/svtools_source_config_viewoptions.cxx_include_stdio.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/svtools_source_config_viewoptions.cxx_include_stdio.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,10 @@ +--- /projects/sise/openoffice/devel/workpits/641-irix-gcc-STLP/source/svtools/source/config/viewoptions.cxx Fri Oct 19 18:16:30 2001 ++++ svtools/source/config/viewoptions.cxx Thu Nov 8 12:00:14 2001 +@@ -66,6 +66,7 @@ + //_________________________________________________________________________________________________________________ + + #include "viewoptions.hxx" ++#include + + #ifndef _COM_SUN_STAR_UNO_ANY_HXX_ + #include Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/svtools_source_contnr_makefile.mk_gcc_crash.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/svtools_source_contnr_makefile.mk_gcc_crash.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/svtools_source_contnr_makefile.mk_gcc_crash.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,14 @@ +--- /projects/sise/openoffice/devel/workpits/641-irix-gcc-STLP/source/svtools/source/contnr/makefile.mk Mon May 21 21:13:43 2001 ++++ svtools/source/contnr/makefile.mk Mon Nov 12 14:12:53 2001 +@@ -77,6 +77,11 @@ + + # --- Files -------------------------------------------------------- + ++.IF "$(OS)"=="IRIX" ++# gcc compiler bug causes a crash hee ++CFLAGS+= -g ++.ENDIF ++ + .IF "$(COM)"=="WTC" + CFLAGS=$(CFLAGS) -od -3r + .ENDIF Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/vcl_unx_inc_saldata.hxx_add_IRIX.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/vcl_unx_inc_saldata.hxx_add_IRIX.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/vcl_unx_inc_saldata.hxx_add_IRIX.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/641-gcc-debug/source/vcl/unx/inc/saldata.hxx Sat Feb 10 01:46:35 2001 ++++ vcl/unx/inc/saldata.hxx Thu Dec 20 07:32:47 2001 +@@ -94,7 +94,7 @@ + + DECLARE_LIST( SalDisplays, SalDisplay* ) + +-#if defined SCO || defined LINUX || defined NETBSD || defined AIX || defined HPUX || defined FREEBSD ++#if defined SCO || defined LINUX || defined NETBSD || defined AIX || defined HPUX || defined FREEBSD || defined IRIX + #include + #else + typedef unsigned int pthread_t; Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/vcl_unx_source_gdi_xfont.cxx_use_stl_minmax.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/vcl_unx_source_gdi_xfont.cxx_use_stl_minmax.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/B/vcl_unx_source_gdi_xfont.cxx_use_stl_minmax.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/source/OO641/vcl/unx/source/gdi/xfont.cxx Thu Jul 12 01:45:50 2001 ++++ vcl/unx/source/gdi/xfont.cxx Tue Oct 9 08:45:26 2001 +@@ -61,6 +61,8 @@ + + #include + ++#include ++ + #ifndef EXTENDED_FONTSTRUCT_HXX + #include "xfont.hxx" + #endif Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2075.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2075.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2075.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,17 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/config_office/configure.in Tue Nov 13 08:45:53 2001 ++++ config_office/configure.in Mon Dec 3 10:41:01 2001 +@@ -716,8 +716,12 @@ + AC_MSG_ERROR([STLport4 libraries not found]) + fi + elif test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then +- if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then +- AC_MSG_RESULT([checked]) ++ if test "$CC" = "cc"; then ++ if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then ++ AC_MSG_RESULT([checked]) ++ else ++ AC_MSG_ERROR([STLport4 libraries not found]) ++ fi + else + if test -f "$STLPORT4/lib/libstlport_gcc.so"; then + AC_MSG_RESULT([checked]) Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2307_sch_source_filter_xml_SchXMLWrapper.cxx_RTL_CONSTASCII_USTRINGPARAM_typecast.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2307_sch_source_filter_xml_SchXMLWrapper.cxx_RTL_CONSTASCII_USTRINGPARAM_typecast.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2307_sch_source_filter_xml_SchXMLWrapper.cxx_RTL_CONSTASCII_USTRINGPARAM_typecast.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,47 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/sch/source/filter/xml/SchXMLWrapper.cxx Thu Oct 18 23:06:16 2001 ++++ sch/source/filter/xml/SchXMLWrapper.cxx Wed Nov 28 18:35:33 2001 +@@ -242,7 +242,7 @@ + // convert rtl::OUString => tools String => ByteString + String aStr( aEx.Message ); + ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US ); +- ByteString aBStrStreamName( String( rsStreamName ), RTL_TEXTENCODING_ASCII_US ); ++ ByteString aBStrStreamName( String( RTL_CONSTASCII_USTRINGPARAM(rsStreamName) ), RTL_TEXTENCODING_ASCII_US ); + DBG_ERROR2( "SAX parse exception caught during import of \"%s\" stream(): %s", + aBStrStreamName.GetBuffer(), + aBStr.GetBuffer()); +@@ -258,7 +258,7 @@ + // convert rtl::OUString => tools String => ByteString + String aStr( aEx.Message ); + ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US ); +- ByteString aBStrStreamName( String( rsStreamName ), RTL_TEXTENCODING_ASCII_US ); ++ ByteString aBStrStreamName( String( RTL_CONSTASCII_USTRINGPARAM(rsStreamName) ), RTL_TEXTENCODING_ASCII_US ); + DBG_ERROR2( "SAX exception caught during import of \"%s\" stream(): %s", + aBStrStreamName.GetBuffer(), + aBStr.GetBuffer()); +@@ -271,7 +271,7 @@ + // convert rtl::OUString => tools String => ByteString + String aStr( aEx.Message ); + ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US ); +- ByteString aBStrStreamName( String( rsStreamName ), RTL_TEXTENCODING_ASCII_US ); ++ ByteString aBStrStreamName( String( RTL_CONSTASCII_USTRINGPARAM(rsStreamName) ), RTL_TEXTENCODING_ASCII_US ); + DBG_ERROR2( "IO exception caught during import of \"%s\" stream(): %s", + aBStrStreamName.GetBuffer(), + aBStr.GetBuffer()); +@@ -284,7 +284,7 @@ + // convert rtl::OUString => tools String => ByteString + String aStr( aEx.Message ); + ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US ); +- ByteString aBStrStreamName( String( rsStreamName ), RTL_TEXTENCODING_ASCII_US ); ++ ByteString aBStrStreamName( String( RTL_CONSTASCII_USTRINGPARAM(rsStreamName) ), RTL_TEXTENCODING_ASCII_US ); + DBG_ERROR2( "UNO exception caught during import of \"%s\" stream(): %s", + aBStrStreamName.GetBuffer(), + aBStr.GetBuffer()); +@@ -428,7 +428,7 @@ + // convert rtl::OUString => tools String => ByteString + String aStr( aEx.Message ); + ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US ); +- ByteString aBStrStreamName( String( rsStreamName ), RTL_TEXTENCODING_ASCII_US ); ++ ByteString aBStrStreamName( String( RTL_CONSTASCII_USTRINGPARAM( rsStreamName ) ), RTL_TEXTENCODING_ASCII_US ); + DBG_ERROR2( "Exception caught during Export of \"%s\" stream(): %s", + aBStrStreamName.GetBuffer(), + aBStr.GetBuffer()); Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2307_sch_source_ui_unoidl_ChXDiagram.cxx_RTL_CONSTASCII_USTRINGPARAM_typecast.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2307_sch_source_ui_unoidl_ChXDiagram.cxx_RTL_CONSTASCII_USTRINGPARAM_typecast.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2307_sch_source_ui_unoidl_ChXDiagram.cxx_RTL_CONSTASCII_USTRINGPARAM_typecast.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/sch/source/ui/unoidl/ChXDiagram.cxx Wed Oct 10 19:26:32 2001 ++++ sch/source/ui/unoidl/ChXDiagram.cxx Wed Nov 28 17:53:44 2001 +@@ -1516,7 +1516,7 @@ + RTL_CONSTASCII_USTRINGPARAM (" is not known in :ChXDiagram::getPropertyValues")); + } + #ifdef DBG_UTIL +- ByteString sName (String(*pPropertyName), RTL_TEXTENCODING_ASCII_US); ++ ByteString sName (String(RTL_CONSTASCII_USTRINGPARAM(*pPropertyName)), RTL_TEXTENCODING_ASCII_US); + DBG_ERROR2 ("Diagram: Property %s has an invalid ID (%d)", + sName.GetBuffer(), nWID); + #endif Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2455_sw_util_makefile.mk_reorder_libraries.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2455_sw_util_makefile.mk_reorder_libraries.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2455_sw_util_makefile.mk_reorder_libraries.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,33 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/sw/util/makefile.mk Fri Nov 2 23:33:43 2001 ++++ sw/util/makefile.mk Fri Feb 15 10:10:52 2002 +@@ -173,7 +173,15 @@ + $(SLB)$/ui2.lib + + +-SHL2STDLIBS= \ ++.IF "$(GUI)" == "UNX" ++SHL2STDLIBS = \ ++ $(SCHLIB) \ ++ $(SMLIB) ++.ELSE ++SHL2STDLIBS= ++.ENDIF ++ ++SHL2STDLIBS+= \ + $(SALLIB) \ + $(SFXLIB) \ + $(OFALIB) \ +@@ -200,13 +208,6 @@ + $(UCBHELPERLIB) \ + $(XMLOFFLIB) \ + $(COMPHELPERLIB) +- +- +-.IF "$(GUI)" == "UNX" +-SHL2STDLIBS += \ +- $(SCHLIB) \ +- $(SMLIB) +-.ENDIF + + .IF "$(SOLAR_JAVA)" != "" + SHL2STDLIBS+= \ Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2456.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2456.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2456.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,40 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/solenv/inc/settings.mk Sat Oct 20 01:27:08 2001 ++++ solenv/inc/settings.mk Thu Dec 6 16:36:52 2001 +@@ -1299,7 +1299,7 @@ + .ENDIF # "$(PRJPCH)"!="" + # + # Zusammenbau der Flags und CDefs fuer GUI +-.IF "$(TARGETTYPE)"=="GUI" ++.IF "$(TARGETTYPE)"=="GUI" || "$(TARGETTYPE)"=="gui" + CDEFS+= $(CDEFSGUI) + CFLAGSSLO+=$(CFLAGSSLOGUIMT) + CDEFSSLO+=$(CDEFSSLOMT) +@@ -1307,9 +1307,14 @@ + LINKFLAGSSHL=$(LINKFLAGSSHLGUI) + STDOBJ=$(STDOBJGUI) + STDSLO=$(STDSLOGUI) ++ ++.IF "$(TARGETTHREAD)"=="ST" || "$(TARGETTHREAD)"=="st" ++STDSHL=$(STDSHLGUIST) ++.ELSE + STDSHL=$(STDSHLGUIMT) ++.ENDIF + +-.IF "$(TARGETTHREAD)"=="MT" ++.IF "$(TARGETTHREAD)"=="MT" || "$(TARGETTHREAD)"=="mt" + CDEFSOBJ+= $(CDEFSMT) $(CDEFSOBJMT) + CFLAGSOBJ+=$(CFLAGSOBJGUIMT) + STDLIB=$(STDLIBGUIMT) +@@ -1330,7 +1335,12 @@ + LINKFLAGSSHL=$(LINKFLAGSSHLCUI) + STDOBJ=$(STDOBJCUI) + STDSLO=$(STDSLOCUI) ++ ++.IF "$(TARGETTHREAD)" == "ST" || "$(TARGETTHREAD)"=="st" ++STDSHL=$(STDSHLCUIST) ++.ELSE + STDSHL=$(STDSHLCUIMT) ++.ENDIF + + .IF "$(TARGETTHREAD)" == "MT" || "$(TARGETTHREAD)"=="mt" + CDEFSOBJ+=$(CDEFSMT) $(CDEFSOBJMT) Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2717.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2717.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2717.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,35 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/product/util/makefile.mk 2001/12/17 17:15:54 1.55.2.3 ++++ product/util/makefile.mk 2002/01/07 04:37:33 +@@ -107,6 +107,13 @@ + $(DESTDIRDLL)$/libstdc++.so.3 \ + $(DESTDIRDLL)$/libstdc++.so.3.0.1 + .ENDIF ++.ELIF "$(OS)"=="IRIX" ++############### ++# IRIX ++DESTDIRBIN=$(DESTDIR)$/irix$/bin ++DESTDIRLIB=$(DESTDIR)$/irix$/lib ++DESTDIRDLL=$(DESTDIRLIB) ++STLPORTLIBNAME=libstlport_gcc.so + .ELIF "$(OS)"=="WNT" + ############### + # WINDOWS +@@ -243,13 +250,17 @@ + $(DESTDIRDLL)$/$(MY_DLLPREFIX)salhelper$(UDK_MAJOR)$(COMID)$(MY_DLLPOSTFIX) \ + $(DESTDIRDLL)$/$(MY_DLLPREFIX)javaloader$(MY_DLLPOSTFIX) \ + $(DESTDIRDLL)$/$(MY_DLLPREFIX)juh$(MY_DLLPOSTFIX) \ +- $(DESTDIRDLL)$/$(MY_DLLPREFIX)$(BINDINGDLL)$(MY_DLLPOSTFIX) \ + $(DESTDIRDLL)$/$(MY_DLLPREFIX)java_uno$(MY_DLLPOSTFIX) \ + $(DESTDIRDLL)$/$(MY_DLLPREFIX)prot_uno_uno$(MY_DLLPOSTFIX) \ + $(DESTDIRDLL)$/$(MY_DLLPREFIX)iiop_uno$(MY_DLLPOSTFIX) \ + $(DESTDIRDLL)$/$(MY_DLLPREFIX)urp_uno$(MY_DLLPOSTFIX) \ + $(STLPORTDEST) \ + $(ADDITIONAL_DLLS) ++ ++.IF "$(BINDINGDLL)"!="" ++DLLLIST+= \ ++ $(DESTDIRDLL)$/$(MY_DLLPREFIX)$(BINDINGDLL)$(MY_DLLPOSTFIX) ++.ENDIF + + DLLLIST+= \ + $(foreach,c,$(COMPONENTLIST) $(DESTDIRDLL)$/$(MY_DLLPREFIX)$c$(MY_DLLPOSTFIX)) Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2731-2.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2731-2.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2731-2.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,17 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/berkeleydb/db-3.2.9.patch Tue Jun 12 00:09:22 2001 ++++ berkeleydb/db-3.2.9.patch Fri Jan 18 11:40:45 2002 +@@ -44,2 +44,14 @@ + CC= @MAKEFILE_CC@ + CCLINK= @MAKEFILE_CCLINK@ ++*** ./unxsols3.pro/misc/db-3.2.9/dist/configure.old Tue Jan 8 13:55:08 2002 ++--- build/unxsols3.pro/db-3.2.9/dist/configure Tue Jan 8 13:56:05 2002 ++*************** ++*** 1795,1800 **** ++--- 1795,1801 ---- ++ case "$host_os" in ++ solaris*) JINCSUBDIRS="solaris";; ++ linux*) JINCSUBDIRS="linux genunix";; +++ irix*) JINCSUBDIRS="irix";; ++ *) JINCSUBDIRS="genunix";; ++ esac ++ Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2947_sal_rtl_source_strtmpl.c_FIX_CONDITIONALS.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2947_sal_rtl_source_strtmpl.c_FIX_CONDITIONALS.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/2947_sal_rtl_source_strtmpl.c_FIX_CONDITIONALS.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,16 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/sal/rtl/source/strtmpl.c Fri Jan 25 21:31:28 2002 ++++ sal/rtl/source/strtmpl.c Fri Jan 25 22:20:57 2002 +@@ -1104,9 +1104,11 @@ + } + else if ( *pStr == '+' ) + { +- if ( bExp && (nExp != 0) ) ++ if ( bExp ){ ++ if ( nExp != 0 ) + break; +- if ( fRet != 0.0 ) ++ } ++ else if ( fRet != 0.0 ) + break; + } + /* Exponent separator */ Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/3013_vcl_unx_source_gdi_salprnpsp.cxx_use_mktemp.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/3013_vcl_unx_source_gdi_salprnpsp.cxx_use_mktemp.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/3013_vcl_unx_source_gdi_salprnpsp.cxx_use_mktemp.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/vcl/unx/source/gdi/salprnpsp.cxx Wed Oct 17 23:22:31 2001 ++++ vcl/unx/source/gdi/salprnpsp.cxx Thu Feb 7 10:00:46 2002 +@@ -806,7 +806,7 @@ + { + char tmpNam[ L_tmpnam ]; + #if defined( FREEBSD ) || defined (IRIX) +- mkstemp ( tmpNam ); ++ mktemp ( tmpNam ); + #else + tmpnam_r( tmpNam ); + #endif Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/3058_sal_osl_unx_pipe.c_sizeof_sockaddr_un.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/3058_sal_osl_unx_pipe.c_sizeof_sockaddr_un.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/3058_sal_osl_unx_pipe.c_sizeof_sockaddr_un.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/sal/osl/unx/pipe.c Tue May 29 17:38:32 2001 ++++ sal/osl/unx/pipe.c Tue Feb 12 09:07:44 2002 +@@ -264,7 +264,7 @@ + + addr.sun_family = AF_UNIX; + strcpy(addr.sun_path, name); +- len = sizeof(addr.sun_family) + strlen(addr.sun_path); ++ len = sizeof(struct sockaddr_un); + + if ( Options & osl_Pipe_CREATE ) + { Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/3461_setup2_scripts_setup.sh_irix_case.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/3461_setup2_scripts_setup.sh_irix_case.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/3461_setup2_scripts_setup.sh_irix_case.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,17 @@ +--- /projects/sise/openoffice/devel/workpits/source/OO641C/setup2/script/setup.sh Sat Nov 24 02:46:33 2001 ++++ setup2/script/setup.sh Wed Mar 13 16:13:01 2002 +@@ -125,6 +125,14 @@ + LD_LIBRARY_PATH=./local:.:..:$sd_archive_path:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH + ;; ++ IRIX) ++ LD_LIBRARYN32_PATH=./local:.:..:$sd_archive_path:$LD_LIBRARYN32_PATH ++ export LD_LIBRARYN32_PATH ++ ;; ++ IRIX64) ++ LD_LIBRARYN32_PATH=./local:.:..:$sd_archive_path:$LD_LIBRARYN32_PATH ++ export LD_LIBRARYN32_PATH ++ ;; + *) + ;; + esac Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/berkleydb_makefile.mk_add_bash_to_CONFIGURE_ACTION_macro.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/berkleydb_makefile.mk_add_bash_to_CONFIGURE_ACTION_macro.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/berkleydb_makefile.mk_add_bash_to_CONFIGURE_ACTION_macro.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/berkeleydb/makefile.mk Sat Dec 1 01:42:25 2001 ++++ berkeleydb/makefile.mk Fri Jan 18 16:22:23 2002 +@@ -79,7 +79,7 @@ + .IF "$(GUI)"=="UNX" + CONFIGURE_DIR=out + #relative to CONFIGURE_DIR +-CONFIGURE_ACTION=..$/dist$/configure ++CONFIGURE_ACTION=bash ..$/dist$/configure + CONFIGURE_FLAGS=--enable-cxx --enable-java --enable-dynamic --enable-shared + + BUILD_DIR=$(CONFIGURE_DIR) Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/berkleydb_prj_d.lst_copy_db-3.2_with_trailing_period.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/berkleydb_prj_d.lst_copy_db-3.2_with_trailing_period.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/berkleydb_prj_d.lst_copy_db-3.2_with_trailing_period.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,14 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/berkeleydb/prj/d.lst Thu Jun 14 22:37:48 2001 ++++ berkeleydb/prj/d.lst Thu Dec 6 09:57:25 2001 +@@ -8,8 +8,11 @@ + ..\%__SRC%\lib\libdb_java32.lib %_DEST%\lib%_EXT%\libdb_java32.lib + + ..\%__SRC%\lib\libdb-3.2.so %_DEST%\lib%_EXT%\libdb-3.2.so ++..\%__SRC%\lib\libdb-3.2.so %_DEST%\lib%_EXT%\libdb-3.2.so. + ..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so ++..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so. + ..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so ++..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so. + + ..\%__SRC%\bin\libdb32.dll %_DEST%\bin%_EXT%\libdb32.dll + ..\%__SRC%\bin\libdb_java32.dll %_DEST%\bin%_EXT%\libdb_java32.dll Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/connectivity_source_parse_makefile.mk_invalid_bison_fname.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/connectivity_source_parse_makefile.mk_invalid_bison_fname.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/connectivity_source_parse_makefile.mk_invalid_bison_fname.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/source/OO641C/connectivity/source/parse/makefile.mk Fri Aug 10 23:09:05 2001 ++++ connectivity/source/parse/makefile.mk Wed Mar 13 15:53:23 2002 +@@ -97,7 +97,7 @@ + $(MISC)$/sqlbison.cxx: sqlbison.y + +bison -v -d -pSQLyy -l -bsql -o$(MISC)$/sqlbison.cxx sqlbison.y + -$(MKDIR) $(OUT)$/inc$/connectivity +- +$(COPY) $(MISC)$/sqlbison.cxx.h $(OUT)$/inc$/connectivity$/sqlbison.hxx ++ +$(COPY) $(MISC)$/sqlbison.hxx $(OUT)$/inc$/connectivity$/sqlbison.hxx + + $(SLO)$/sqlbison.obj : $(MISC)$/sqlbison.cxx + Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/idlc_source_makefile.mk_invalid_bison_fname.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/idlc_source_makefile.mk_invalid_bison_fname.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/idlc_source_makefile.mk_invalid_bison_fname.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,10 @@ +--- /projects/sise/openoffice/devel/workpits/source/OO641C/idlc/source/makefile.mk Wed Apr 18 21:04:25 2001 ++++ idlc/source/makefile.mk Wed Mar 13 15:54:14 2002 +@@ -148,6 +148,6 @@ + + $(MISC)$/parser.cxx: parser.yy + +bison -v -d -o$(MISC)$/parser.cxx parser.yy +- +$(COPY) $(MISC)$/parser.cxx.h $(OUT)$/inc$/parser.h ++ +$(COPY) $(MISC)$/parser.hxx $(OUT)$/inc$/parser.h + # with line statements (for debugging) + # +bison -v -d -o$(MISC)$/parser.cxx parser.yy Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/moz_prj_d.lst_fix_deliver_path.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/moz_prj_d.lst_fix_deliver_path.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/moz_prj_d.lst_fix_deliver_path.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,236 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/moz/prj/d.lst Tue Nov 20 01:29:16 2001 ++++ moz/prj/d.lst Tue Jan 22 10:33:00 2002 +@@ -113,119 +113,119 @@ + mkdir: %_DEST%\inc%_EXT%\mozilla\xpnet + mkdir: %_DEST%\inc%_EXT%\mozilla\zlib + +-..\%__SRC%\inc\* %_DEST%\inc%_EXT%\mozilla +-..\%__SRC%\inc\absync\* %_DEST%\inc%_EXT%\mozilla\absync +-..\%__SRC%\inc\accessibility\* %_DEST%\inc%_EXT%\mozilla\accessibility +-..\%__SRC%\inc\AcctIdl\* %_DEST%\inc%_EXT%\mozilla\AcctIdl +-..\%__SRC%\inc\addrbook\* %_DEST%\inc%_EXT%\mozilla\addrbook +-..\%__SRC%\inc\appcomps\* %_DEST%\inc%_EXT%\mozilla\appcomps +-..\%__SRC%\inc\appshell\* %_DEST%\inc%_EXT%\mozilla\appshell +-..\%__SRC%\inc\appstartup\* %_DEST%\inc%_EXT%\mozilla\appstartup +-..\%__SRC%\inc\bookmarks\* %_DEST%\inc%_EXT%\mozilla\bookmarks +-..\%__SRC%\inc\caps\* %_DEST%\inc%_EXT%\mozilla\caps +-..\%__SRC%\inc\chardet\* %_DEST%\inc%_EXT%\mozilla\chardet +-..\%__SRC%\inc\chrome\* %_DEST%\inc%_EXT%\mozilla\chrome +-..\%__SRC%\inc\content\* %_DEST%\inc%_EXT%\mozilla\content +-..\%__SRC%\inc\content_xsl\* %_DEST%\inc%_EXT%\mozilla\content_xsl +-..\%__SRC%\inc\content_xul\* %_DEST%\inc%_EXT%\mozilla\content_xul +-..\%__SRC%\inc\cookie\* %_DEST%\inc%_EXT%\mozilla\cookie +-..\%__SRC%\inc\docshell\* %_DEST%\inc%_EXT%\mozilla\docshell +-..\%__SRC%\inc\dom\* %_DEST%\inc%_EXT%\mozilla\dom +-..\%__SRC%\inc\editor\* %_DEST%\inc%_EXT%\mozilla\editor +-..\%__SRC%\inc\embed_base\* %_DEST%\inc%_EXT%\mozilla\embed_base +-..\%__SRC%\inc\expat\* %_DEST%\inc%_EXT%\mozilla\expat +-..\%__SRC%\inc\exthandler\* %_DEST%\inc%_EXT%\mozilla\exthandler +-..\%__SRC%\inc\find\* %_DEST%\inc%_EXT%\mozilla\find +-..\%__SRC%\inc\gfx\* %_DEST%\inc%_EXT%\mozilla\gfx +-..\%__SRC%\inc\gfx2\* %_DEST%\inc%_EXT%\mozilla\gfx2 +-..\%__SRC%\inc\gfxwin\* %_DEST%\inc%_EXT%\mozilla\gfxwin +-..\%__SRC%\inc\gkplugin\* %_DEST%\inc%_EXT%\mozilla\gkplugin +-..\%__SRC%\inc\helperAppDlg\* %_DEST%\inc%_EXT%\mozilla\helperAppDlg +-..\%__SRC%\inc\history\* %_DEST%\inc%_EXT%\mozilla\history +-..\%__SRC%\inc\htmlparser\* %_DEST%\inc%_EXT%\mozilla\htmlparser +-..\%__SRC%\inc\imgicon\* %_DEST%\inc%_EXT%\mozilla\imgicon +-..\%__SRC%\inc\imglib2\* %_DEST%\inc%_EXT%\mozilla\imglib2 +-..\%__SRC%\inc\import\* %_DEST%\inc%_EXT%\mozilla\import +-..\%__SRC%\inc\intl\* %_DEST%\inc%_EXT%\mozilla\intl +-..\%__SRC%\inc\intlcmpt\* %_DEST%\inc%_EXT%\mozilla\intlcmpt +-..\%__SRC%\inc\jar\* %_DEST%\inc%_EXT%\mozilla\jar +-..\%__SRC%\inc\java\* %_DEST%\inc%_EXT%\mozilla\java +-..\%__SRC%\inc\jpeg\* %_DEST%\inc%_EXT%\mozilla\jpeg +-..\%__SRC%\inc\js\* %_DEST%\inc%_EXT%\mozilla\js +-..\%__SRC%\inc\jsconsole\* %_DEST%\inc%_EXT%\mozilla\jsconsole +-..\%__SRC%\inc\jsurl\* %_DEST%\inc%_EXT%\mozilla\jsurl +-..\%__SRC%\inc\layout\* %_DEST%\inc%_EXT%\mozilla\layout +-..\%__SRC%\inc\layout_xul\* %_DEST%\inc%_EXT%\mozilla\layout_xul +-..\%__SRC%\inc\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap +-..\%__SRC%\inc\ldap\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap\ldap +-..\%__SRC%\inc\locale\* %_DEST%\inc%_EXT%\mozilla\locale +-..\%__SRC%\inc\lwbrk\* %_DEST%\inc%_EXT%\mozilla\lwbrk +-..\%__SRC%\inc\mailnews\* %_DEST%\inc%_EXT%\mozilla\mailnews +-..\%__SRC%\inc\mime\* %_DEST%\inc%_EXT%\mozilla\mime +-..\%__SRC%\inc\mimeemitter\* %_DEST%\inc%_EXT%\mozilla\mimeemitter +-..\%__SRC%\inc\mimetype\* %_DEST%\inc%_EXT%\mozilla\mimetype +-..\%__SRC%\inc\mng\* %_DEST%\inc%_EXT%\mozilla\mng +-..\%__SRC%\inc\mork\* %_DEST%\inc%_EXT%\mozilla\mork +-..\%__SRC%\inc\mozbrwsr\* %_DEST%\inc%_EXT%\mozilla\mozbrwsr +-..\%__SRC%\inc\mozldap\* %_DEST%\inc%_EXT%\mozilla\mozldap +-..\%__SRC%\inc\mozreg\* %_DEST%\inc%_EXT%\mozilla\mozreg +-..\%__SRC%\inc\mpfilelocprovider\* %_DEST%\inc%_EXT%\mozilla\mpfilelocprovider +-..\%__SRC%\inc\msgbase\* %_DEST%\inc%_EXT%\mozilla\msgbase +-..\%__SRC%\inc\msgbaseutil\* %_DEST%\inc%_EXT%\mozilla\msgbaseutil +-..\%__SRC%\inc\msgcompo\* %_DEST%\inc%_EXT%\mozilla\msgcompo +-..\%__SRC%\inc\msgdb\* %_DEST%\inc%_EXT%\mozilla\msgdb +-..\%__SRC%\inc\msgimap\* %_DEST%\inc%_EXT%\mozilla\msgimap +-..\%__SRC%\inc\msglocal\* %_DEST%\inc%_EXT%\mozilla\msglocal +-..\%__SRC%\inc\msgnews\* %_DEST%\inc%_EXT%\mozilla\msgnews +-..\%__SRC%\inc\msgsearch\* %_DEST%\inc%_EXT%\mozilla\msgsearch +-..\%__SRC%\inc\necko\* %_DEST%\inc%_EXT%\mozilla\necko +-..\%__SRC%\inc\necko2\* %_DEST%\inc%_EXT%\mozilla\necko2 +-..\%__SRC%\inc\nkcache\* %_DEST%\inc%_EXT%\mozilla\nkcache +-..\%__SRC%\inc\nspr\* %_DEST%\inc%_EXT%\mozilla\nspr +-..\%__SRC%\inc\nspr\obsolete\* %_DEST%\inc%_EXT%\mozilla\nspr\obsolete +-..\%__SRC%\inc\nspr\private\* %_DEST%\inc%_EXT%\mozilla\nspr\private +-..\%__SRC%\inc\nsprefm\* %_DEST%\inc%_EXT%\mozilla\nsprefm +-..\%__SRC%\inc\oji\* %_DEST%\inc%_EXT%\mozilla\oji +-..\%__SRC%\inc\plugin\* %_DEST%\inc%_EXT%\mozilla\plugin +-..\%__SRC%\inc\png\* %_DEST%\inc%_EXT%\mozilla\png +-..\%__SRC%\inc\pref\* %_DEST%\inc%_EXT%\mozilla\pref +-..\%__SRC%\inc\prefmigr\* %_DEST%\inc%_EXT%\mozilla\prefmigr +-..\%__SRC%\inc\profile\* %_DEST%\inc%_EXT%\mozilla\profile +-..\%__SRC%\inc\rdf\* %_DEST%\inc%_EXT%\mozilla\rdf +-..\%__SRC%\inc\rdfutil\* %_DEST%\inc%_EXT%\mozilla\rdfutil +-..\%__SRC%\inc\regviewer\* %_DEST%\inc%_EXT%\mozilla\regviewer +-..\%__SRC%\inc\related\* %_DEST%\inc%_EXT%\mozilla\related +-..\%__SRC%\inc\search\* %_DEST%\inc%_EXT%\mozilla\search +-..\%__SRC%\inc\setuprsc\* %_DEST%\inc%_EXT%\mozilla\setuprsc +-..\%__SRC%\inc\shistory\* %_DEST%\inc%_EXT%\mozilla\shistory +-..\%__SRC%\inc\sidebar\* %_DEST%\inc%_EXT%\mozilla\sidebar +-..\%__SRC%\inc\signonviewer\* %_DEST%\inc%_EXT%\mozilla\signonviewer +-..\%__SRC%\inc\string\* %_DEST%\inc%_EXT%\mozilla\string +-..\%__SRC%\inc\timer\* %_DEST%\inc%_EXT%\mozilla\timer +-..\%__SRC%\inc\transformiix\* %_DEST%\inc%_EXT%\mozilla\transformiix +-..\%__SRC%\inc\txmgr\* %_DEST%\inc%_EXT%\mozilla\txmgr +-..\%__SRC%\inc\txtsvc\* %_DEST%\inc%_EXT%\mozilla\txtsvc +-..\%__SRC%\inc\uconv\* %_DEST%\inc%_EXT%\mozilla\uconv +-..\%__SRC%\inc\unicharutil\* %_DEST%\inc%_EXT%\mozilla\unicharutil +-..\%__SRC%\inc\uninstall\* %_DEST%\inc%_EXT%\mozilla\uninstall +-..\%__SRC%\inc\uriloader\* %_DEST%\inc%_EXT%\mozilla\uriloader +-..\%__SRC%\inc\urlbarhistory\* %_DEST%\inc%_EXT%\mozilla\urlbarhistory +-..\%__SRC%\inc\util\* %_DEST%\inc%_EXT%\mozilla\util +-..\%__SRC%\inc\view\* %_DEST%\inc%_EXT%\mozilla\view +-..\%__SRC%\inc\wallet\* %_DEST%\inc%_EXT%\mozilla\wallet +-..\%__SRC%\inc\walleteditor\* %_DEST%\inc%_EXT%\mozilla\walleteditor +-..\%__SRC%\inc\walletpreview\* %_DEST%\inc%_EXT%\mozilla\walletpreview +-..\%__SRC%\inc\webBrowser_core\* %_DEST%\inc%_EXT%\mozilla\webBrowser_core +-..\%__SRC%\inc\webshell\* %_DEST%\inc%_EXT%\mozilla\webshell +-..\%__SRC%\inc\widget\* %_DEST%\inc%_EXT%\mozilla\widget +-..\%__SRC%\inc\windowwatcher\* %_DEST%\inc%_EXT%\mozilla\windowwatcher +-..\%__SRC%\inc\xml-rpc\* %_DEST%\inc%_EXT%\mozilla\xml-rpc +-..\%__SRC%\inc\xmlextras\* %_DEST%\inc%_EXT%\mozilla\xmlextras +-..\%__SRC%\inc\xpcom\* %_DEST%\inc%_EXT%\mozilla\xpcom +-..\%__SRC%\inc\xpconnect\* %_DEST%\inc%_EXT%\mozilla\xpconnect +-..\%__SRC%\inc\xpicleanup\* %_DEST%\inc%_EXT%\mozilla\xpicleanup +-..\%__SRC%\inc\xpinstall\* %_DEST%\inc%_EXT%\mozilla\xpinstall +-..\%__SRC%\inc\xpnet\* %_DEST%\inc%_EXT%\mozilla\xpnet +-..\%__SRC%\inc\zlib\* %_DEST%\inc%_EXT%\mozilla\zlib ++..\%__SRC%\inc\mozilla\* %_DEST%\inc%_EXT%\mozilla ++..\%__SRC%\inc\mozilla\absync\* %_DEST%\inc%_EXT%\mozilla\absync ++..\%__SRC%\inc\mozilla\accessibility\* %_DEST%\inc%_EXT%\mozilla\accessibility ++..\%__SRC%\inc\mozilla\AcctIdl\* %_DEST%\inc%_EXT%\mozilla\AcctIdl ++..\%__SRC%\inc\mozilla\addrbook\* %_DEST%\inc%_EXT%\mozilla\addrbook ++..\%__SRC%\inc\mozilla\appcomps\* %_DEST%\inc%_EXT%\mozilla\appcomps ++..\%__SRC%\inc\mozilla\appshell\* %_DEST%\inc%_EXT%\mozilla\appshell ++..\%__SRC%\inc\mozilla\appstartup\* %_DEST%\inc%_EXT%\mozilla\appstartup ++..\%__SRC%\inc\mozilla\bookmarks\* %_DEST%\inc%_EXT%\mozilla\bookmarks ++..\%__SRC%\inc\mozilla\caps\* %_DEST%\inc%_EXT%\mozilla\caps ++..\%__SRC%\inc\mozilla\chardet\* %_DEST%\inc%_EXT%\mozilla\chardet ++..\%__SRC%\inc\mozilla\chrome\* %_DEST%\inc%_EXT%\mozilla\chrome ++..\%__SRC%\inc\mozilla\content\* %_DEST%\inc%_EXT%\mozilla\content ++..\%__SRC%\inc\mozilla\content_xsl\* %_DEST%\inc%_EXT%\mozilla\content_xsl ++..\%__SRC%\inc\mozilla\content_xul\* %_DEST%\inc%_EXT%\mozilla\content_xul ++..\%__SRC%\inc\mozilla\cookie\* %_DEST%\inc%_EXT%\mozilla\cookie ++..\%__SRC%\inc\mozilla\docshell\* %_DEST%\inc%_EXT%\mozilla\docshell ++..\%__SRC%\inc\mozilla\dom\* %_DEST%\inc%_EXT%\mozilla\dom ++..\%__SRC%\inc\mozilla\editor\* %_DEST%\inc%_EXT%\mozilla\editor ++..\%__SRC%\inc\mozilla\embed_base\* %_DEST%\inc%_EXT%\mozilla\embed_base ++..\%__SRC%\inc\mozilla\expat\* %_DEST%\inc%_EXT%\mozilla\expat ++..\%__SRC%\inc\mozilla\exthandler\* %_DEST%\inc%_EXT%\mozilla\exthandler ++..\%__SRC%\inc\mozilla\find\* %_DEST%\inc%_EXT%\mozilla\find ++..\%__SRC%\inc\mozilla\gfx\* %_DEST%\inc%_EXT%\mozilla\gfx ++..\%__SRC%\inc\mozilla\gfx2\* %_DEST%\inc%_EXT%\mozilla\gfx2 ++..\%__SRC%\inc\mozilla\gfxwin\* %_DEST%\inc%_EXT%\mozilla\gfxwin ++..\%__SRC%\inc\mozilla\gkplugin\* %_DEST%\inc%_EXT%\mozilla\gkplugin ++..\%__SRC%\inc\mozilla\helperAppDlg\* %_DEST%\inc%_EXT%\mozilla\helperAppDlg ++..\%__SRC%\inc\mozilla\history\* %_DEST%\inc%_EXT%\mozilla\history ++..\%__SRC%\inc\mozilla\htmlparser\* %_DEST%\inc%_EXT%\mozilla\htmlparser ++..\%__SRC%\inc\mozilla\imgicon\* %_DEST%\inc%_EXT%\mozilla\imgicon ++..\%__SRC%\inc\mozilla\imglib2\* %_DEST%\inc%_EXT%\mozilla\imglib2 ++..\%__SRC%\inc\mozilla\import\* %_DEST%\inc%_EXT%\mozilla\import ++..\%__SRC%\inc\mozilla\intl\* %_DEST%\inc%_EXT%\mozilla\intl ++..\%__SRC%\inc\mozilla\intlcmpt\* %_DEST%\inc%_EXT%\mozilla\intlcmpt ++..\%__SRC%\inc\mozilla\jar\* %_DEST%\inc%_EXT%\mozilla\jar ++..\%__SRC%\inc\mozilla\java\* %_DEST%\inc%_EXT%\mozilla\java ++..\%__SRC%\inc\mozilla\jpeg\* %_DEST%\inc%_EXT%\mozilla\jpeg ++..\%__SRC%\inc\mozilla\js\* %_DEST%\inc%_EXT%\mozilla\js ++..\%__SRC%\inc\mozilla\jsconsole\* %_DEST%\inc%_EXT%\mozilla\jsconsole ++..\%__SRC%\inc\mozilla\jsurl\* %_DEST%\inc%_EXT%\mozilla\jsurl ++..\%__SRC%\inc\mozilla\layout\* %_DEST%\inc%_EXT%\mozilla\layout ++..\%__SRC%\inc\mozilla\layout_xul\* %_DEST%\inc%_EXT%\mozilla\layout_xul ++..\%__SRC%\inc\mozilla\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap ++..\%__SRC%\inc\mozilla\ldap\ldap\* %_DEST%\inc%_EXT%\mozilla\ldap\ldap ++..\%__SRC%\inc\mozilla\locale\* %_DEST%\inc%_EXT%\mozilla\locale ++..\%__SRC%\inc\mozilla\lwbrk\* %_DEST%\inc%_EXT%\mozilla\lwbrk ++..\%__SRC%\inc\mozilla\mailnews\* %_DEST%\inc%_EXT%\mozilla\mailnews ++..\%__SRC%\inc\mozilla\mime\* %_DEST%\inc%_EXT%\mozilla\mime ++..\%__SRC%\inc\mozilla\mimeemitter\* %_DEST%\inc%_EXT%\mozilla\mimeemitter ++..\%__SRC%\inc\mozilla\mimetype\* %_DEST%\inc%_EXT%\mozilla\mimetype ++..\%__SRC%\inc\mozilla\mng\* %_DEST%\inc%_EXT%\mozilla\mng ++..\%__SRC%\inc\mozilla\mork\* %_DEST%\inc%_EXT%\mozilla\mork ++..\%__SRC%\inc\mozilla\mozbrwsr\* %_DEST%\inc%_EXT%\mozilla\mozbrwsr ++..\%__SRC%\inc\mozilla\mozldap\* %_DEST%\inc%_EXT%\mozilla\mozldap ++..\%__SRC%\inc\mozilla\mozreg\* %_DEST%\inc%_EXT%\mozilla\mozreg ++..\%__SRC%\inc\mozilla\mpfilelocprovider\* %_DEST%\inc%_EXT%\mozilla\mpfilelocprovider ++..\%__SRC%\inc\mozilla\msgbase\* %_DEST%\inc%_EXT%\mozilla\msgbase ++..\%__SRC%\inc\mozilla\msgbaseutil\* %_DEST%\inc%_EXT%\mozilla\msgbaseutil ++..\%__SRC%\inc\mozilla\msgcompo\* %_DEST%\inc%_EXT%\mozilla\msgcompo ++..\%__SRC%\inc\mozilla\msgdb\* %_DEST%\inc%_EXT%\mozilla\msgdb ++..\%__SRC%\inc\mozilla\msgimap\* %_DEST%\inc%_EXT%\mozilla\msgimap ++..\%__SRC%\inc\mozilla\msglocal\* %_DEST%\inc%_EXT%\mozilla\msglocal ++..\%__SRC%\inc\mozilla\msgnews\* %_DEST%\inc%_EXT%\mozilla\msgnews ++..\%__SRC%\inc\mozilla\msgsearch\* %_DEST%\inc%_EXT%\mozilla\msgsearch ++..\%__SRC%\inc\mozilla\necko\* %_DEST%\inc%_EXT%\mozilla\necko ++..\%__SRC%\inc\mozilla\necko2\* %_DEST%\inc%_EXT%\mozilla\necko2 ++..\%__SRC%\inc\mozilla\nkcache\* %_DEST%\inc%_EXT%\mozilla\nkcache ++..\%__SRC%\inc\mozilla\nspr\* %_DEST%\inc%_EXT%\mozilla\nspr ++..\%__SRC%\inc\mozilla\nspr\obsolete\* %_DEST%\inc%_EXT%\mozilla\nspr\obsolete ++..\%__SRC%\inc\mozilla\nspr\private\* %_DEST%\inc%_EXT%\mozilla\nspr\private ++..\%__SRC%\inc\mozilla\nsprefm\* %_DEST%\inc%_EXT%\mozilla\nsprefm ++..\%__SRC%\inc\mozilla\oji\* %_DEST%\inc%_EXT%\mozilla\oji ++..\%__SRC%\inc\mozilla\plugin\* %_DEST%\inc%_EXT%\mozilla\plugin ++..\%__SRC%\inc\mozilla\png\* %_DEST%\inc%_EXT%\mozilla\png ++..\%__SRC%\inc\mozilla\pref\* %_DEST%\inc%_EXT%\mozilla\pref ++..\%__SRC%\inc\mozilla\prefmigr\* %_DEST%\inc%_EXT%\mozilla\prefmigr ++..\%__SRC%\inc\mozilla\profile\* %_DEST%\inc%_EXT%\mozilla\profile ++..\%__SRC%\inc\mozilla\rdf\* %_DEST%\inc%_EXT%\mozilla\rdf ++..\%__SRC%\inc\mozilla\rdfutil\* %_DEST%\inc%_EXT%\mozilla\rdfutil ++..\%__SRC%\inc\mozilla\regviewer\* %_DEST%\inc%_EXT%\mozilla\regviewer ++..\%__SRC%\inc\mozilla\related\* %_DEST%\inc%_EXT%\mozilla\related ++..\%__SRC%\inc\mozilla\search\* %_DEST%\inc%_EXT%\mozilla\search ++..\%__SRC%\inc\mozilla\setuprsc\* %_DEST%\inc%_EXT%\mozilla\setuprsc ++..\%__SRC%\inc\mozilla\shistory\* %_DEST%\inc%_EXT%\mozilla\shistory ++..\%__SRC%\inc\mozilla\sidebar\* %_DEST%\inc%_EXT%\mozilla\sidebar ++..\%__SRC%\inc\mozilla\signonviewer\* %_DEST%\inc%_EXT%\mozilla\signonviewer ++..\%__SRC%\inc\mozilla\string\* %_DEST%\inc%_EXT%\mozilla\string ++..\%__SRC%\inc\mozilla\timer\* %_DEST%\inc%_EXT%\mozilla\timer ++..\%__SRC%\inc\mozilla\transformiix\* %_DEST%\inc%_EXT%\mozilla\transformiix ++..\%__SRC%\inc\mozilla\txmgr\* %_DEST%\inc%_EXT%\mozilla\txmgr ++..\%__SRC%\inc\mozilla\txtsvc\* %_DEST%\inc%_EXT%\mozilla\txtsvc ++..\%__SRC%\inc\mozilla\uconv\* %_DEST%\inc%_EXT%\mozilla\uconv ++..\%__SRC%\inc\mozilla\unicharutil\* %_DEST%\inc%_EXT%\mozilla\unicharutil ++..\%__SRC%\inc\mozilla\uninstall\* %_DEST%\inc%_EXT%\mozilla\uninstall ++..\%__SRC%\inc\mozilla\uriloader\* %_DEST%\inc%_EXT%\mozilla\uriloader ++..\%__SRC%\inc\mozilla\urlbarhistory\* %_DEST%\inc%_EXT%\mozilla\urlbarhistory ++..\%__SRC%\inc\mozilla\util\* %_DEST%\inc%_EXT%\mozilla\util ++..\%__SRC%\inc\mozilla\view\* %_DEST%\inc%_EXT%\mozilla\view ++..\%__SRC%\inc\mozilla\wallet\* %_DEST%\inc%_EXT%\mozilla\wallet ++..\%__SRC%\inc\mozilla\walleteditor\* %_DEST%\inc%_EXT%\mozilla\walleteditor ++..\%__SRC%\inc\mozilla\walletpreview\* %_DEST%\inc%_EXT%\mozilla\walletpreview ++..\%__SRC%\inc\mozilla\webBrowser_core\* %_DEST%\inc%_EXT%\mozilla\webBrowser_core ++..\%__SRC%\inc\mozilla\webshell\* %_DEST%\inc%_EXT%\mozilla\webshell ++..\%__SRC%\inc\mozilla\widget\* %_DEST%\inc%_EXT%\mozilla\widget ++..\%__SRC%\inc\mozilla\windowwatcher\* %_DEST%\inc%_EXT%\mozilla\windowwatcher ++..\%__SRC%\inc\mozilla\xml-rpc\* %_DEST%\inc%_EXT%\mozilla\xml-rpc ++..\%__SRC%\inc\mozilla\xmlextras\* %_DEST%\inc%_EXT%\mozilla\xmlextras ++..\%__SRC%\inc\mozilla\xpcom\* %_DEST%\inc%_EXT%\mozilla\xpcom ++..\%__SRC%\inc\mozilla\xpconnect\* %_DEST%\inc%_EXT%\mozilla\xpconnect ++..\%__SRC%\inc\mozilla\xpicleanup\* %_DEST%\inc%_EXT%\mozilla\xpicleanup ++..\%__SRC%\inc\mozilla\xpinstall\* %_DEST%\inc%_EXT%\mozilla\xpinstall ++..\%__SRC%\inc\mozilla\xpnet\* %_DEST%\inc%_EXT%\mozilla\xpnet ++..\%__SRC%\inc\mozilla\zlib\* %_DEST%\inc%_EXT%\mozilla\zlib + ..\%__SRC%\lib\* %_DEST%\lib%_EXT% + ..\%__SRC%\bin\*.zip %_DEST%\bin%_EXT% Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/sablot_Sablot-0.52.patch_define_unistd.h_for_IRIX.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/sablot_Sablot-0.52.patch_define_unistd.h_for_IRIX.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/sablot_Sablot-0.52.patch_define_unistd.h_for_IRIX.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,11 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/sablot/Sablot-0.52.patch Mon Jan 21 09:13:45 2002 ++++ sablot/Sablot-0.52.patch Mon Jan 21 09:13:15 2002 +@@ -85,7 +85,7 @@ + ! CFLAGS+= -DHAVE_IEEEFP_H + ! .ENDIF + ! +-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" ++! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="IRIX" + ! CFLAGS+= -DHAVE_UNISTD_H + ! .ENDIF + ! Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/sal_util_makefile.mk_add_target_for_minormkchanged.flg.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/sal_util_makefile.mk_add_target_for_minormkchanged.flg.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/sal_util_makefile.mk_add_target_for_minormkchanged.flg.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,13 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/sal/util/makefile.mk Thu Sep 20 01:13:45 2001 ++++ sal/util/makefile.mk Fri Jan 18 15:48:27 2002 +@@ -229,6 +229,10 @@ + + .INCLUDE : target.mk + ++.IF "$(OS)"=="IRIX" ++$(SOLARINCDIR)$/minormkchanged.flg: ++ +@touch $@ ++.ENDIF + + .IF "$(SHL1TARGETN)" != "" + $(SHL1TARGETN) : $(OUT)$/inc$/udkversion.h Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/shell_prj_build.lst_replace_offapi_dependency_with_offuh.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/shell_prj_build.lst_replace_offapi_dependency_with_offuh.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/shell_prj_build.lst_replace_offapi_dependency_with_offuh.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,8 @@ +--- /projects/sise/openoffice/devel/workpits/source/OO641C/shell/prj/build.lst Fri Nov 16 22:21:29 2001 ++++ shell/prj/build.lst Thu Mar 14 10:25:26 2002 +@@ -1,4 +1,4 @@ +-sh shell : offapi rdbmaker NULL ++sh shell : offuh rdbmaker NULL + sh shell\source\win32\ nmake - w sh_win32 NULL + sh shell\source\win32\simplemail nmake - w sh_win32_simplemail NULL + sh shell\source\unix\exec nmake - u sh_win32 NULL Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/solenv_inc_unxirgm.pro_refine_macros.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/solenv_inc_unxirgm.pro_refine_macros.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/solenv_inc_unxirgm.pro_refine_macros.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,60 @@ +--- /projects/sise/openoffice/devel/workpits/source/OO641C/solenv/inc/unxirgm.mk Wed Mar 13 16:39:42 2002 ++++ solenv/inc/unxirgm.mk Wed Mar 13 16:36:35 2002 +@@ -16,9 +16,9 @@ + #CC= CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 + CC= g++ -c + CFLAGS= $(INCLUDE) +-CDEFS+= -DVCL -D_PTHREADS +-CDEFS+= -D_STD_NO_NAMESPACE -D_UNO_NO_NAMESPACE -DHAVE_UNISTD_H -DSTLPORT_VERSION=0x450 +-#CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -DHAVE_UNISTD_H -DSTLPORT_VERSION=0x450 ++CDEFS+= -DVCL -D_PTHREADS -DFORCE_SYSALLOC ++#CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE ++CDEFS+= -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=0x450 + # CFLAGS+= -D__STL_NATIVE_INCLUDE_PATH=/usr/include -D__STL_NATIVE_C_INCLUDE_PATH=/usr/include + # CFLAGS+= -D_STL_NATIVE_INCLUDE_PATH=/usr/include -D_STL_NATIVE_C_INCLUDE_PATH=/usr/include + CFLAGSCC= -w -c -nostdinc +@@ -45,14 +45,15 @@ + # -update_registry : Is needed to link several shared libraries + # **VALID MECHANISM SOMETIMES MISSING FOR LOCAL STANDS** + # + LINK= g++ + LINKFLAGS= -L/usr/lib32 -Wl,-no_unresolved ++LINKVERSIONMAPFLAG= -Wl,-exports_file + + .IF "$(TARGETTHREAD)"=="MT" +-LINKFLAGSAPPGUI= $(THREADLIB) -Wl,-multigot -nodefaultlibs +-LINKFLAGSAPPCUI= $(THREADLIB) -Wl,-multigot -nodefaultlibs +-LINKFLAGSSHLGUI= $(THREADLIB) -shared -nodefaultlibs +-LINKFLAGSSHLCUI= $(THREADLIB) -shared -nodefaultlibs ++LINKFLAGSAPPGUI= -Wl,-multigot -nodefaultlibs ++LINKFLAGSAPPCUI= -Wl,-multigot -nodefaultlibs ++LINKFLAGSSHLGUI= -shared -nodefaultlibs ++LINKFLAGSSHLCUI= -shared -nodefaultlibs + .ELSE + LINKFLAGSAPPGUI= -Wl,-multigot -nodefaultlibs + LINKFLAGSAPPCUI= -Wl,-multigot -nodefaultlibs +@@ -65,8 +66,7 @@ + LINKFLAGSDEBUG= -g + LINKFLAGSOPT= + +-#LINKFLAGSSHLGUI += -Wl,-Bsymbolic -Wl,-soname -Wl,$(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOST) $(DYNAMIC) +-#LINKFLAGSSHLCUI += -Wl,-Bsymbolic -Wl,-soname -Wl,$(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOST) $(DYNAMIC) ++SONAME_SWITCH = -Wl,-soname -Wl, + + APPLINKSTATIC=-Bstatic + APPLINKSHARED=-Bsymbolic +@@ -76,11 +76,11 @@ + STDSLOGUI= + STDOBJCUI= + STDSLOCUI= +-STDLIBGUIST= $(DYNAMIC) -lX11 -lc -lm ++STDLIBGUIST= $(DYNAMIC) -lXt -lX11 -lc -lm + STDLIBCUIST= $(DYNAMIC) -lgcc -lc +-STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc ++STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lXt -lX11 -lm -lgcc -lc + STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lgcc -lc -lm +-STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc ++STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lXt -lX11 -lm -lgcc -lc + STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lgcc -lc + THREADLIB= -lpthread + Added: websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/tools_prj_build.lst_add_offuh_as_dependency.diff ============================================================================== --- websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/tools_prj_build.lst_add_offuh_as_dependency.diff (added) +++ websites/staging/ooo-site/trunk/content/porting/irix/build_inst/patches/C/tools_prj_build.lst_add_offuh_as_dependency.diff Wed Nov 16 22:28:21 2011 @@ -0,0 +1,8 @@ +--- /projects/sise/openoffice/devel/workpits/OOo641C/workarea/tools/prj/build.lst Mon Jan 7 08:16:15 2002 ++++ tools/prj/build.lst Mon Jan 21 15:54:47 2002 +@@ -1,4 +1,4 @@ +-tl tools : cppu offapi external vos NULL ++tl tools : cppu offuh external vos NULL + tl tools usr1 - all tl_mkout NULL + tl tools\bootstrp\isdll get - all tl_bsisdll NULL + tl tools\bootstrp\addexes get - all tl_bsexes NULL