subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1615220 - in /subversion/branches/1.7.x: ./ STATUS build/generator/templates/build_zlib.ezt
Date Fri, 01 Aug 2014 20:28:44 GMT
Author: svn-role
Date: Fri Aug  1 20:28:43 2014
New Revision: 1615220

URL: http://svn.apache.org/r1615220
Log:
Merge the 1.7.x-disable_zlib_asm branch:

 * ^/subversion/branches/1.7.x-disable_zlib_asm
   Disable building ZLib's assembly optimizations on Windows
   Justification:
     Without this patch some users might accidentally make Subversion build
     zlib with known issues which would break ra_serf against older serf
     versions. (With newer serf versions the user would have to build zlib
     himself before building Subversion)
   Branch:
     ^/subversion/branches/1.7.x-disable_zlib_asm
   Votes:
     +1: rhuijben, ivan, breser

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/build/generator/templates/build_zlib.ezt

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /subversion/branches/1.7.x-disable_zlib_asm:r1593915-1615219

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1615220&r1=1615219&r2=1615220&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Aug  1 20:28:43 2014
@@ -142,16 +142,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * ^/subversion/branches/1.7.x-disable_zlib_asm
-   Disable building ZLib's assembly optimizations on Windows
-   Justification:
-     Without this patch some users might accidentally make Subversion build
-     zlib with known issues which would break ra_serf against older serf
-     versions. (With newer serf versions the user would have to build zlib
-     himself before building Subversion)
-   Branch:
-     ^/subversion/branches/1.7.x-disable_zlib_asm
-   Votes:
-     +1: rhuijben, ivan, breser
-

Modified: subversion/branches/1.7.x/build/generator/templates/build_zlib.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/build/generator/templates/build_zlib.ezt?rev=1615220&r1=1615219&r2=1615220&view=diff
==============================================================================
--- subversion/branches/1.7.x/build/generator/templates/build_zlib.ezt (original)
+++ subversion/branches/1.7.x/build/generator/templates/build_zlib.ezt Fri Aug  1 20:28:43
2014
@@ -44,25 +44,6 @@ if /i "%2" == "x64" goto PX64
 goto pIIerr
 
 :checkrebuild
-
-[if-any use_ml]
-@rem **************************************************************************
-@rem Compile ASM sources with ML
-set ASFLAGS=-nologo -Zi -coff
-set LOC=-DASMV -DASMINF
-[is zlib_version "1.2.4"]
-set OBJA=contrib\masmx86\gvmat32c.obj contrib\masmx86\gvmat32.obj contrib\masmx86\inffas32.obj
-set ASM_OPTS=ASFLAGS="%ASFLAGS%" LOC="%LOC%" OBJA="%OBJA%"
-[else]
-if /i "%2" == "Win32" (
-  set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj"
-) else if /i "%2" == "x64" (
-  set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" AS=ml64

-)
-[end]
-[end]
-
-
 if /i "%3" == "rebuild" goto rebuild
 if /i "%3" == "clean" goto clean
 if not "%3" == "" goto pIIIerr



Mime
View raw message