2009-12-15 Lukas (Luc) Oboril <
[email protected]> * CBEcmake.spec: add fix Boost and JNI find modules
--- a/CBEcmake.spec Tue Dec 15 10:45:17 2009 +0000
+++ b/CBEcmake.spec Tue Dec 15 11:02:29 2009 +0000
@@ -19,6 +19,8 @@
URL: http://www.cmake.org
Patch1: cmake-01-SunOS.cmake.diff
Patch2: cmake-02-FindGettext.cmake.diff
+Patch3: cmake-03-FindBoost.cmake.diff
+Patch4: cmake-04-FindJNI.cmake.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
SUNW_BaseDir: %{_prefix}
SUNW_Category: CBE,KDE,application
@@ -31,6 +33,8 @@
%setup -q -n cmake-%{version}
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -75,6 +79,9 @@
%{_datadir}/doc/*
%changelog
+* Wed Dec 2 2009 <[email protected]>
+- add cmake-03-FindBoost.cmake.diff and
+- cmake-04-FindJNI.cmake.diff patches
* Tue May 5 2009 <[email protected]>
- bump to 2.6.4 (fix many issues, see cmake changelog)
* Mon Mar 16 2009 <[email protected]>
--- a/ChangeLog Tue Dec 15 10:45:17 2009 +0000
+++ b/ChangeLog Tue Dec 15 11:02:29 2009 +0000
@@ -1,3 +1,6 @@
+2009-12-15 Lukas (Luc) Oboril <[email protected]>
+ * CBEcmake.spec: add fix Boost and JNI find modules
+
2009-12-15 Lukas (Luc) Oboril <[email protected]>
* CBEsubversion.spec: bump to 1.6.6
* CBEautoconf.spec: add CBEm4 on Solaris10
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cmake-03-FindBoost.cmake.diff Tue Dec 15 11:02:29 2009 +0000
@@ -0,0 +1,13 @@
+--- cmake-2.6.4/Modules/FindBoost.cmake.orig 2009-06-19 22:07:16.393149983 +0200
++++ cmake-2.6.4/Modules/FindBoost.cmake 2009-06-19 22:07:41.875860324 +0200
+@@ -596,6 +596,10 @@
+ SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
+ ENDIF()
+ endif()
++ else (CMAKE_COMPILER_IS_GNUCXX)
++ # Assume that if it's unix, not gcc and not one of the
++ # explicitly mentioned compilers above, that is is Sun Studio (spro)
++ set (_boost_COMPILER "-sw")
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ endif()
+ if(Boost_DEBUG)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cmake-04-FindJNI.cmake.diff Tue Dec 15 11:02:29 2009 +0000
@@ -0,0 +1,10 @@
+--- cmake-2.6.4/Modules/FindJNI.cmake.orig 2009-09-04 11:57:49.567728310 +0200
++++ cmake-2.6.4/Modules/FindJNI.cmake 2009-09-04 14:11:46.779460008 +0200
+@@ -144,6 +144,7 @@
+ ${JAVA_INCLUDE_PATH}/win32
+ ${JAVA_INCLUDE_PATH}/linux
+ ${JAVA_INCLUDE_PATH}/freebsd
++ $[JAVA_INCLUDE_PATH}/solaris
+ )
+
+ FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h