Return-Path: X-Original-To: apmail-openoffice-commits-archive@www.apache.org Delivered-To: apmail-openoffice-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0243D100DA for ; Thu, 6 Jun 2013 15:25:38 +0000 (UTC) Received: (qmail 3860 invoked by uid 500); 6 Jun 2013 15:25:37 -0000 Delivered-To: apmail-openoffice-commits-archive@openoffice.apache.org Received: (qmail 3741 invoked by uid 500); 6 Jun 2013 15:25:34 -0000 Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list commits@openoffice.apache.org Received: (qmail 3733 invoked by uid 99); 6 Jun 2013 15:25:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jun 2013 15:25:34 +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; Thu, 06 Jun 2013 15:25:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B8B4323888E3; Thu, 6 Jun 2013 15:25:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1490324 - in /openoffice/trunk/main: RepositoryFixes.mk solenv/gbuild/platform/windows.mk solenv/inc/wntmsci11.mk soltools/mkdepend/makefile.mk Date: Thu, 06 Jun 2013 15:25:10 -0000 To: commits@openoffice.apache.org From: hdu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130606152510.B8B4323888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hdu Date: Thu Jun 6 15:25:09 2013 New Revision: 1490324 URL: http://svn.apache.org/r1490324 Log: #i122378# fix the dbgutil-enabled build on Windows crt-debug libraries use different structure layouts than their regular counterparts so mixing causes binary incompatibilities which must be avoided. Always using the regular libs achieves this. Modified: openoffice/trunk/main/RepositoryFixes.mk openoffice/trunk/main/solenv/gbuild/platform/windows.mk openoffice/trunk/main/solenv/inc/wntmsci11.mk openoffice/trunk/main/soltools/mkdepend/makefile.mk Modified: openoffice/trunk/main/RepositoryFixes.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryFixes.mk?rev=1490324&r1=1490323&r2=1490324&view=diff ============================================================================== --- openoffice/trunk/main/RepositoryFixes.mk (original) +++ openoffice/trunk/main/RepositoryFixes.mk Thu Jun 6 15:25:09 2013 @@ -76,12 +76,8 @@ gb_Library_FILENAMES := $(patsubst rdf:i gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES)) ifeq ($(USE_SYSTEM_STL),YES) -ifeq ($(gb_PRODUCT),$(true)) gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES)) else -gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprtd%,$(gb_Library_FILENAMES)) -endif -else ifeq ($(gb_PRODUCT),$(true)) gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES)) else @@ -136,12 +132,8 @@ gb_Library_FILENAMES := $(patsubst z:iz% gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES)) ifeq ($(USE_SYSTEM_STL),YES) -ifeq ($(gb_PRODUCT),$(true)) gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES)) else -gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprtd%,$(gb_Library_FILENAMES)) -endif -else ifeq ($(gb_PRODUCT),$(true)) gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES)) else Modified: openoffice/trunk/main/solenv/gbuild/platform/windows.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/windows.mk?rev=1490324&r1=1490323&r2=1490324&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/platform/windows.mk (original) +++ openoffice/trunk/main/solenv/gbuild/platform/windows.mk Thu Jun 6 15:25:09 2013 @@ -484,7 +484,7 @@ ifeq ($(USE_SYSTEM_STL),YES) ifeq ($(gb_PRODUCT),$(true)) gb_Library_STLEXT := msvcprt.lib else -gb_Library_STLEXT := msvcprtd.lib +gb_Library_STLEXT := msvcprt.lib endif else ifeq ($(gb_PRODUCT),$(true)) Modified: openoffice/trunk/main/solenv/inc/wntmsci11.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/wntmsci11.mk?rev=1490324&r1=1490323&r2=1490324&view=diff ============================================================================== --- openoffice/trunk/main/solenv/inc/wntmsci11.mk (original) +++ openoffice/trunk/main/solenv/inc/wntmsci11.mk Thu Jun 6 15:25:09 2013 @@ -285,13 +285,13 @@ LINKFLAGSOPT= UWINAPILIB*=uwinapi.lib .IF "$(DYNAMIC_CRT)"!="" .IF "$(USE_STLP_DEBUG)" != "" -LIBCMT=msvcrtd.lib +LIBCMT=msvcrt.lib .ELSE # "$(USE_STLP_DEBUG)" != "" LIBCMT=msvcrt.lib .ENDIF # "$(USE_STLP_DEBUG)" != "" .ELSE # "$(DYNAMIC_CRT)"!="" .IF "$(USE_STLP_DEBUG)" != "" -LIBCMT=libcmtd.lib +LIBCMT=libcmt.lib CDEFS+=-D_DEBUG .ELSE # "$(USE_STLP_DEBUG)" != "" LIBCMT=libcmt.lib @@ -312,13 +312,13 @@ STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kern .IF "$(USE_SYSTEM_STL)" == "YES" .IF "$(DYNAMIC_CRT)"!="" .IF "$(USE_STLP_DEBUG)" != "" -LIBCMT+= msvcprtd.lib +LIBCMT+= msvcprt.lib .ELSE LIBCMT+= msvcprt.lib .ENDIF .ELSE # "$(DYNAMIC_CRT)"=="" .IF "$(USE_STLP_DEBUG)" != "" -LIBCMT+= libcpmtd.lib +LIBCMT+= libcpmt.lib .ELSE LIBCMT+= libcpmt.lib .ENDIF "$(USE_STLP_DEBUG)" == "" Modified: openoffice/trunk/main/soltools/mkdepend/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/soltools/mkdepend/makefile.mk?rev=1490324&r1=1490323&r2=1490324&view=diff ============================================================================== --- openoffice/trunk/main/soltools/mkdepend/makefile.mk (original) +++ openoffice/trunk/main/soltools/mkdepend/makefile.mk Thu Jun 6 15:25:09 2013 @@ -59,12 +59,7 @@ APP1OBJS=$(OBJFILES) APP1RPATH=NONE .IF "$(COM)"=="MSC" -.IF "$(dbgutil)"=="" APP1STDLIBS+=msvcprt.lib -.ELSE -APP1STDLIBS+=msvcprtd.lib -CDEFS+=-D_DEBUG -.ENDIF # "$(DBG_UTIL)"=="" .ENDIF # "$(COM)"=="MSC" .IF "$(OS)"=="SOLARIS"