subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1617030 - /subversion/trunk/build/generator/gen_win_dependencies.py
Date Sat, 09 Aug 2014 23:55:18 GMT
Author: rhuijben
Date: Sat Aug  9 23:55:17 2014
New Revision: 1617030

URL: http://svn.apache.org/r1617030
Log:
On Windows: Properly detect the right name of the perl library file on
Windows, for newer perl versions that sometimes generate a .lib file
with the more linux like libperl158.a name.

* build/generator/gen_win_dependencies.py
  (_find_perl): Ask perl for the library name instead of guessing one
    ourselves.

Modified:
    subversion/trunk/build/generator/gen_win_dependencies.py

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1617030&r1=1617029&r2=1617030&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Sat Aug  9 23:55:17 2014
@@ -862,15 +862,20 @@ class GenDependenciesBase(gen_base.Gener
     "Find the right perl library name to link swig bindings with"
 
     fp = os.popen('perl -MConfig -e ' + escape_shell_arg(
+                  'print "$Config{libperl}\\n"; '
                   'print "$Config{PERL_REVISION}.$Config{PERL_VERSION}.'
                           '$Config{PERL_SUBVERSION}\\n"; '
                   'print "$Config{archlib}\\n"'), 'r')
     try:
       line = fp.readline()
       if line:
+        perl_lib = line.strip()
+      else:
+        return
+
+      if line:
         perl_version = line.strip()
         perl_ver = perl_version.split('.')
-        perl_lib = 'perl%s%s.lib' % (perl_ver[0], perl_ver[1])
       else:
         return
 



Mime
View raw message