You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2014/04/05 21:26:38 UTC
svn commit: r1585171 - in /openoffice/trunk: ext_libraries/coinmp/ main/
Author: arielch
Date: Sat Apr 5 19:26:38 2014
New Revision: 1585171
URL: http://svn.apache.org/r1585171
Log:
i124158 - Update CoinMP to 1.7.6
Added:
openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch (contents, props changed)
- copied, changed from r1583988, openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-clang.patch
openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6.patch (contents, props changed)
- copied, changed from r1583988, openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0.patch
Removed:
openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-clang.patch
openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0.patch
Modified:
openoffice/trunk/ext_libraries/coinmp/makefile.mk
openoffice/trunk/main/external_deps.lst
Copied: openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch (from r1583988, openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-clang.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch?p2=openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch&p1=openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-clang.patch&r1=1583988&r2=1585171&rev=1585171&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-clang.patch (original)
+++ openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch Sat Apr 5 19:26:38 2014
@@ -1,5 +1,5 @@
---- misc/CoinMP-1.6.0/CoinUtils/src/CoinSignal.hpp 2011-01-04 00:31:00.000000000 +0100
-+++ misc/build/CoinMP-1.6.0/CoinUtils/src/CoinSignal.hpp 2013-03-01 18:22:08.000000000 +0100
+--- 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 @@
//-----------------------------------------------------------------------------
Propchange: openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6-clang.patch
------------------------------------------------------------------------------
svn:eol-style = native
Copied: openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6.patch (from r1583988, openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0.patch)
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6.patch?p2=openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6.patch&p1=openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0.patch&r1=1583988&r2=1585171&rev=1585171&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0.patch (original)
+++ openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6.patch Sat Apr 5 19:26:38 2014
@@ -1,198 +1,6 @@
---- misc/CoinMP-1.6.0/Cbc/src/CbcEventHandler.hpp.orig 2007-08-10 12:18:20.000000000 -0400
-+++ misc/build/CoinMP-1.6.0/Cbc/src/CbcEventHandler.hpp 2011-07-29 06:16:23.000000000 -0400
-@@ -43,6 +43,7 @@
- */
-
- #include <map>
-+#include <cstddef>
-
- /* May well already be declared, but can't hurt. */
-
---- misc/CoinMP-1.6.0/Cbc/src/CbcSolver.cpp.orig 2011-12-23 10:36:33.000000000 -0500
-+++ misc/build/CoinMP-1.6.0/Cbc/src/CbcSolver.cpp 2011-12-23 10:41:57.000000000 -0500
-@@ -1665,10 +1665,6 @@
- }
- sprintf(generalPrint + strlen(generalPrint),
- "Build Date: %s \n", __DATE__);
--#ifdef CBC_SVN_REV
-- sprintf(generalPrint + strlen(generalPrint),
-- "Revision Number: %d \n", CBC_SVN_REV);
--#endif
- generalMessageHandler->message(CLP_GENERAL, generalMessages)
- << generalPrint
- << CoinMessageEol;
-
---- misc/CoinMP-1.6.0/Cbc/ltmain.sh 2010-06-14 02:52:10.000000000 +0900
-+++ misc/build/CoinMP-1.6.0/Cbc/ltmain.sh 2012-02-14 12:43:54.000000000 +0900
-@@ -3186,12 +3186,12 @@
- # which has an extra 1 added just for fun
- #
- case $version_type in
-- darwin|linux|osf|windows)
-+ darwin|linux|osf|windows|freebsd-elf)
- current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_revision"
- ;;
-- freebsd-aout|freebsd-elf|sunos)
-+ freebsd-aout|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
-@@ -3267,8 +3267,8 @@
- ;;
-
- freebsd-elf)
-- major=".$current"
-- versuffix=".$current";
-+ major=.`expr $current - $age`
-+ versuffix="$major"
- ;;
-
- irix | nonstopux)
---- misc/CoinMP-1.6.0/Cgl/ltmain.sh 2010-06-14 02:52:57.000000000 +0900
-+++ misc/build/CoinMP-1.6.0/Cgl/ltmain.sh 2012-02-14 12:47:44.000000000 +0900
-@@ -3186,12 +3186,12 @@
- # which has an extra 1 added just for fun
- #
- case $version_type in
-- darwin|linux|osf|windows)
-+ darwin|linux|osf|windows|freebsd-elf)
- current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_revision"
- ;;
-- freebsd-aout|freebsd-elf|sunos)
-+ freebsd-aout|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
-@@ -3267,8 +3267,8 @@
- ;;
-
- freebsd-elf)
-- major=".$current"
-- versuffix=".$current";
-+ major=.`expr $current - $age`
-+ versuffix="$major"
- ;;
-
- irix | nonstopux)
---- misc/CoinMP-1.6.0/Clp/ltmain.sh 2010-06-14 02:53:25.000000000 +0900
-+++ misc/build/CoinMP-1.6.0/Clp/ltmain.sh 2012-02-14 12:47:52.000000000 +0900
-@@ -3186,12 +3186,12 @@
- # which has an extra 1 added just for fun
- #
- case $version_type in
-- darwin|linux|osf|windows)
-+ darwin|linux|osf|windows|freebsd-elf)
- current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_revision"
- ;;
-- freebsd-aout|freebsd-elf|sunos)
-+ freebsd-aout|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
-@@ -3267,8 +3267,8 @@
- ;;
-
- freebsd-elf)
-- major=".$current"
-- versuffix=".$current";
-+ major=.`expr $current - $age`
-+ versuffix="$major"
- ;;
-
- irix | nonstopux)
---- misc/CoinMP-1.6.0/CoinMP/ltmain.sh 2011-08-08 00:09:46.000000000 +0900
-+++ misc/build/CoinMP-1.6.0/CoinMP/ltmain.sh 2012-02-14 12:48:03.000000000 +0900
-@@ -3186,12 +3186,12 @@
- # which has an extra 1 added just for fun
- #
- case $version_type in
-- darwin|linux|osf|windows)
-+ darwin|linux|osf|windows|freebsd-elf)
- current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_revision"
- ;;
-- freebsd-aout|freebsd-elf|sunos)
-+ freebsd-aout|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
-@@ -3267,8 +3267,8 @@
- ;;
-
- freebsd-elf)
-- major=".$current"
-- versuffix=".$current";
-+ major=.`expr $current - $age`
-+ versuffix="$major"
- ;;
-
- irix | nonstopux)
---- misc/CoinMP-1.6.0/CoinUtils/ltmain.sh 2010-06-14 02:53:51.000000000 +0900
-+++ misc/build/CoinMP-1.6.0/CoinUtils/ltmain.sh 2012-02-14 12:48:08.000000000 +0900
-@@ -3186,12 +3186,12 @@
- # which has an extra 1 added just for fun
- #
- case $version_type in
-- darwin|linux|osf|windows)
-+ darwin|linux|osf|windows|freebsd-elf)
- current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_revision"
- ;;
-- freebsd-aout|freebsd-elf|sunos)
-+ freebsd-aout|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
-@@ -3267,8 +3267,8 @@
- ;;
-
- freebsd-elf)
-- major=".$current"
-- versuffix=".$current";
-+ major=.`expr $current - $age`
-+ versuffix="$major"
- ;;
-
- irix | nonstopux)
---- misc/CoinMP-1.6.0/Osi/ltmain.sh 2010-06-14 02:59:18.000000000 +0900
-+++ misc/build/CoinMP-1.6.0/Osi/ltmain.sh 2012-02-14 12:48:24.000000000 +0900
-@@ -3186,12 +3186,12 @@
- # which has an extra 1 added just for fun
- #
- case $version_type in
-- darwin|linux|osf|windows)
-+ darwin|linux|osf|windows|freebsd-elf)
- current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_revision"
- ;;
-- freebsd-aout|freebsd-elf|sunos)
-+ freebsd-aout|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
-@@ -3267,8 +3267,8 @@
- ;;
-
- freebsd-elf)
-- major=".$current"
-- versuffix=".$current";
-+ major=.`expr $current - $age`
-+ versuffix="$major"
- ;;
-
- irix | nonstopux)
---- misc/build/CoinMP-1.6.0/Cbc/configure.orig 2011-11-03 20:55:10.000000000 -0700
-+++ misc/build/CoinMP-1.6.0/Cbc/configure 2012-05-21 23:29:18.000000000 -0700
-@@ -9224,7 +9224,7 @@
+--- misc/CoinMP-1.7.6/Cbc/configure 2013-12-17 21:33:48.000000000 -0300
++++ misc/build/CoinMP-1.7.6/Cbc/configure 2014-02-01 02:02:10.574696821 -0300
+@@ -9151,7 +9151,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var=no
;;
@@ -201,7 +9,7 @@
ld_shlibs=no
;;
-@@ -9240,7 +9240,7 @@
+@@ -9167,7 +9167,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -210,7 +18,7 @@
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
hardcode_minus_L=yes
-@@ -9836,7 +9836,7 @@
+@@ -9763,7 +9763,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -219,7 +27,7 @@
dynamic_linker=no
;;
-@@ -9859,7 +9859,7 @@
+@@ -9786,7 +9786,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -228,7 +36,7 @@
*) objformat=elf ;;
esac
fi
-@@ -9877,7 +9877,7 @@
+@@ -9804,7 +9804,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -237,7 +45,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -12311,7 +12311,7 @@
+@@ -12238,7 +12238,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -246,7 +54,7 @@
# C++ shared libraries reported to be fairly broken before switch to ELF
ld_shlibs_CXX=no
;;
-@@ -13796,7 +13796,7 @@
+@@ -13723,7 +13723,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -255,7 +63,7 @@
dynamic_linker=no
;;
-@@ -13819,7 +13819,7 @@
+@@ -13746,7 +13746,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -264,7 +72,7 @@
*) objformat=elf ;;
esac
fi
-@@ -13837,7 +13837,7 @@
+@@ -13764,7 +13764,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -273,7 +81,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -15771,7 +15771,7 @@
+@@ -15698,7 +15698,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_F77=no
;;
@@ -282,7 +90,7 @@
ld_shlibs_F77=no
;;
-@@ -15787,7 +15787,7 @@
+@@ -15714,7 +15714,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -291,7 +99,7 @@
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct_F77=yes
hardcode_minus_L_F77=yes
-@@ -16383,7 +16383,7 @@
+@@ -16310,7 +16310,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -300,7 +108,7 @@
dynamic_linker=no
;;
-@@ -16406,7 +16406,7 @@
+@@ -16333,7 +16333,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -309,7 +117,7 @@
*) objformat=elf ;;
esac
fi
-@@ -16424,7 +16424,7 @@
+@@ -16351,7 +16351,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -318,7 +126,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -18370,7 +18370,7 @@
+@@ -18297,7 +18297,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_GCJ=no
;;
@@ -327,7 +135,7 @@
ld_shlibs_GCJ=no
;;
-@@ -18386,7 +18386,7 @@
+@@ -18313,7 +18313,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -336,7 +144,7 @@
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct_GCJ=yes
hardcode_minus_L_GCJ=yes
-@@ -18982,7 +18982,7 @@
+@@ -18909,7 +18909,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -345,7 +153,7 @@
dynamic_linker=no
;;
-@@ -19005,7 +19005,7 @@
+@@ -18932,7 +18932,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -354,7 +162,7 @@
*) objformat=elf ;;
esac
fi
-@@ -19023,7 +19023,7 @@
+@@ -18950,7 +18950,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -363,9 +171,50 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
---- misc/build/CoinMP-1.6.0/Cgl/configure.orig 2011-10-15 07:48:24.000000000 -0700
-+++ misc/build/CoinMP-1.6.0/Cgl/configure 2012-05-21 23:30:19.000000000 -0700
-@@ -9202,7 +9202,7 @@
+--- misc/CoinMP-1.7.6/Cbc/ltmain.sh 2010-06-13 14:52:10.000000000 -0300
++++ misc/build/CoinMP-1.7.6/Cbc/ltmain.sh 2014-02-01 02:02:10.563696910 -0300
+@@ -3186,12 +3186,12 @@ EOF
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+- darwin|linux|osf|windows)
++ darwin|linux|osf|windows|freebsd-elf)
+ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_revision"
+ ;;
+- freebsd-aout|freebsd-elf|sunos)
++ freebsd-aout|sunos)
+ current="$number_major"
+ revision="$number_minor"
+ age="0"
+@@ -3267,8 +3267,8 @@ EOF
+ ;;
+
+ freebsd-elf)
+- major=".$current"
+- versuffix=".$current";
++ major=.`expr $current - $age`
++ versuffix="$major"
+ ;;
+
+ irix | nonstopux)
+--- misc/CoinMP-1.7.6/Cbc/src/CbcSolver.cpp 2013-04-17 07:02:33.000000000 -0300
++++ misc/build/CoinMP-1.7.6/Cbc/src/CbcSolver.cpp 2014-02-01 02:02:10.561696926 -0300
+@@ -1709,10 +1709,6 @@ int CbcMain1 (int argc, const char *argv
+ }
+ sprintf(generalPrint + strlen(generalPrint),
+ "Build Date: %s \n", __DATE__);
+-#ifdef CBC_SVN_REV
+- sprintf(generalPrint + strlen(generalPrint),
+- "Revision Number: %d \n", CBC_SVN_REV);
+-#endif
+ generalMessageHandler->message(CLP_GENERAL, generalMessages)
+ << generalPrint
+ << CoinMessageEol;
+--- misc/CoinMP-1.7.6/Cgl/configure 2013-12-17 20:54:48.000000000 -0300
++++ misc/build/CoinMP-1.7.6/Cgl/configure 2014-02-01 02:02:10.579696781 -0300
+@@ -9121,7 +9121,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var=no
;;
@@ -374,7 +223,7 @@
ld_shlibs=no
;;
-@@ -9218,7 +9218,7 @@
+@@ -9137,7 +9137,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -383,7 +232,7 @@
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
hardcode_minus_L=yes
-@@ -9814,7 +9814,7 @@
+@@ -9733,7 +9733,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -392,7 +241,7 @@
dynamic_linker=no
;;
-@@ -9837,7 +9837,7 @@
+@@ -9756,7 +9756,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -401,7 +250,7 @@
*) objformat=elf ;;
esac
fi
-@@ -9855,7 +9855,7 @@
+@@ -9774,7 +9774,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -410,7 +259,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -12289,7 +12289,7 @@
+@@ -12208,7 +12208,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -419,7 +268,7 @@
# C++ shared libraries reported to be fairly broken before switch to ELF
ld_shlibs_CXX=no
;;
-@@ -13774,7 +13774,7 @@
+@@ -13693,7 +13693,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -428,7 +277,7 @@
dynamic_linker=no
;;
-@@ -13797,7 +13797,7 @@
+@@ -13716,7 +13716,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -437,7 +286,7 @@
*) objformat=elf ;;
esac
fi
-@@ -13815,7 +13815,7 @@
+@@ -13734,7 +13734,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -446,7 +295,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -15749,7 +15749,7 @@
+@@ -15668,7 +15668,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_F77=no
;;
@@ -455,7 +304,7 @@
ld_shlibs_F77=no
;;
-@@ -15765,7 +15765,7 @@
+@@ -15684,7 +15684,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -464,7 +313,7 @@
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct_F77=yes
hardcode_minus_L_F77=yes
-@@ -16361,7 +16361,7 @@
+@@ -16280,7 +16280,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -473,7 +322,7 @@
dynamic_linker=no
;;
-@@ -16384,7 +16384,7 @@
+@@ -16303,7 +16303,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -482,7 +331,7 @@
*) objformat=elf ;;
esac
fi
-@@ -16402,7 +16402,7 @@
+@@ -16321,7 +16321,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -491,7 +340,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -18348,7 +18348,7 @@
+@@ -18267,7 +18267,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_GCJ=no
;;
@@ -500,7 +349,7 @@
ld_shlibs_GCJ=no
;;
-@@ -18364,7 +18364,7 @@
+@@ -18283,7 +18283,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -509,7 +358,7 @@
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct_GCJ=yes
hardcode_minus_L_GCJ=yes
-@@ -18960,7 +18960,7 @@
+@@ -18879,7 +18879,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -518,7 +367,7 @@
dynamic_linker=no
;;
-@@ -18983,7 +18983,7 @@
+@@ -18902,7 +18902,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -527,7 +376,7 @@
*) objformat=elf ;;
esac
fi
-@@ -19001,7 +19001,7 @@
+@@ -18920,7 +18920,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -536,9 +385,37 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
---- misc/build/CoinMP-1.6.0/Clp/configure.orig 2011-11-05 12:32:33.000000000 -0700
-+++ misc/build/CoinMP-1.6.0/Clp/configure 2012-05-21 23:35:23.000000000 -0700
-@@ -9225,7 +9225,7 @@
+--- misc/CoinMP-1.7.6/Cgl/ltmain.sh 2010-06-13 14:52:57.000000000 -0300
++++ misc/build/CoinMP-1.7.6/Cgl/ltmain.sh 2014-02-01 02:02:10.564696901 -0300
+@@ -3186,12 +3186,12 @@ EOF
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+- darwin|linux|osf|windows)
++ darwin|linux|osf|windows|freebsd-elf)
+ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_revision"
+ ;;
+- freebsd-aout|freebsd-elf|sunos)
++ freebsd-aout|sunos)
+ current="$number_major"
+ revision="$number_minor"
+ age="0"
+@@ -3267,8 +3267,8 @@ EOF
+ ;;
+
+ freebsd-elf)
+- major=".$current"
+- versuffix=".$current";
++ major=.`expr $current - $age`
++ versuffix="$major"
+ ;;
+
+ irix | nonstopux)
+--- misc/CoinMP-1.7.6/Clp/configure 2013-12-17 19:17:18.000000000 -0300
++++ misc/build/CoinMP-1.7.6/Clp/configure 2014-02-01 02:02:10.583696749 -0300
+@@ -9148,7 +9148,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var=no
;;
@@ -547,7 +424,7 @@
ld_shlibs=no
;;
-@@ -9241,7 +9241,7 @@
+@@ -9164,7 +9164,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -556,7 +433,7 @@
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
hardcode_minus_L=yes
-@@ -9837,7 +9837,7 @@
+@@ -9760,7 +9760,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -565,7 +442,7 @@
dynamic_linker=no
;;
-@@ -9860,7 +9860,7 @@
+@@ -9783,7 +9783,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -574,7 +451,7 @@
*) objformat=elf ;;
esac
fi
-@@ -9878,7 +9878,7 @@
+@@ -9801,7 +9801,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -583,7 +460,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -12312,7 +12312,7 @@
+@@ -12235,7 +12235,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -592,7 +469,7 @@
# C++ shared libraries reported to be fairly broken before switch to ELF
ld_shlibs_CXX=no
;;
-@@ -13797,7 +13797,7 @@
+@@ -13720,7 +13720,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -601,7 +478,7 @@
dynamic_linker=no
;;
-@@ -13820,7 +13820,7 @@
+@@ -13743,7 +13743,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -610,7 +487,7 @@
*) objformat=elf ;;
esac
fi
-@@ -13838,7 +13838,7 @@
+@@ -13761,7 +13761,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -619,7 +496,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -15772,7 +15772,7 @@
+@@ -15695,7 +15695,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_F77=no
;;
@@ -628,7 +505,7 @@
ld_shlibs_F77=no
;;
-@@ -15788,7 +15788,7 @@
+@@ -15711,7 +15711,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -637,7 +514,7 @@
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct_F77=yes
hardcode_minus_L_F77=yes
-@@ -16384,7 +16384,7 @@
+@@ -16307,7 +16307,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -646,7 +523,7 @@
dynamic_linker=no
;;
-@@ -16407,7 +16407,7 @@
+@@ -16330,7 +16330,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -655,7 +532,7 @@
*) objformat=elf ;;
esac
fi
-@@ -16425,7 +16425,7 @@
+@@ -16348,7 +16348,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -664,7 +541,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -18371,7 +18371,7 @@
+@@ -18294,7 +18294,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_GCJ=no
;;
@@ -673,7 +550,7 @@
ld_shlibs_GCJ=no
;;
-@@ -18387,7 +18387,7 @@
+@@ -18310,7 +18310,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -682,7 +559,7 @@
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct_GCJ=yes
hardcode_minus_L_GCJ=yes
-@@ -18983,7 +18983,7 @@
+@@ -18906,7 +18906,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -691,7 +568,7 @@
dynamic_linker=no
;;
-@@ -19006,7 +19006,7 @@
+@@ -18929,7 +18929,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -700,7 +577,7 @@
*) objformat=elf ;;
esac
fi
-@@ -19024,7 +19024,7 @@
+@@ -18947,7 +18947,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -709,9 +586,37 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
---- misc/build/CoinMP-1.6.0/CoinMP/configure.orig 2011-11-07 19:35:10.000000000 -0800
-+++ misc/build/CoinMP-1.6.0/CoinMP/configure 2012-05-21 23:32:22.000000000 -0700
-@@ -9168,7 +9168,7 @@
+--- misc/CoinMP-1.7.6/Clp/ltmain.sh 2010-06-13 14:53:25.000000000 -0300
++++ misc/build/CoinMP-1.7.6/Clp/ltmain.sh 2014-02-01 02:02:10.566696885 -0300
+@@ -3186,12 +3186,12 @@ EOF
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+- darwin|linux|osf|windows)
++ darwin|linux|osf|windows|freebsd-elf)
+ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_revision"
+ ;;
+- freebsd-aout|freebsd-elf|sunos)
++ freebsd-aout|sunos)
+ current="$number_major"
+ revision="$number_minor"
+ age="0"
+@@ -3267,8 +3267,8 @@ EOF
+ ;;
+
+ freebsd-elf)
+- major=".$current"
+- versuffix=".$current";
++ major=.`expr $current - $age`
++ versuffix="$major"
+ ;;
+
+ irix | nonstopux)
+--- misc/CoinMP-1.7.6/CoinMP/configure 2013-12-19 12:56:13.000000000 -0300
++++ misc/build/CoinMP-1.7.6/CoinMP/configure 2014-02-01 02:02:10.586696725 -0300
+@@ -9090,7 +9090,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var=no
;;
@@ -720,7 +625,7 @@
ld_shlibs=no
;;
-@@ -9184,7 +9184,7 @@
+@@ -9106,7 +9106,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -729,7 +634,7 @@
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
hardcode_minus_L=yes
-@@ -9780,7 +9780,7 @@
+@@ -9702,7 +9702,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -738,7 +643,7 @@
dynamic_linker=no
;;
-@@ -9803,7 +9803,7 @@
+@@ -9725,7 +9725,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -747,7 +652,7 @@
*) objformat=elf ;;
esac
fi
-@@ -9821,7 +9821,7 @@
+@@ -9743,7 +9743,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -756,7 +661,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -12255,7 +12255,7 @@
+@@ -12177,7 +12177,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -765,7 +670,7 @@
# C++ shared libraries reported to be fairly broken before switch to ELF
ld_shlibs_CXX=no
;;
-@@ -13740,7 +13740,7 @@
+@@ -13662,7 +13662,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -774,7 +679,7 @@
dynamic_linker=no
;;
-@@ -13763,7 +13763,7 @@
+@@ -13685,7 +13685,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -783,7 +688,7 @@
*) objformat=elf ;;
esac
fi
-@@ -13781,7 +13781,7 @@
+@@ -13703,7 +13703,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -792,7 +697,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -15715,7 +15715,7 @@
+@@ -15637,7 +15637,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_F77=no
;;
@@ -801,7 +706,7 @@
ld_shlibs_F77=no
;;
-@@ -15731,7 +15731,7 @@
+@@ -15653,7 +15653,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -810,7 +715,7 @@
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct_F77=yes
hardcode_minus_L_F77=yes
-@@ -16327,7 +16327,7 @@
+@@ -16249,7 +16249,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -819,7 +724,7 @@
dynamic_linker=no
;;
-@@ -16350,7 +16350,7 @@
+@@ -16272,7 +16272,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -828,7 +733,7 @@
*) objformat=elf ;;
esac
fi
-@@ -16368,7 +16368,7 @@
+@@ -16290,7 +16290,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -837,7 +742,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -18314,7 +18314,7 @@
+@@ -18236,7 +18236,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_GCJ=no
;;
@@ -846,7 +751,7 @@
ld_shlibs_GCJ=no
;;
-@@ -18330,7 +18330,7 @@
+@@ -18252,7 +18252,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -855,7 +760,7 @@
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct_GCJ=yes
hardcode_minus_L_GCJ=yes
-@@ -18926,7 +18926,7 @@
+@@ -18848,7 +18848,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -864,7 +769,7 @@
dynamic_linker=no
;;
-@@ -18949,7 +18949,7 @@
+@@ -18871,7 +18871,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -873,7 +778,7 @@
*) objformat=elf ;;
esac
fi
-@@ -18967,7 +18967,7 @@
+@@ -18889,7 +18889,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -882,9 +787,37 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
---- misc/build/CoinMP-1.6.0/CoinUtils/configure.orig 2011-11-03 20:11:07.000000000 -0700
-+++ misc/build/CoinMP-1.6.0/CoinUtils/configure 2012-05-21 23:33:08.000000000 -0700
-@@ -10658,7 +10658,7 @@
+--- misc/CoinMP-1.7.6/CoinMP/ltmain.sh 2011-08-07 12:09:46.000000000 -0300
++++ misc/build/CoinMP-1.7.6/CoinMP/ltmain.sh 2014-02-01 02:02:10.567696878 -0300
+@@ -3186,12 +3186,12 @@ EOF
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+- darwin|linux|osf|windows)
++ darwin|linux|osf|windows|freebsd-elf)
+ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_revision"
+ ;;
+- freebsd-aout|freebsd-elf|sunos)
++ freebsd-aout|sunos)
+ current="$number_major"
+ revision="$number_minor"
+ age="0"
+@@ -3267,8 +3267,8 @@ EOF
+ ;;
+
+ freebsd-elf)
+- major=".$current"
+- versuffix=".$current";
++ major=.`expr $current - $age`
++ versuffix="$major"
+ ;;
+
+ irix | nonstopux)
+--- misc/CoinMP-1.7.6/CoinUtils/configure 2013-12-17 18:22:26.000000000 -0300
++++ misc/build/CoinMP-1.7.6/CoinUtils/configure 2014-02-01 02:02:10.592696677 -0300
+@@ -10533,7 +10533,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var=no
;;
@@ -893,7 +826,7 @@
ld_shlibs=no
;;
-@@ -10674,7 +10674,7 @@
+@@ -10549,7 +10549,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -902,7 +835,7 @@
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
hardcode_minus_L=yes
-@@ -11270,7 +11270,7 @@
+@@ -11145,7 +11145,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -911,7 +844,7 @@
dynamic_linker=no
;;
-@@ -11293,7 +11293,7 @@
+@@ -11168,7 +11168,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -920,7 +853,7 @@
*) objformat=elf ;;
esac
fi
-@@ -11311,7 +11311,7 @@
+@@ -11186,7 +11186,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -929,7 +862,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -13817,7 +13817,7 @@
+@@ -13692,7 +13692,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -938,7 +871,7 @@
# C++ shared libraries reported to be fairly broken before switch to ELF
ld_shlibs_CXX=no
;;
-@@ -15302,7 +15302,7 @@
+@@ -15177,7 +15177,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -947,7 +880,7 @@
dynamic_linker=no
;;
-@@ -15325,7 +15325,7 @@
+@@ -15200,7 +15200,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -956,7 +889,7 @@
*) objformat=elf ;;
esac
fi
-@@ -15343,7 +15343,7 @@
+@@ -15218,7 +15218,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -965,7 +898,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -17277,7 +17277,7 @@
+@@ -17152,7 +17152,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_F77=no
;;
@@ -974,7 +907,7 @@
ld_shlibs_F77=no
;;
-@@ -17293,7 +17293,7 @@
+@@ -17168,7 +17168,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -983,7 +916,7 @@
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct_F77=yes
hardcode_minus_L_F77=yes
-@@ -17889,7 +17889,7 @@
+@@ -17764,7 +17764,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -992,7 +925,7 @@
dynamic_linker=no
;;
-@@ -17912,7 +17912,7 @@
+@@ -17787,7 +17787,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -1001,7 +934,7 @@
*) objformat=elf ;;
esac
fi
-@@ -17930,7 +17930,7 @@
+@@ -17805,7 +17805,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -1010,7 +943,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -19892,7 +19892,7 @@
+@@ -19767,7 +19767,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_GCJ=no
;;
@@ -1019,7 +952,7 @@
ld_shlibs_GCJ=no
;;
-@@ -19908,7 +19908,7 @@
+@@ -19783,7 +19783,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -1028,7 +961,7 @@
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct_GCJ=yes
hardcode_minus_L_GCJ=yes
-@@ -20504,7 +20504,7 @@
+@@ -20379,7 +20379,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -1037,7 +970,7 @@
dynamic_linker=no
;;
-@@ -20527,7 +20527,7 @@
+@@ -20402,7 +20402,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -1046,7 +979,7 @@
*) objformat=elf ;;
esac
fi
-@@ -20545,7 +20545,7 @@
+@@ -20420,7 +20420,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -1055,9 +988,37 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
---- misc/build/CoinMP-1.6.0/Osi/configure.orig 2011-10-15 07:26:34.000000000 -0700
-+++ misc/build/CoinMP-1.6.0/Osi/configure 2012-05-21 23:34:02.000000000 -0700
-@@ -9197,7 +9197,7 @@
+--- misc/CoinMP-1.7.6/CoinUtils/ltmain.sh 2010-06-13 14:53:51.000000000 -0300
++++ misc/build/CoinMP-1.7.6/CoinUtils/ltmain.sh 2014-02-01 02:02:10.568696869 -0300
+@@ -3186,12 +3186,12 @@ EOF
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+- darwin|linux|osf|windows)
++ darwin|linux|osf|windows|freebsd-elf)
+ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_revision"
+ ;;
+- freebsd-aout|freebsd-elf|sunos)
++ freebsd-aout|sunos)
+ current="$number_major"
+ revision="$number_minor"
+ age="0"
+@@ -3267,8 +3267,8 @@ EOF
+ ;;
+
+ freebsd-elf)
+- major=".$current"
+- versuffix=".$current";
++ major=.`expr $current - $age`
++ versuffix="$major"
+ ;;
+
+ irix | nonstopux)
+--- misc/CoinMP-1.7.6/Osi/configure 2013-12-17 18:46:39.000000000 -0300
++++ misc/build/CoinMP-1.7.6/Osi/configure 2014-02-01 02:02:10.596696644 -0300
+@@ -9119,7 +9119,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var=no
;;
@@ -1066,7 +1027,7 @@
ld_shlibs=no
;;
-@@ -9213,7 +9213,7 @@
+@@ -9135,7 +9135,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -1075,7 +1036,7 @@
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
hardcode_minus_L=yes
-@@ -9809,7 +9809,7 @@
+@@ -9731,7 +9731,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -1084,7 +1045,7 @@
dynamic_linker=no
;;
-@@ -9832,7 +9832,7 @@
+@@ -9754,7 +9754,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -1093,7 +1054,7 @@
*) objformat=elf ;;
esac
fi
-@@ -9850,7 +9850,7 @@
+@@ -9772,7 +9772,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -1102,7 +1063,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -12284,7 +12284,7 @@
+@@ -12206,7 +12206,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -1111,7 +1072,7 @@
# C++ shared libraries reported to be fairly broken before switch to ELF
ld_shlibs_CXX=no
;;
-@@ -13769,7 +13769,7 @@
+@@ -13691,7 +13691,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -1120,7 +1081,7 @@
dynamic_linker=no
;;
-@@ -13792,7 +13792,7 @@
+@@ -13714,7 +13714,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -1129,7 +1090,7 @@
*) objformat=elf ;;
esac
fi
-@@ -13810,7 +13810,7 @@
+@@ -13732,7 +13732,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -1138,7 +1099,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -15744,7 +15744,7 @@
+@@ -15666,7 +15666,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_F77=no
;;
@@ -1147,7 +1108,7 @@
ld_shlibs_F77=no
;;
-@@ -15760,7 +15760,7 @@
+@@ -15682,7 +15682,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -1156,7 +1117,7 @@
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct_F77=yes
hardcode_minus_L_F77=yes
-@@ -16356,7 +16356,7 @@
+@@ -16278,7 +16278,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -1165,7 +1126,7 @@
dynamic_linker=no
;;
-@@ -16379,7 +16379,7 @@
+@@ -16301,7 +16301,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -1174,7 +1135,7 @@
*) objformat=elf ;;
esac
fi
-@@ -16397,7 +16397,7 @@
+@@ -16319,7 +16319,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -1183,7 +1144,7 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -18343,7 +18343,7 @@
+@@ -18265,7 +18265,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var_GCJ=no
;;
@@ -1192,7 +1153,7 @@
ld_shlibs_GCJ=no
;;
-@@ -18359,7 +18359,7 @@
+@@ -18281,7 +18281,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
@@ -1201,7 +1162,7 @@
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct_GCJ=yes
hardcode_minus_L_GCJ=yes
-@@ -18955,7 +18955,7 @@
+@@ -18877,7 +18877,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -1210,7 +1171,7 @@
dynamic_linker=no
;;
-@@ -18978,7 +18978,7 @@
+@@ -18900,7 +18900,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
@@ -1219,7 +1180,7 @@
*) objformat=elf ;;
esac
fi
-@@ -18996,7 +18996,7 @@
+@@ -18918,7 +18918,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -1228,3 +1189,31 @@
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
+--- misc/CoinMP-1.7.6/Osi/ltmain.sh 2010-06-13 14:59:18.000000000 -0300
++++ misc/build/CoinMP-1.7.6/Osi/ltmain.sh 2014-02-01 02:02:10.569696861 -0300
+@@ -3186,12 +3186,12 @@ EOF
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+- darwin|linux|osf|windows)
++ darwin|linux|osf|windows|freebsd-elf)
+ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_revision"
+ ;;
+- freebsd-aout|freebsd-elf|sunos)
++ freebsd-aout|sunos)
+ current="$number_major"
+ revision="$number_minor"
+ age="0"
+@@ -3267,8 +3267,8 @@ EOF
+ ;;
+
+ freebsd-elf)
+- major=".$current"
+- versuffix=".$current";
++ major=.`expr $current - $age`
++ versuffix="$major"
+ ;;
+
+ irix | nonstopux)
Propchange: openoffice/trunk/ext_libraries/coinmp/coinmp-1.7.6.patch
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openoffice/trunk/ext_libraries/coinmp/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/coinmp/makefile.mk?rev=1585171&r1=1585170&r2=1585171&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/coinmp/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/coinmp/makefile.mk Sat Apr 5 19:26:38 2014
@@ -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 "$(COM)"=="MSC"
BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv CoinMP\\MSVisualStudio\\v9\\CoinMP.sln "Release|Win32"
@@ -54,7 +54,7 @@ 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)'
#BUILD_ACTION= CC="$(CC) $(ARCH_FLAGS)" CPP="$(CXX) $(ARCH_FLAGS)" $(GNUMAKE) -j8
-BUILD_ACTION= $(GNUMAKE) -j8
+BUILD_ACTION= $(GNUMAKE) -j$(MAXPROCESS)
.ENDIF
OUT2INC+=CoinMP$/src/CoinMP.h
Modified: openoffice/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1585171&r1=1585170&r2=1585171&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Sat Apr 5 19:26:38 2014
@@ -250,9 +250,10 @@ if (RAT_JAR_HOME==BUILD)
#
if (ENABLE_CATEGORY_B==YES && SYSTEM_COINMP!=YES)
- MD5 = 2b5f1ca58d6ef30f18f1415b65bed81c
- name = CoinMP-1.6.0.tgz
- URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
+ MD5 = 1cce53bf4b40ae29790d2c5c9f8b1129
+ name = CoinMP-1.7.6.tgz
+ # URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
+ URL1 = http://www.coin-or.org/download/source/CoinMP/$(name)
if (WITH_CATB_FONTS == YES)
MD5 = 35efabc239af896dfb79be7ebdd6e6b9