nick at ccl4
Nov 28, 2007, 1:08 PM
Post #1 of 3
(79 views)
Permalink
|
|
Re: Change 31226: Better suppression of Threads build (probably still needed on 5.8.x)
|
|
On Tue, May 15, 2007 at 08:15:03PM -0700, Craig A. Berry wrote:
> Change 31226 by craigb[at]craigb-brianor on 2007/05/16 03:08:51
>
> Better suppression of Threads build (probably still needed on 5.8.x)
>
> Affected files ...
>
> ... //depot/perl/configure.com#259 edit
>
> Differences ...
>
> ==== //depot/perl/configure.com#259 (text) ====
> Index: perl/configure.com
> --- perl/configure.com#258~31104~ 2007-04-28 07:28:00.000000000 -0700
> +++ perl/configure.com 2007-05-15 20:08:51.000000000 -0700
> @@ -2774,7 +2774,12 @@
> $ dflt = dflt - "Socket" ! optional on VMS
> $ ENDIF
> $ ! Build this one only for threads without ithreads
> -$ IF useithreads .OR. useithreads .EQS. "define" .OR. .NOT. use_threads THEN dflt = dflt - "Thread"
> +$ IF F$TYPE(useithreads) .EQS. "" .OR. .NOT. use_threads
> +$ THEN
> +$ dflt = dflt - "Thread"
> +$ ELSE
> +$ IF useithreads .OR. useithreads .EQS. "define" THEN dflt = dflt - "Thread"
> +$ ENDIF
> $ dflt = dflt - "Win32API/File" - "Win32CORE" - "Win32" ! need Dave Cutler's other project
> $ dflt = F$EDIT(dflt,"TRIM,COMPRESS")
> $!
> End of Patch.
This conflicts if I try to merge it:
>>>> ORIGINAL configure.com#258
$ ! Build this one only for threads without ithreads
$ IF useithreads .OR. useithreads .EQS. "define" .OR. .NOT. use_threads THEN df\
lt = dflt - "Thread"
==== THEIRS configure.com#259
$ ! Build this one only for threads without ithreads
$ IF F$TYPE(useithreads) .EQS. "" .OR. .NOT. use_threads
$ THEN
$ dflt = dflt - "Thread"
$ ELSE
$ IF useithreads .OR. useithreads .EQS. "define" THEN dflt = dflt - "Thread"
$ ENDIF
==== YOURS configure.com
$ IF .NOT. use_threads THEN dflt = dflt - "Thread"
<<<<
Is it needed for maint?
Nicholas Clark
|
