[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: kdesupport/emerge/portage/testing/mysql-pkg
From:       Patrick von Reth <patrick () von-reth ! de>
Date:       2010-06-01 13:55:41
Message-ID: AANLkTin4HphvLDp5dsqrjqIz_Nwb0VvwXZe8PfonPHG5 () mail ! gmail ! com
[Download RAW message or body]

whats with mingw import libs?

Patrick

On 1 June 2010 15:22, Andreas Holzammer <andy@kdab.com> wrote:

> SVN commit 1133306 by aholzammer:
>
> - fixed the stdcall problem of libmysql
> - DO NOT CREATE the lib file, just take the shipped lib file
>
>  D             mysql-5.1.46.patch
>  M  +4 -3      mysql-pkg-5.1.46.py
>
>
> --- trunk/kdesupport/emerge/portage/testing/mysql-pkg/mysql-pkg-5.1.46.py#1133305:1133306
> @@ -20,7 +20,6 @@
>           self.targets[ 'mysql-sever-5.1.46'] =
> self.baseURL+"mysql-noinstall-5.1.46-win32.zip"
>           self.targetInstSrc[ 'mysql-sever-5.1.46' ] = "mysql-5.1.46-win32"
>           self.targetDigests[ 'mysql-sever-5.1.46' ] =
> 'd1149263a9fc02ab4a1067a10e0eb7df35708290'
> -          self.patchToApply[ 'mysql-sever-5.1.46' ] = [
> 'mysql-5.1.46.patch',0 ]
>
>         self.defaultTarget = 'mysql-sever-5.1.46'
>
> @@ -45,13 +44,15 @@
>     if( not self.cleanImage()):
>       return False
>     shutil.copytree( os.path.join( self.sourceDir() , "bin" ) ,
> os.path.join( self.installDir(), "bin") ,
> ignore=shutil.ignore_patterns('*.pdb','*.map','*test.exe','mysqld-debug.exe')
> )
> +    # do not create lib files, just take the given ones, because of the
> stdcall problem
> +    shutil.copy( os.path.join( self.sourceDir() , "lib" , "opt" ,
> "libmysql.lib" ) , os.path.join( self.installDir(), "lib" , "libmysql.lib" )
> )
>     shutil.copy( os.path.join( self.sourceDir() , "Embedded" , "DLL" ,
> "release" , "libmysqld.dll" ) , os.path.join( self.installDir(), "bin" ,
> "libmysqld.dll" ) )
> +    shutil.copy( os.path.join( self.sourceDir() , "Embedded" , "DLL" ,
> "release" , "libmysqld.lib" ) , os.path.join( self.installDir(), "lib" ,
> "libmysqld.lib" ) )
>     shutil.copytree( os.path.join( self.sourceDir() , "include" ) ,
> os.path.join( self.installDir(), "include" ) ,
>  ignore=shutil.ignore_patterns('*.def') )
>     shutil.copytree( os.path.join( self.sourceDir() , "scripts" ) ,
> os.path.join( self.installDir(), "scripts" ) )
>     shutil.copytree( os.path.join( self.sourceDir() , "share" ) ,
> os.path.join( self.installDir(), "share" ) ,
> ignore=shutil.ignore_patterns('Makefile*') )
>     shutil.copytree( os.path.join( self.sourceDir() , "data" ) ,
> os.path.join( self.installDir(), "data" ) )
> -    self.createImportLibs( "libmysql")
> -    self.createImportLibs( "libmysqld")
> +
>     return True
>
>  if __name__ == '__main__':
>

[Attachment #3 (text/html)]

whats with mingw import libs?<div><br></div><div>Patrick<br><br><div \
class="gmail_quote">On 1 June 2010 15:22, Andreas Holzammer <span dir="ltr">&lt;<a \
href="mailto:andy@kdab.com">andy@kdab.com</a>&gt;</span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex;">

SVN commit 1133306 by aholzammer:<br>
<br>
- fixed the stdcall problem of libmysql<br>
- DO NOT CREATE the lib file, just take the shipped lib file<br>
<br>
  D                   mysql-5.1.46.patch<br>
  M   +4 -3         <a href="http://mysql-pkg-5.1.46.py" \
target="_blank">mysql-pkg-5.1.46.py</a><br> <br>
<br>
--- trunk/kdesupport/emerge/portage/testing/mysql-pkg/<a \
href="http://mysql-pkg-5.1.46.py" target="_blank">mysql-pkg-5.1.46.py</a> \
#1133305:1133306<br> @@ -20,7 +20,6 @@<br>
                self.targets[ &#39;mysql-sever-5.1.46&#39;] = \
                self.baseURL+&quot;mysql-noinstall-5.1.46-win32.zip&quot;<br>
                self.targetInstSrc[ &#39;mysql-sever-5.1.46&#39; ] = \
                &quot;mysql-5.1.46-win32&quot;<br>
                self.targetDigests[ &#39;mysql-sever-5.1.46&#39; ] = \
                &#39;d1149263a9fc02ab4a1067a10e0eb7df35708290&#39;<br>
-               self.patchToApply[ &#39;mysql-sever-5.1.46&#39; ] = [ \
&#39;mysql-5.1.46.patch&#39;,0 ]<br> <br>
             self.defaultTarget = &#39;mysql-sever-5.1.46&#39;<br>
<br>
@@ -45,13 +44,15 @@<br>
       if( not self.cleanImage()):<br>
          return False<br>
       shutil.copytree( os.path.join( self.sourceDir() , &quot;bin&quot; ) , \
os.path.join( self.installDir(), &quot;bin&quot;) , \
ignore=shutil.ignore_patterns(&#39;*.pdb&#39;,&#39;*.map&#39;,&#39;*test.exe&#39;,&#39;mysqld-debug.exe&#39;) \
)<br>


+      # do not create lib files, just take the given ones, because of the stdcall \
problem<br> +      shutil.copy( os.path.join( self.sourceDir() , &quot;lib&quot; , \
&quot;opt&quot; , &quot;libmysql.lib&quot; ) , os.path.join( self.installDir(), \
&quot;lib&quot; , &quot;libmysql.lib&quot; ) )<br>  shutil.copy( os.path.join( \
self.sourceDir() , &quot;Embedded&quot; , &quot;DLL&quot; , &quot;release&quot; , \
&quot;libmysqld.dll&quot; ) , os.path.join( self.installDir(), &quot;bin&quot; , \
&quot;libmysqld.dll&quot; ) )<br>


+      shutil.copy( os.path.join( self.sourceDir() , &quot;Embedded&quot; , \
&quot;DLL&quot; , &quot;release&quot; , &quot;libmysqld.lib&quot; ) , os.path.join( \
self.installDir(), &quot;lib&quot; , &quot;libmysqld.lib&quot; ) )<br>


       shutil.copytree( os.path.join( self.sourceDir() , &quot;include&quot; ) , \
os.path.join( self.installDir(), &quot;include&quot; ) ,   \
                ignore=shutil.ignore_patterns(&#39;*.def&#39;) )<br>
       shutil.copytree( os.path.join( self.sourceDir() , &quot;scripts&quot; ) , \
os.path.join( self.installDir(), &quot;scripts&quot; ) )<br>  shutil.copytree( \
os.path.join( self.sourceDir() , &quot;share&quot; ) , os.path.join( \
self.installDir(), &quot;share&quot; ) , \
                ignore=shutil.ignore_patterns(&#39;Makefile*&#39;) )<br>
       shutil.copytree( os.path.join( self.sourceDir() , &quot;data&quot; ) , \
                os.path.join( self.installDir(), &quot;data&quot; ) )<br>
-      self.createImportLibs( &quot;libmysql&quot;)<br>
-      self.createImportLibs( &quot;libmysqld&quot;)<br>
+<br>
       return True<br>
<br>
  if __name__ == &#39;__main__&#39;:<br>
</blockquote></div><br></div>



[prev in list] [next in list] [prev in thread] [next in thread]