Message-ID: <4A27F519.9020600@dunslane.net>
Date: Thu, 04 Jun 2009 12:23:53 -0400
From: Andrew Dunstan <andrew@dunslane.net>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.8.0.12) Gecko/20071019 Fedora/1.0.9-3.fc6 pango-text
	SeaMonkey/1.0.9
MIME-Version: 1.0
To: Magnus Hagander <magnus@hagander.net>
CC: Dave Page <dpage@pgadmin.org>, Josh Berkus <josh@agliodbs.com>,
	PostgreSQL-development <pgsql-hackers@postgresql.org>
Subject: Re: It's June 1; do you know where your release is?
References: <19107.1243873940@sss.pgh.pa.us>	
	<603c8f070906012050p6ccd62d3v13d3e0f887fe7c90@mail.gmail.com>	
	<alpine.BSO.2.00.0906020108410.15690@leary.csoft.net>	
	<15765.1243965376@sss.pgh.pa.us> <4A25C32F.30203@agliodbs.com>	
	<4A25C9A9.5010303@dunslane.net> <4A25D91B.5080401@dunslane.net>	
	<4A26FF38.8090308@dunslane.net>	
	<937d27e10906031610g341525e5j9414d8af3d8f293c@mail.gmail.com>	
	<4A270A06.1010507@dunslane.net>
	<937d27e10906040249u73ac21dds6057300011d38a2d@mail.gmail.com>
	<4A27AA1D.6000800@hagander.net> <4A27C1BB.7080909@dunslane.net>
	<4A27CEAC.1090900@hagander.net>
In-Reply-To: <4A27CEAC.1090900@hagander.net>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit


Magnus Hagander wrote:
> Andrew Dunstan wrote:
>   
>> Magnus Hagander wrote:
>>     
>>> Dave Page wrote:
>>>  
>>>       
>>>> On Thu, Jun 4, 2009 at 12:40 AM, Andrew Dunstan <andrew@dunslane.net>
>>>> wrote:
>>>>    
>>>>         
>>>>> Of course, that leaves the issue of the library name to be fixed, but
>>>>> sufficient unto the day ...
>>>>>       
>>>>>           
>>>> Yeah - I chatted briefly with Magnus about that a while back. I added
>>>> a quick hack to Mkvcbuild.pm to allow it to use either 5.10 or 5.8,
>>>> but didn't even think about the msys build.
>>>>
>>>>     
>>>>         
>>> Yeah, this is something we need to look at for 8.5. I think it's too
>>> late in the cycle to start messing with it for 8.4.
>>>   
>>>       
>> I don't see why. Perl 5.10 is out there and people will want to use it.
>> I have a simple fix for this in GNUMakefile (see below) , and putting
>> something similar in the MSVC build stuff will be simple too. If we
>> don't want to support Perl 5.10 why was the item on the open issues list
>> at all (and why did I just spend hours finding a solution to the hard
>> part)?
>>     
>
> I mostly meant a general make-it-version-independent fix. The fix that's
> in the MSVC build system now is really just a hack that only supports
> 5.8 and 5.10, not any other versions.
>
> But sure, if it's that easy, go for it :-)
>   

Yeah. The patch below should be far more future-proof (and past-proof, 
for that matter).

Dave, any chance you can test it?

cheers

andrew


Index: src/tools/msvc/Mkvcbuild.pm
===================================================================
RCS file: /cvsroot/pgsql/src/tools/msvc/Mkvcbuild.pm,v
retrieving revision 1.39
diff -c -r1.39 Mkvcbuild.pm
*** src/tools/msvc/Mkvcbuild.pm 7 Apr 2009 19:35:57 -0000       1.39
--- src/tools/msvc/Mkvcbuild.pm 4 Jun 2009 16:19:29 -0000
***************
*** 104,116 ****
              }
          }
          $plperl->AddReference($postgres);
!         if (-e $solution->{options}->{perl} . '\lib\CORE\perl510.lib')
          {
!             $plperl->AddLibrary($solution->{options}->{perl} . 
'\lib\CORE\perl510.lib');
!         }
!         else
!         {
!             $plperl->AddLibrary($solution->{options}->{perl} . 
'\lib\CORE\perl58.lib');
          }
      }
 
--- 104,114 ----
              }
          }
          $plperl->AddReference($postgres);
!               my @perl_libs =
!                       glob($solution->{options}->{perl} . 
'\lib\CORE\perl*.lib');
!         if (@perl_libs == 1)
          {
!             $plperl->AddLibrary($perl_libs[0]);
          }
      }