Author: pfg
Date: Wed Feb 15 03:15:05 2012
New Revision: 1244327
URL: http://svn.apache.org/viewvc?rev=1244327&view=rev
Log:
FreeBSD port: libtool has problems generating shared libraries on freebsd-elf.
Submitted by maho@
Modified:
incubator/ooo/trunk/ext_libraries/coinmp/coinmp-1.6.0.patch
Modified: incubator/ooo/trunk/ext_libraries/coinmp/coinmp-1.6.0.patch
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/coinmp/coinmp-1.6.0.patch?rev=1244327&r1=1244326&r2=1244327&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/coinmp/coinmp-1.6.0.patch (original)
+++ incubator/ooo/trunk/ext_libraries/coinmp/coinmp-1.6.0.patch Wed Feb 15
03:15:05 2012
@@ -21,3 +21,172 @@
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)
