| --- 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 @@ |
| hardcode_shlibpath_var=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs=no |
| ;; |
| |
| @@ -9240,7 +9240,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct=yes |
| hardcode_minus_L=yes |
| @@ -9836,7 +9836,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -9859,7 +9859,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -9877,7 +9877,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -12311,7 +12311,7 @@ |
| ;; |
| esac |
| ;; |
| - freebsd[12]*) |
| + freebsd[12].*) |
| # C++ shared libraries reported to be fairly broken before switch to ELF |
| ld_shlibs_CXX=no |
| ;; |
| @@ -13796,7 +13796,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -13819,7 +13819,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -13837,7 +13837,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -15771,7 +15771,7 @@ |
| hardcode_shlibpath_var_F77=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs_F77=no |
| ;; |
| |
| @@ -15787,7 +15787,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct_F77=yes |
| hardcode_minus_L_F77=yes |
| @@ -16383,7 +16383,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -16406,7 +16406,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -16424,7 +16424,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -18370,7 +18370,7 @@ |
| hardcode_shlibpath_var_GCJ=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs_GCJ=no |
| ;; |
| |
| @@ -18386,7 +18386,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct_GCJ=yes |
| hardcode_minus_L_GCJ=yes |
| @@ -18982,7 +18982,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -19005,7 +19005,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -19023,7 +19023,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| 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 @@ |
| hardcode_shlibpath_var=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs=no |
| ;; |
| |
| @@ -9218,7 +9218,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct=yes |
| hardcode_minus_L=yes |
| @@ -9814,7 +9814,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -9837,7 +9837,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -9855,7 +9855,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -12289,7 +12289,7 @@ |
| ;; |
| esac |
| ;; |
| - freebsd[12]*) |
| + freebsd[12].*) |
| # C++ shared libraries reported to be fairly broken before switch to ELF |
| ld_shlibs_CXX=no |
| ;; |
| @@ -13774,7 +13774,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -13797,7 +13797,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -13815,7 +13815,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -15749,7 +15749,7 @@ |
| hardcode_shlibpath_var_F77=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs_F77=no |
| ;; |
| |
| @@ -15765,7 +15765,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct_F77=yes |
| hardcode_minus_L_F77=yes |
| @@ -16361,7 +16361,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -16384,7 +16384,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -16402,7 +16402,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -18348,7 +18348,7 @@ |
| hardcode_shlibpath_var_GCJ=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs_GCJ=no |
| ;; |
| |
| @@ -18364,7 +18364,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct_GCJ=yes |
| hardcode_minus_L_GCJ=yes |
| @@ -18960,7 +18960,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -18983,7 +18983,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -19001,7 +19001,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| 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 @@ |
| hardcode_shlibpath_var=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs=no |
| ;; |
| |
| @@ -9241,7 +9241,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct=yes |
| hardcode_minus_L=yes |
| @@ -9837,7 +9837,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -9860,7 +9860,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -9878,7 +9878,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -12312,7 +12312,7 @@ |
| ;; |
| esac |
| ;; |
| - freebsd[12]*) |
| + freebsd[12].*) |
| # C++ shared libraries reported to be fairly broken before switch to ELF |
| ld_shlibs_CXX=no |
| ;; |
| @@ -13797,7 +13797,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -13820,7 +13820,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -13838,7 +13838,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -15772,7 +15772,7 @@ |
| hardcode_shlibpath_var_F77=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs_F77=no |
| ;; |
| |
| @@ -15788,7 +15788,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct_F77=yes |
| hardcode_minus_L_F77=yes |
| @@ -16384,7 +16384,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -16407,7 +16407,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -16425,7 +16425,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -18371,7 +18371,7 @@ |
| hardcode_shlibpath_var_GCJ=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs_GCJ=no |
| ;; |
| |
| @@ -18387,7 +18387,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct_GCJ=yes |
| hardcode_minus_L_GCJ=yes |
| @@ -18983,7 +18983,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -19006,7 +19006,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -19024,7 +19024,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| 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 @@ |
| hardcode_shlibpath_var=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs=no |
| ;; |
| |
| @@ -9184,7 +9184,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct=yes |
| hardcode_minus_L=yes |
| @@ -9780,7 +9780,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -9803,7 +9803,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -9821,7 +9821,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -12255,7 +12255,7 @@ |
| ;; |
| esac |
| ;; |
| - freebsd[12]*) |
| + freebsd[12].*) |
| # C++ shared libraries reported to be fairly broken before switch to ELF |
| ld_shlibs_CXX=no |
| ;; |
| @@ -13740,7 +13740,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -13763,7 +13763,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -13781,7 +13781,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -15715,7 +15715,7 @@ |
| hardcode_shlibpath_var_F77=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs_F77=no |
| ;; |
| |
| @@ -15731,7 +15731,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct_F77=yes |
| hardcode_minus_L_F77=yes |
| @@ -16327,7 +16327,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -16350,7 +16350,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -16368,7 +16368,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -18314,7 +18314,7 @@ |
| hardcode_shlibpath_var_GCJ=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs_GCJ=no |
| ;; |
| |
| @@ -18330,7 +18330,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct_GCJ=yes |
| hardcode_minus_L_GCJ=yes |
| @@ -18926,7 +18926,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -18949,7 +18949,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -18967,7 +18967,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| 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 @@ |
| hardcode_shlibpath_var=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs=no |
| ;; |
| |
| @@ -10674,7 +10674,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct=yes |
| hardcode_minus_L=yes |
| @@ -11270,7 +11270,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -11293,7 +11293,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -11311,7 +11311,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -13817,7 +13817,7 @@ |
| ;; |
| esac |
| ;; |
| - freebsd[12]*) |
| + freebsd[12].*) |
| # C++ shared libraries reported to be fairly broken before switch to ELF |
| ld_shlibs_CXX=no |
| ;; |
| @@ -15302,7 +15302,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -15325,7 +15325,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -15343,7 +15343,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -17277,7 +17277,7 @@ |
| hardcode_shlibpath_var_F77=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs_F77=no |
| ;; |
| |
| @@ -17293,7 +17293,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct_F77=yes |
| hardcode_minus_L_F77=yes |
| @@ -17889,7 +17889,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -17912,7 +17912,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -17930,7 +17930,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -19892,7 +19892,7 @@ |
| hardcode_shlibpath_var_GCJ=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs_GCJ=no |
| ;; |
| |
| @@ -19908,7 +19908,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct_GCJ=yes |
| hardcode_minus_L_GCJ=yes |
| @@ -20504,7 +20504,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -20527,7 +20527,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -20545,7 +20545,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| 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 @@ |
| hardcode_shlibpath_var=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs=no |
| ;; |
| |
| @@ -9213,7 +9213,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct=yes |
| hardcode_minus_L=yes |
| @@ -9809,7 +9809,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -9832,7 +9832,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -9850,7 +9850,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -12284,7 +12284,7 @@ |
| ;; |
| esac |
| ;; |
| - freebsd[12]*) |
| + freebsd[12].*) |
| # C++ shared libraries reported to be fairly broken before switch to ELF |
| ld_shlibs_CXX=no |
| ;; |
| @@ -13769,7 +13769,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -13792,7 +13792,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -13810,7 +13810,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -15744,7 +15744,7 @@ |
| hardcode_shlibpath_var_F77=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs_F77=no |
| ;; |
| |
| @@ -15760,7 +15760,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct_F77=yes |
| hardcode_minus_L_F77=yes |
| @@ -16356,7 +16356,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -16379,7 +16379,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -16397,7 +16397,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -18343,7 +18343,7 @@ |
| hardcode_shlibpath_var_GCJ=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs_GCJ=no |
| ;; |
| |
| @@ -18359,7 +18359,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct_GCJ=yes |
| hardcode_minus_L_GCJ=yes |
| @@ -18955,7 +18955,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -18978,7 +18978,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -18996,7 +18996,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
