Hi, As with libofx, please use the newer version when it will be possible.
-- Regards, Cristian Oneț
>From 65935982151b5dec2af039fbdb5fc4cef8e3789b Mon Sep 17 00:00:00 2001
From: Cristian Onet <onet.crist...@gmail.com>
Date: Wed, 1 Feb 2012 01:00:42 +0200
Subject: [PATCH] MPIR 2.5 is available.
---
.../mpir-src/mpir-2.5.0-20120201.diff | 113 +++++++++++++
.../mpir-src/mpir-src-20110313.py | 166 ++++++++++----------
2 files changed, 198 insertions(+), 81 deletions(-)
create mode 100644 portage/win32libs-sources/mpir-src/mpir-2.5.0-20120201.diff
diff --git a/portage/win32libs-sources/mpir-src/mpir-2.5.0-20120201.diff b/portage/win32libs-sources/mpir-src/mpir-2.5.0-20120201.diff
new file mode 100644
index 0000000..e8d1f76
--- /dev/null
+++ b/portage/win32libs-sources/mpir-src/mpir-2.5.0-20120201.diff
@@ -0,0 +1,113 @@
+diff -Nru mpir-2.5.0.orig/build.vc10/configure.bat mpir-2.5.0/build.vc10/configure.bat
+--- mpir-2.5.0.orig/build.vc10/configure.bat 2011-06-08 10:14:20.000000000 +0300
++++ mpir-2.5.0/build.vc10/configure.bat 2012-02-01 00:44:49.814702200 +0200
+@@ -69,6 +69,7 @@
+ set ARCH=amd64
+ set ARCHW=x64
+ )
++set YASM="%YASMPATH%\vsyasm.exe"
+ cl config.guess.c > nul 2>&1
+ if errorlevel 1 goto :nocc1
+ config.guess.exe print > config.guess.bat
+@@ -77,7 +78,6 @@
+ :nocc1
+ if exist "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" (
+ call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%
+- set YASM="%VS100COMNTOOLS%\..\..\VC\bin\vsyasm.exe"
+ )
+ cl config.guess.c > nul 2>&1
+ if errorlevel 1 goto :nocc
+diff -Nru mpir-2.5.0.orig/build.vc10/make.bat mpir-2.5.0/build.vc10/make.bat
+--- mpir-2.5.0.orig/build.vc10/make.bat 2011-06-08 10:14:20.000000000 +0300
++++ mpir-2.5.0/build.vc10/make.bat 2012-02-01 00:44:49.830327200 +0200
+@@ -39,7 +39,7 @@
+
+ :make
+
+-set MS_BUILD="C:\Windows\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe"
++set MS_BUILD="C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+
+ set LIBBUILD=%LIBTYPE%_mpir_%BCPU%
+
+diff -Nru mpir-2.5.0.orig/build.vc10/postbuild.bat mpir-2.5.0/build.vc10/postbuild.bat
+--- mpir-2.5.0.orig/build.vc10/postbuild.bat 2011-12-21 08:01:39.000000000 +0200
++++ mpir-2.5.0/build.vc10/postbuild.bat 2012-02-01 00:46:02.808691800 +0200
+@@ -37,13 +37,14 @@
+ call :seterr & echo "postbuild copy error ERROR: file = %file%, msbf = %msbf% extn = %extn%" & exit /b %errorlevel%
+
+ :is1st
++set type=%plat%
+ set plat=%conf%
+ set conf=%file%
+
+ :is2nd:
+ rem set the target aand output directories
+-set source="%plat%\%conf%"
+-set dest="..\%extn%\%plat%\%conf%"
++set source="%type%\%plat%\%conf%"
++set dest="%extn%\%plat%\%conf%"
+
+ rem output parametrers for the MPIR tests
+ echo (set libr=%extn%) > output_params.bat
+diff -Nru mpir-2.5.0.orig/configure mpir-2.5.0/configure
+--- mpir-2.5.0.orig/configure 2012-01-05 01:44:46.000000000 +0200
++++ mpir-2.5.0/configure 2012-02-01 00:44:49.845952200 +0200
+@@ -9591,7 +9591,7 @@
+ #define __GMP_BITS_PER_MP_LIMB 123 /* dummy for GMP_NUMB_BITS etc */
+ #define GMP_LIMB_BITS 123
+ $DEFN_LONG_LONG_LIMB
+-#include "$srcdir/gmp-h.in"
++#include "../mpir-2.5.0/gmp-h.in"
+
+ #if ! __GMP_HAVE_PROTOTYPES
+ die die die
+@@ -25185,7 +25185,7 @@
+ #define __GMP_BITS_PER_MP_LIMB 123 /* dummy for GMP_NUMB_BITS etc */
+ #define GMP_LIMB_BITS 123
+ $DEFN_LONG_LONG_LIMB
+-#include "$srcdir/gmp-h.in"
++#include "../mpir-2.5.0/gmp-h.in"
+
+ #ifndef __GMP_EXTERN_INLINE
+ die die die
+@@ -25396,9 +25396,9 @@
+ #define __GMP_BITS_PER_MP_LIMB 123 /* dummy for GMP_NUMB_BITS etc */
+ #define GMP_LIMB_BITS 123
+ $DEFN_LONG_LONG_LIMB
+-#include "$srcdir/gmp-h.in"
++#include "../mpir-2.5.0/gmp-h.in"
+
+-#include "$srcdir/gmp-impl.h"
++#include "../mpir-2.5.0/gmp-impl.h"
+
+ int
+ main ()
+@@ -25494,7 +25494,7 @@
+ #define __GMP_BITS_PER_MP_LIMB 123 /* dummy for GMP_NUMB_BITS etc */
+ #define GMP_LIMB_BITS 123
+ $DEFN_LONG_LONG_LIMB
+-#include "$srcdir/gmp-h.in"
++#include "../mpir-2.5.0/gmp-h.in"
+
+ #if ! _GMP_H_HAVE_FILE
+ die die die
+@@ -28260,7 +28260,7 @@
+ #define __GMP_BITS_PER_MP_LIMB 123 /* dummy for GMP_NUMB_BITS etc */
+ #define GMP_LIMB_BITS 123
+ $DEFN_LONG_LONG_LIMB
+-#include \"$srcdir/gmp-h.in\"
++#include \"../mpir-2.5.0/gmp-h.in\"
+
+ "; then :
+
+diff -Nru mpir-2.5.0.orig/mpirxx.h mpir-2.5.0/mpirxx.h
+--- mpir-2.5.0.orig/mpirxx.h 2011-11-17 07:27:35.000000000 +0200
++++ mpir-2.5.0/mpirxx.h 2012-02-01 00:44:49.845952200 +0200
+@@ -1355,6 +1355,7 @@
+ since gmp-impl.h is not publicly available, I redefine it here
+ I use a different name to avoid possible clashes */
+ extern "C" {
++typedef void (*__gmp_freefunc_t) (void *, size_t);
+ struct __gmp_alloc_cstring_c
+ {
+ void (*free_func) (void *, size_t);
diff --git a/portage/win32libs-sources/mpir-src/mpir-src-20110313.py b/portage/win32libs-sources/mpir-src/mpir-src-20110313.py
index 810d8a7..eaa70f4 100644
--- a/portage/win32libs-sources/mpir-src/mpir-src-20110313.py
+++ b/portage/win32libs-sources/mpir-src/mpir-src-20110313.py
@@ -1,81 +1,85 @@
-import os
-from shells import MSysShell
-import info
-
-
-class subinfo(info.infoclass):
- def setDependencies( self ):
- self.buildDependencies['virtual/base'] = 'default'
- if compiler.isMinGW():
- self.buildDependencies['dev-util/msys'] = 'default'
- else:
- self.buildDependencies['dev-util/yasm'] = 'default'
-
- def setTargets( self ):
- self.targets['2.3.0'] = 'http://www.mpir.org/mpir-2.3.0.tar.bz2'
- self.targetInstSrc['2.3.0'] = "mpir-2.3.0"
- self.patchToApply['2.3.0'] = ('mpir-2.3.0-20110310.diff', 1)
-
- self.shortDescription = "Library for arbitrary precision integer arithmetic derived from version 4.2.1 of gmp"
- self.defaultTarget = '2.3.0'
-
-from Package.AutoToolsPackageBase import *
-from Package.MakeFilePackageBase import *
-
-class PackageMinGW(AutoToolsPackageBase):
- def __init__( self, **args ):
- self.subinfo = subinfo()
- AutoToolsPackageBase.__init__(self)
- abi = "ABI=32"
- if self.buildArchitecture()=="x64":
- abi = "ABI=64"
- self.subinfo.options.configure.defines = "--enable-shared --disable-static --enable-gmpcompat --enable-cxx " + abi
-
-class PackageMSVC(MakeFilePackageBase):
- def __init__( self, **args ):
- self.subinfo = subinfo()
- MakeFilePackageBase.__init__( self )
-
- def configure( self ):
- os.chdir( os.path.join( self.sourceDir(), 'build.vc10') )
- os.putenv('YASMPATH', os.path.join(self.rootdir, 'dev-utils', 'bin'))
- self.system("configure.bat --enable-shared --cpu-none --ABI32")
- return True
-
- def make( self ):
- os.chdir( os.path.join( self.sourceDir(), 'build.vc10') )
- self.system("make.bat")
- return True
-
- def install( self ):
- if not os.path.isdir( os.path.join( self.installDir() , "bin" ) ):
- os.makedirs( os.path.join( self.installDir() , "bin" ) )
- shutil.move(os.path.join( self.sourceDir(), 'build.vc10', 'dll', 'Win32', 'Release', 'mpir.dll'), os.path.join( self.installDir() , "bin" , "mpir.dll") )
-
- if not os.path.isdir( os.path.join( self.installDir() , "lib" ) ):
- os.makedirs( os.path.join( self.installDir() , "lib" ) )
- shutil.move(os.path.join( self.sourceDir(), 'build.vc10', 'dll', 'Win32', 'Release', 'mpir.lib'), os.path.join( self.installDir() , "lib" , "mpir.lib") )
- # a dirty workaround the fact that FindGMP.cmake will only look for gmp.lib
- shutil.copy(os.path.join( self.installDir() , "lib" , "mpir.lib"), os.path.join( self.installDir() , "lib" , "gmp.lib") )
-
- if not os.path.isdir( os.path.join( self.installDir() , "include" ) ):
- os.makedirs( os.path.join( self.installDir() , "include" ) )
- shutil.move(os.path.join( self.sourceDir(), 'build.vc10', 'dll', 'Win32', 'Release', 'gmp.h'), os.path.join( self.installDir() , "include" , "gmp.h") )
- shutil.move(os.path.join( self.sourceDir(), 'build.vc10', 'dll', 'Win32', 'Release', 'gmpxx.h'), os.path.join( self.installDir() , "include" , "gmpxx.h") )
- shutil.move(os.path.join( self.sourceDir(), 'build.vc10', 'dll', 'Win32', 'Release', 'mpir.h'), os.path.join( self.installDir() , "include" , "mpir.h") )
- shutil.move(os.path.join( self.sourceDir(), 'build.vc10', 'dll', 'Win32', 'Release', 'mpirxx.h'), os.path.join( self.installDir() , "include" , "mpirxx.h") )
- shutil.move(os.path.join( self.sourceDir(), 'build.vc10', 'dll', 'Win32', 'Release', 'gmp-mparam.h'), os.path.join( self.installDir() , "include" , "gmp-mparam.h") )
-
- return True
-
-if compiler.isMinGW():
- class Package(PackageMinGW):
- def __init__( self ):
- PackageMinGW.__init__( self )
-else:
- class Package(PackageMSVC):
- def __init__( self ):
- PackageMSVC.__init__( self )
-
-if __name__ == '__main__':
- Package().execute()
+import os
+from shells import MSysShell
+import info
+
+
+class subinfo(info.infoclass):
+ def setDependencies( self ):
+ self.buildDependencies['virtual/base'] = 'default'
+ if compiler.isMinGW():
+ self.buildDependencies['dev-util/msys'] = 'default'
+ else:
+ self.buildDependencies['dev-util/yasm'] = 'default'
+
+ def setTargets( self ):
+ self.targets['2.3.0'] = 'http://www.mpir.org/mpir-2.3.0.tar.bz2'
+ self.targetInstSrc['2.3.0'] = "mpir-2.3.0"
+ self.patchToApply['2.3.0'] = ('mpir-2.3.0-20110310.diff', 1)
+
+ self.targets['2.5.0'] = 'http://www.mpir.org/mpir-2.5.0.tar.bz2'
+ self.targetInstSrc['2.5.0'] = "mpir-2.5.0"
+ self.patchToApply['2.5.0'] = ('mpir-2.5.0-20120201.diff', 1)
+
+ self.shortDescription = "Library for arbitrary precision integer arithmetic derived from version 4.2.1 of gmp"
+ self.defaultTarget = '2.5.0'
+
+from Package.AutoToolsPackageBase import *
+from Package.MakeFilePackageBase import *
+
+class PackageMinGW(AutoToolsPackageBase):
+ def __init__( self, **args ):
+ self.subinfo = subinfo()
+ AutoToolsPackageBase.__init__(self)
+ abi = "ABI=32"
+ if self.buildArchitecture()=="x64":
+ abi = "ABI=64"
+ self.subinfo.options.configure.defines = "--enable-shared --disable-static --enable-gmpcompat --enable-cxx " + abi
+
+class PackageMSVC(MakeFilePackageBase):
+ def __init__( self, **args ):
+ self.subinfo = subinfo()
+ MakeFilePackageBase.__init__( self )
+
+ def configure( self ):
+ os.chdir( os.path.join( self.sourceDir(), 'build.vc10') )
+ os.putenv('YASMPATH', os.path.join(self.rootdir, 'dev-utils', 'bin'))
+ self.system("configure.bat --enable-shared --cpu-none --ABI32")
+ return True
+
+ def make( self ):
+ os.chdir( os.path.join( self.sourceDir(), 'build.vc10') )
+ self.system("make.bat")
+ return True
+
+ def install( self ):
+ if not os.path.isdir( os.path.join( self.installDir() , "bin" ) ):
+ os.makedirs( os.path.join( self.installDir() , "bin" ) )
+ shutil.move(os.path.join( self.sourceDir(), 'build.vc10', 'dll', 'Win32', 'Release', 'mpir.dll'), os.path.join( self.installDir() , "bin" , "mpir.dll") )
+
+ if not os.path.isdir( os.path.join( self.installDir() , "lib" ) ):
+ os.makedirs( os.path.join( self.installDir() , "lib" ) )
+ shutil.move(os.path.join( self.sourceDir(), 'build.vc10', 'dll', 'Win32', 'Release', 'mpir.lib'), os.path.join( self.installDir() , "lib" , "mpir.lib") )
+ # a dirty workaround the fact that FindGMP.cmake will only look for gmp.lib
+ shutil.copy(os.path.join( self.installDir() , "lib" , "mpir.lib"), os.path.join( self.installDir() , "lib" , "gmp.lib") )
+
+ if not os.path.isdir( os.path.join( self.installDir() , "include" ) ):
+ os.makedirs( os.path.join( self.installDir() , "include" ) )
+ shutil.move(os.path.join( self.sourceDir(), 'build.vc10', 'dll', 'Win32', 'Release', 'gmp.h'), os.path.join( self.installDir() , "include" , "gmp.h") )
+ shutil.move(os.path.join( self.sourceDir(), 'build.vc10', 'dll', 'Win32', 'Release', 'gmpxx.h'), os.path.join( self.installDir() , "include" , "gmpxx.h") )
+ shutil.move(os.path.join( self.sourceDir(), 'build.vc10', 'dll', 'Win32', 'Release', 'mpir.h'), os.path.join( self.installDir() , "include" , "mpir.h") )
+ shutil.move(os.path.join( self.sourceDir(), 'build.vc10', 'dll', 'Win32', 'Release', 'mpirxx.h'), os.path.join( self.installDir() , "include" , "mpirxx.h") )
+ shutil.move(os.path.join( self.sourceDir(), 'build.vc10', 'dll', 'Win32', 'Release', 'gmp-mparam.h'), os.path.join( self.installDir() , "include" , "gmp-mparam.h") )
+
+ return True
+
+if compiler.isMinGW():
+ class Package(PackageMinGW):
+ def __init__( self ):
+ PackageMinGW.__init__( self )
+else:
+ class Package(PackageMSVC):
+ def __init__( self ):
+ PackageMSVC.__init__( self )
+
+if __name__ == '__main__':
+ Package().execute()
--
1.7.4.msysgit.0
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Kde-windows mailing list Kde-windows@kde.org https://mail.kde.org/mailman/listinfo/kde-windows
