You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2015/09/27 17:41:18 UTC
svn commit: r1705549 - in /openoffice/branches/AOO410: ./ ext_libraries/coinmp/ main/

Author: pfg
Date: Sun Sep 27 15:41:17 2015
New Revision: 1705549

URL: http://svn.apache.org/viewvc?rev=1705549&view=rev
Log:
MFT - CoinMP update

r1585171:
i124158 - Update CoinMP to 1.7.6

r1647713:
Make sure system LAPACK/BLAS are never used.

r1690740, r1690755, r1690854, r1694131
Fix for FreeBSD and MacOSX build.

Added:
    openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.7.6-clang.patch
      - copied, changed from r1585171, openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch
    openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.7.6.patch
      - copied unchanged from r1585171, openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6.patch
Removed:
    openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.6.0-clang.patch
    openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.6.0.patch
Modified:
    openoffice/branches/AOO410/   (props changed)
    openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk
    openoffice/branches/AOO410/main/   (props changed)
    openoffice/branches/AOO410/main/external_deps.lst

Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 27 15:41:17 2015
@@ -2,5 +2,5 @@
 /openoffice/branches/ia2:1417739-1541842
 /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
 /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543
+/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543
 /openoffice/trunk/main:1705369

Copied: openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.7.6-clang.patch (from r1585171, openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch)
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.7.6-clang.patch?p2=openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.7.6-clang.patch&p1=openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch&r1=1585171&r2=1705549&rev=1705549&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch (original)
+++ openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.7.6-clang.patch Sun Sep 27 15:41:17 2015
@@ -1,14 +1,15 @@
---- misc/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp	2011-01-03 20:31:00.000000000 -0300
-+++ misc/build/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp	2014-02-01 02:02:10.596696644 -0300
-@@ -95,7 +95,10 @@
- 
+--- misc/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp	2011-01-03 23:31:00.000000000 +0000
++++ misc/build/CoinMP-1.7.6/CoinUtils/src/CoinSignal.hpp	2015-08-04 23:25:43.468410000 +0000
+@@ -44,7 +44,11 @@
  //-----------------------------------------------------------------------------
  
--#if defined(__MACH__) && defined(__GNUC__)
-+#if defined(__clang__)
-+   typedef void(*CoinSighandler_t)(int);
-+#  define CoinSighandler_t_defined
-+#elif defined(__MACH__) && defined(__GNUC__)
-    typedef typeof(SIG_DFL) CoinSighandler_t;
+ #if defined(__FreeBSD__) && defined(__GNUC__)
+-   typedef typeof(SIG_DFL) CoinSighandler_t;
++   #if defined(__clang__)
++     typedef __decltype(SIG_DFL) CoinSighandler_t;
++   #else
++     typedef typeof(SIG_DFL) CoinSighandler_t;
++   #endif
  #  define CoinSighandler_t_defined
  #endif
+ 

Modified: openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk?rev=1705549&r1=1705548&r2=1705549&view=diff
==============================================================================
--- openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk (original)
+++ openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk Sun Sep 27 15:41:17 2015
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 PRJ=.
@@ -42,10 +42,10 @@ all:
 
 .ELSE
 
-TARFILE_NAME=CoinMP-1.6.0
-TARFILE_MD5=2b5f1ca58d6ef30f18f1415b65bed81c
+TARFILE_NAME=CoinMP-1.7.6
+TARFILE_MD5=1cce53bf4b40ae29790d2c5c9f8b1129
 
-PATCH_FILES=coinmp-1.6.0.patch coinmp-1.6.0-clang.patch
+PATCH_FILES=coinmp-1.7.6.patch coinmp-1.7.6-clang.patch
 .IF "$(OS)"=="OS2"
 PATCH_FILES+=coinmp-1.6.0-os2.patch
 .ENDIF
@@ -55,9 +55,9 @@ BUILD_ACTION=$(COMPATH)$/vcpackages$/vcb
 .ELSE
 CONFIGURE_ACTION=./configure
 #CONFIGURE_FLAGS=--disable-pkg-config --disable-bzlib --disable-zlib CC='$(CC) $(ARCH_FLAGS)' CXX='$(CXX) $(ARCH_FLAGS)' CFLAGS='$(ARCH_FLAGS) -Wc,-arch -Wc,i386' CPPFLAGS='$(ARCH_FLAGS)' LDFLAGS='$(ARCH_FLAGS)' compiler_flags='$(ARCH_FLAGS)'
-CONFIGURE_FLAGS=--disable-pkg-config --disable-bzlib --disable-zlib CC='$(CC) $(ARCH_FLAGS)' CXX='$(CXX) $(ARCH_FLAGS)'
+CONFIGURE_FLAGS=--disable-pkg-config --with-blas=BUILD --with-lapack=BUILD --disable-bzlib --disable-zlib CC='$(CC) $(ARCH_FLAGS)' CXX='$(CXX) $(ARCH_FLAGS)'
 #BUILD_ACTION= CC="$(CC) $(ARCH_FLAGS)" CPP="$(CXX) $(ARCH_FLAGS)" $(GNUMAKE) -j8
-BUILD_ACTION= $(GNUMAKE) -j8
+BUILD_ACTION= $(GNUMAKE) -j$(MAXPROCESS)
 .ENDIF
 
 .IF "$(OS)"=="OS2"

Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 27 15:41:17 2015
@@ -2,4 +2,4 @@
 /openoffice/branches/ia2/main:1417739-1541842
 /openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
 /openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1650314,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,1697807,1700078,1700135,1702894,1702898,170298
 6,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542
+/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1650314,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,1697807,1700078,1700135,1702894,170289
 8,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542

Modified: openoffice/branches/AOO410/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/external_deps.lst?rev=1705549&r1=1705548&r2=1705549&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/external_deps.lst (original)
+++ openoffice/branches/AOO410/main/external_deps.lst Sun Sep 27 15:41:17 2015
@@ -254,10 +254,10 @@ if (RAT_JAR_HOME==BUILD)
 #
 
 if (ENABLE_CATEGORY_B==YES && SYSTEM_COINMP!=YES)
-    MD5 = 2b5f1ca58d6ef30f18f1415b65bed81c
-    name = CoinMP-1.6.0.tgz
+    MD5 = 1cce53bf4b40ae29790d2c5c9f8b1129
+    name = CoinMP-1.7.6.tgz
+    # URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
     URL1 = http://www.coin-or.org/download/source/CoinMP/$(name)
-    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (WITH_CATB_FONTS == YES)
     MD5 = 35efabc239af896dfb79be7ebdd6e6b9