[Openmcl-cvs-notifications] r14393 - in /release/1.6/source: ./ lisp-kernel/darwinppc/ lisp-kernel/darwinppc64/ lisp-kernel/freebsdx8632/ lisp-kernel/freebsdx8664/ lisp-kernel/linuxarm/ lisp-kernel/linuxppc/ lisp-kernel/linuxppc64/ lisp-kernel/solarisx64/ lisp-kernel/solarisx86/ lisp-kernel/win32/ lisp-kernel/win64/

rme at clozure.com rme at clozure.com
Mon Nov 1 13:57:33 CDT 2010


Author: rme
Date: Mon Nov  1 13:57:33 2010
New Revision: 14393

Log:
Merge makefile changes involving SVN_REVISION from trunk.

Modified:
    release/1.6/source/   (props changed)
    release/1.6/source/lisp-kernel/darwinppc/Makefile
    release/1.6/source/lisp-kernel/darwinppc64/Makefile
    release/1.6/source/lisp-kernel/freebsdx8632/Makefile
    release/1.6/source/lisp-kernel/freebsdx8664/Makefile
    release/1.6/source/lisp-kernel/linuxarm/Makefile
    release/1.6/source/lisp-kernel/linuxppc/Makefile
    release/1.6/source/lisp-kernel/linuxppc64/Makefile
    release/1.6/source/lisp-kernel/solarisx64/Makefile
    release/1.6/source/lisp-kernel/solarisx86/Makefile
    release/1.6/source/lisp-kernel/win32/Makefile
    release/1.6/source/lisp-kernel/win64/Makefile

Propchange: release/1.6/source/
---------------------------------------------------------------------------=
---
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  1 13:57:33 2010
@@ -4,4 +4,4 @@
 /branches/rme-logops:13875-13886
 /branches/working-0711/ccl:7970-13192,13197-13198,13202,13208,13214,13235-=
13236,13239,13263,13277-13278,13290,13293-13294,13302-13306,13331-13332,133=
39,13361-13364,13379,13383,13386,13388,13409,13435-13436,13438,13440-13442,=
13460-13461,13465,13467,13476,13487,13490,13492-13493,13502-13528,13545-135=
47,13549,13557-13558
 /release/1.5/source:13667
-/trunk/source:14361-14386
+/trunk/source:14361-14392

Modified: release/1.6/source/lisp-kernel/darwinppc/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.6/source/lisp-kernel/darwinppc/Makefile (original)
+++ release/1.6/source/lisp-kernel/darwinppc/Makefile Mon Nov  1 13:57:33 2=
010
@@ -13,6 +13,8 @@
 #   The LLGPL is also available online at
 #   http://opensource.franz.com/preamble.html
 =

