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

List:       kde-commits
Subject:    kdesupport/emerge/portage/win32libs-sources/mpir-src
From:       Cristian Oneț <onet.cristian () gmail ! com>
Date:       2011-03-12 19:32:16
Message-ID: 20110312193216.896CAAC8C5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1224613 by conet:

Fix mingw build.

 M  +24 -0     mpir-2.3.0-20110310.diff  
 M  +4 -1      mpir-src-20110312.py  


--- trunk/kdesupport/emerge/portage/win32libs-sources/mpir-src/mpir-2.3.0-20110310.diff \
#1224612:1224613 @@ -119,3 +119,27 @@
  
  "; then :
  
+diff -Nru mpir-2.3.0.orig/Makefile.am mpir-2.3.0/Makefile.am
+--- mpir-2.3.0.orig/Makefile.am	2011-03-04 09:24:25.000000000 +0200
++++ mpir-2.3.0/Makefile.am	2011-03-12 21:03:41.906923500 +0200
+@@ -217,7 +217,7 @@
+ if WANT_GMPCOMPAT
+ 	(rm -f $(DESTDIR)$(includedir)/gmp.h && cp mpir.h $(DESTDIR)$(includedir)/gmp.h)
+ if WANT_CXX
+-	(rm -f $(DESTDIR)$(includedir)/gmpxx.h && cp mpirxx.h \
$(DESTDIR)$(includedir)/gmpxx.h) ++	(rm -f $(DESTDIR)$(includedir)/gmpxx.h && cp \
$(srcdir)/mpirxx.h $(DESTDIR)$(includedir)/gmpxx.h) + endif
+ endif
+ 	@echo ''
+diff -Nru mpir-2.3.0.orig/Makefile.in mpir-2.3.0/Makefile.in
+--- mpir-2.3.0.orig/Makefile.in	2011-03-04 09:24:40.000000000 +0200
++++ mpir-2.3.0/Makefile.in	2011-03-12 21:04:56.430361000 +0200
+@@ -1225,7 +1225,7 @@
+ 
+ install-data-hook:
+ @WANT_GMPCOMPAT_TRUE@	(rm -f $(DESTDIR)$(includedir)/gmp.h && cp mpir.h \
$(DESTDIR)$(includedir)/gmp.h) +-@WANT_CXX_TRUE@@WANT_GMPCOMPAT_TRUE@	(rm -f \
$(DESTDIR)$(includedir)/gmpxx.h && cp mpirxx.h $(DESTDIR)$(includedir)/gmpxx.h) \
++@WANT_CXX_TRUE@@WANT_GMPCOMPAT_TRUE@	(rm -f $(DESTDIR)$(includedir)/gmpxx.h && cp \
$(srcdir)/mpirxx.h $(DESTDIR)$(includedir)/gmpxx.h) + 	@echo ''
+ 	@echo '+-------------------------------------------------------------+'
+ 	@echo '| CAUTION:                                                    |'
--- trunk/kdesupport/emerge/portage/win32libs-sources/mpir-src/mpir-src-20110312.py \
#1224612:1224613 @@ -27,7 +27,10 @@
     def __init__( self, **args ):
         self.subinfo = subinfo()
         AutoToolsPackageBase.__init__(self)
-        self.subinfo.options.configure.defines = "--enable-shared --disable-static \
--enable-gmpcompat --enable-cxx ABI=32" +        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 ):


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