+SVN_REVISION=3D$(shell svnversion || echo "unknown")
+
 MDYNAMIC_NO_PIC =3D $(shell ($(CC) --help -v 2>&1 | grep -q -e "-mdynamic-=
no-pic") && /bin/echo "-mdynamic-no-pic")
 =

 VPATH =3D ..
@@ -23,7 +25,7 @@
 M4 =3D gm4
 M4FLAGS =3D -DDARWIN -DPPC
 ASFLAGS =3D -arch ppc -force_cpusubtype_ALL
-CDEFINES =3D -DDARWIN -DPPC  #-DDEBUG -DGC_INTEGRITY_CHECKING
+CDEFINES =3D -DDARWIN -DPPC -DSVN_REVISION=3D$(SVN_REVISION) #-DDEBUG -DGC=
_INTEGRITY_CHECKING
 CDEBUG =3D -g
 COPT =3D -O2
 # Once in a while, -Wformat says something useful.  The odds are against t=
hat,

Modified: release/1.6/source/lisp-kernel/darwinppc64/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.6/source/lisp-kernel/darwinppc64/Makefile (original)
+++ release/1.6/source/lisp-kernel/darwinppc64/Makefile Mon Nov  1 13:57:33=
 2010
@@ -13,6 +13,7 @@
 #   The LLGPL is also available online at
 #   http://opensource.franz.com/preamble.html
 =

+SVN_REVISION=3D$(shell svnversion || echo "unknown")
 =

 MDYNAMIC_NO_PIC =3D $(shell ($(CC) --help -v 2>&1 | grep -q -e "-mdynamic-=
no-pic") && /bin/echo "-mdynamic-no-pic")
 =

@@ -30,7 +31,7 @@
 M4 =3D gm4
 M4FLAGS =3D -DDARWIN -DPPC -DPPC64
 ASFLAGS =3D -arch ppc64
-CDEFINES =3D -DDARWIN -DPPC -DPPC64
+CDEFINES =3D -DDARWIN -DPPC -DPPC64 -DSVN_REVISION=3D$(SVN_REVISION)
 CDEBUG =3D -g
 COPT =3D -O2
 # Once in a while, -Wformat says something useful.  The odds are against t=
hat,

Modified: release/1.6/source/lisp-kernel/freebsdx8632/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.6/source/lisp-kernel/freebsdx8632/Makefile (original)
+++ release/1.6/source/lisp-kernel/freebsdx8632/Makefile Mon Nov  1 13:57:3=
3 2010
@@ -13,6 +13,7 @@
 #   The LLGPL is also available online at
 #   http://opensource.franz.com/preamble.html
 =

+SVN_REVISION=3D$(shell svnversion || echo "unknown")
 =

 VPATH =3D ..
 RM =3D /bin/rm
@@ -20,7 +21,7 @@
 M4 =3D m4
 ASFLAGS =3D --32
 M4FLAGS =3D -DFREEBSD -DX86 -DX8632 -DHAVE_TLS
-CDEFINES =3D -DFREEBSD -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE -DHAVE_TLS
+CDEFINES =3D -DFREEBSD -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE -DHAVE_TLS=
 -DSVN_REVISION=3D$(SVN_REVISION)
 CDEBUG =3D -g
 COPT =3D -O2
 # Once in a while, -Wformat says something useful.  The odds are against t=
hat,

Modified: release/1.6/source/lisp-kernel/freebsdx8664/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.6/source/lisp-kernel/freebsdx8664/Makefile (original)
+++ release/1.6/source/lisp-kernel/freebsdx8664/Makefile Mon Nov  1 13:57:3=
3 2010
@@ -13,6 +13,7 @@
 #   The LLGPL is also available online at
 #   http://opensource.franz.com/preamble.html
 =

+SVN_REVISION=3D$(shell svnversion || echo "unknown")
 =

 VPATH =3D ..
 RM =3D /bin/rm
@@ -20,7 +21,7 @@
 M4 =3D m4
 ASFLAGS =3D --64
 M4FLAGS =3D -DFREEBSD -DX86 -DX8664 -DHAVE_TLS
-CDEFINES =3D -DFREEBSD -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -DHAVE_TLS
+CDEFINES =3D -DFREEBSD -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -DHAVE_TLS=
 -DSVN_REVISION=3D$(SVN_REVISION)
 CDEBUG =3D -g
 COPT =3D #-O2
 # Once in a while, -Wformat says something useful.  The odds are against t=
hat,

Modified: release/1.6/source/lisp-kernel/linuxarm/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.6/source/lisp-kernel/linuxarm/Makefile (original)
+++ release/1.6/source/lisp-kernel/linuxarm/Makefile Mon Nov  1 13:57:33 20=
10
@@ -13,6 +13,7 @@
 #   The LLGPL is also available online at
 #   http://opensource.franz.com/preamble.html
 =

+SVN_REVISION=3D$(shell svnversion || echo "unknown")
 =

 VPATH =3D ../
 RM =3D /bin/rm
@@ -22,7 +23,7 @@
 M4 =3D m4
 ASFLAGS =3D -mfpu=3Dvfpv2
 M4FLAGS =3D -DLINUX -DARM
-CDEFINES =3D -DLINUX -DARM -D_REENTRANT -D_GNU_SOURCE -DUSE_FUTEX
+CDEFINES =3D -DLINUX -DARM -D_REENTRANT -D_GNU_SOURCE -DUSE_FUTEX -DSVN_RE=
VISION=3D$(SVN_REVISION)
 CDEBUG =3D -g
 COPT =3D -O2
 # Once in a while, -Wformat says something useful.  The odds are against t=
hat,

Modified: release/1.6/source/lisp-kernel/linuxppc/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.6/source/lisp-kernel/linuxppc/Makefile (original)
+++ release/1.6/source/lisp-kernel/linuxppc/Makefile Mon Nov  1 13:57:33 20=
10
@@ -13,6 +13,7 @@
 #   The LLGPL is also available online at
 #   http://opensource.franz.com/preamble.html
 =

+SVN_REVISION=3D$(shell svnversion || echo "unknown")
 =

 VPATH =3D ../
 RM =3D /bin/rm
@@ -22,7 +23,7 @@
 M4 =3D m4
 ASFLAGS =3D -mregnames -mppc32 -maltivec
 M4FLAGS =3D -DLINUX -DPPC
-CDEFINES =3D -DLINUX -DPPC -D_REENTRANT -D_GNU_SOURCE
+CDEFINES =3D -DLINUX -DPPC -D_REENTRANT -D_GNU_SOURCE -DSVN_REVISION=3D$(S=
VN_REVISION)
 CDEBUG =3D -g
 COPT =3D -O2
 # Once in a while, -Wformat says something useful.  The odds are against t=
hat,

Modified: release/1.6/source/lisp-kernel/linuxppc64/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.6/source/lisp-kernel/linuxppc64/Makefile (original)
+++ release/1.6/source/lisp-kernel/linuxppc64/Makefile Mon Nov  1 13:57:33 =
2010
@@ -13,6 +13,7 @@
 #   The LLGPL is also available online at
 #   http://opensource.franz.com/preamble.html
 =

+SVN_REVISION=3D$(shell svnversion || echo "unknown")
 =

 VPATH =3D ../
 RM =3D /bin/rm
@@ -22,7 +23,7 @@
 M4 =3D m4
 ASFLAGS =3D -mregnames -mppc64 -a64 -maltivec
 M4FLAGS =3D -DLINUX -DPPC -DPPC64
-CDEFINES =3D -DLINUX -D_REENTRANT -DPPC -DPPC64 -D_GNU_SOURCE
+CDEFINES =3D -DLINUX -D_REENTRANT -DPPC -DPPC64 -D_GNU_SOURCE -DSVN_REVISI=
ON=3D$(SVN_REVISION)
 CDEBUG =3D -g
 COPT =3D -O2
 # word size issues are a little more relevant on a 64-bit platform

Modified: release/1.6/source/lisp-kernel/solarisx64/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.6/source/lisp-kernel/solarisx64/Makefile (original)
+++ release/1.6/source/lisp-kernel/solarisx64/Makefile Mon Nov  1 13:57:33 =
2010
@@ -13,6 +13,7 @@
 #   The LLGPL is also available online at
 #   http://opensource.franz.com/preamble.html
 =

+SVN_REVISION=3D$(shell svnversion || echo "unknown")
 =

 VPATH =3D ..
 RM =3D /bin/rm
@@ -25,7 +26,7 @@
 CC =3D /usr/sfw/bin/gcc
 ASFLAGS =3D --64 --divide
 M4FLAGS =3D -DSOLARIS -DX86 -DX8664
-CDEFINES =3D -DSOLARIS -D_REENTRANT -DX86 -DX8664 -D__EXTENSIONS__ -DHAVE_=
TLS #-DDISABLE_EGC
+CDEFINES =3D -DSOLARIS -D_REENTRANT -DX86 -DX8664 -D__EXTENSIONS__ -DHAVE_=
TLS -DSVN_REVISION=3D$(SVN_REVISION) #-DDISABLE_EGC
 CDEBUG =3D -g
 COPT =3D #-O2
 # Once in a while, -Wformat says something useful.  The odds are against t=
hat,

Modified: release/1.6/source/lisp-kernel/solarisx86/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.6/source/lisp-kernel/solarisx86/Makefile (original)
+++ release/1.6/source/lisp-kernel/solarisx86/Makefile Mon Nov  1 13:57:33 =
2010
@@ -13,6 +13,7 @@
 #   The LLGPL is also available online at
 #   http://opensource.franz.com/preamble.html
 =

+SVN_REVISION=3D$(shell svnversion || echo "unknown")
 =

 VPATH =3D ..
 RM =3D /bin/rm
@@ -25,7 +26,7 @@
 CC =3D /usr/sfw/bin/gcc
 ASFLAGS =3D --32 --divide
 M4FLAGS =3D -DSOLARIS -DX86 -DX8632
-CDEFINES =3D -DSOLARIS -D_REENTRANT -DX86 -DX8632 -D__EXTENSIONS__ -DHAVE_=
TLS #-DDISABLE_EGC
+CDEFINES =3D -DSOLARIS -D_REENTRANT -DX86 -DX8632 -D__EXTENSIONS__ -DHAVE_=
TLS -DSVN_REVISION=3D$(SVN_REVISION) #-DDISABLE_EGC
 CDEBUG =3D -g
 COPT =3D -O2
 # Once in a while, -Wformat says something useful.  The odds are against t=
hat,

Modified: release/1.6/source/lisp-kernel/win32/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.6/source/lisp-kernel/win32/Makefile (original)
+++ release/1.6/source/lisp-kernel/win32/Makefile Mon Nov  1 13:57:33 2010
@@ -13,6 +13,7 @@
 #   The LLGPL is also available online at
 #   http://opensource.franz.com/preamble.html
 =

+SVN_REVISION=3D$(shell svnversion || echo "unknown")
 =

 VPATH =3D ../
 RM =3D /bin/rm
@@ -22,7 +23,7 @@
 LD =3D ld
 ASFLAGS =3D -g --32
 M4FLAGS =3D -DWIN_32 -DWINDOWS -DX86 -DX8632 -DWIN32_ES_HACK
-CDEFINES =3D -DWIN_32 -DWINDOWS -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE  =
-D__MSVCRT__ -D__MSVCRT_VERSION__=3D0x700 -D_WIN32_WINNT=3D0x0502 -DWIN32_E=
S_HACK
+CDEFINES =3D -DWIN_32 -DWINDOWS -D_REENTRANT -DX86 -DX8632 -D_GNU_SOURCE  =
-D__MSVCRT__ -D__MSVCRT_VERSION__=3D0x700 -D_WIN32_WINNT=3D0x0502 -DWIN32_E=
S_HACK -DSVN_REVISION=3D$(SVN_REVISION)
 CDEBUG =3D -g
 COPT =3D -O2
 # Once in a while, -Wformat says something useful.  The odds are against t=
hat,

Modified: release/1.6/source/lisp-kernel/win64/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.6/source/lisp-kernel/win64/Makefile (original)
+++ release/1.6/source/lisp-kernel/win64/Makefile Mon Nov  1 13:57:33 2010
@@ -13,6 +13,7 @@
 #   The LLGPL is also available online at
 #   http://opensource.franz.com/preamble.html
 =

+SVN_REVISION=3D$(shell svnversion || echo "unknown")
 =

 VPATH =3D ../
 RM =3D /bin/rm
@@ -24,7 +25,7 @@
 LD =3D x86_64-w64-mingw32-ld
 ASFLAGS =3D -g --64
 M4FLAGS =3D -DWIN_64 -DWINDOWS -DX86 -DX8664 -DHAVE_TLS -DEMUTLS -DTCR_IN_=
GPR
-CDEFINES =3D -DWIN_64 -DWINDOWS -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -=
DHAVE_TLS -DEMUTLS -DTCR_IN_GPR
+CDEFINES =3D -DWIN_64 -DWINDOWS -D_REENTRANT -DX86 -DX8664 -D_GNU_SOURCE -=
DHAVE_TLS -DEMUTLS -DTCR_IN_GPR -DSVN_REVISION=3D$(SVN_REVISION)
 CDEBUG =3D -g
 COPT =3D -O2
 # Once in a while, -Wformat says something useful.  The odds are against t=
hat,



More information about the Openmcl-cvs-notifications mailing list