Dear Adam, On Sat, Aug 14, 2010 at 10:21:54AM +0100, Adam D. Barratt wrote: > On Thu, 2010-08-12 at 16:55 -0500, Kumar Appaiah wrote: > > On Thu, Aug 12, 2010 at 04:50:32PM -0500, Kumar Appaiah wrote: > > > Dear Release Team, > > > > > > I propose to sponsor plplot in order to fix an RC bug. I have a patch > > > (given to me by the maintainer) attached. Please let me know if it is > > > all right to go ahead with the upload. > > > > OK, I lied. This mail has the patch attached. > > Please go ahead, and let us know once the package has been accepted. I did not do the upload till today, because some changes in cmake had caused the built binary packages to have problematic libraries. However, thanks to some stellar work by the upstream (== Debian maintainer == Andrew Ross) of plplot, we have a fixed package which backports only the required changes. I have uploaded the package now, and the latest diff is attached. Please do unblock it. Thanks. Kumar P. S. Many thanks for Andrew for taking time to get these changes into Debian. We love upstreams like you! :-) -- linux: the choice of a GNU generation (ksh@cis.ufl.edu put this on Tshirts in '93)
diff -u plplot-5.9.5/debian/rules plplot-5.9.5/debian/rules
--- plplot-5.9.5/debian/rules
+++ plplot-5.9.5/debian/rules
@@ -180,7 +180,7 @@
install-python%: build-arch-stamp
( cd $(BUILD_DIR) ; \
- cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=/usr/lib/python$*/config/libpython$*.so -DPYTHON_INCLUDE_PATH="/usr/include/python$*;/usr/include/numpy" -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \
+ cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=/usr/lib/python$*/config/libpython$*.so -DPYTHON_INCLUDE_PATH="/usr/include/python$*;/usr/include/numpy;/usr/lib/pyshared/python$*/numpy/core/include/numpy" -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \
for d in python ; do \
( cd bindings/$$d; \
$(MAKE) clean ; \
@@ -212,6 +212,7 @@
dh_installchangelogs --package=$(libpkg) --package=libcsiro0
dh_pycentral --package=python-plplot
+ dh_numpy
dh_strip -a
dh_compress -a -Xexamples/
dh_fixperms -a
diff -u plplot-5.9.5/debian/control plplot-5.9.5/debian/control
--- plplot-5.9.5/debian/control
+++ plplot-5.9.5/debian/control
@@ -2,7 +2,7 @@
Section: math
Priority: optional
Maintainer: Andrew Ross <andrewross@users.sourceforge.net>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Build-Depends: cmake (>= 2.6.3), debhelper (>= 7),
tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev,
libxi-dev, gfortran, itk3-dev, octave3.2-headers,
@@ -10,7 +10,7 @@
libxml-parser-perl, libxml-dom-perl, libltdl3-dev, pkg-config,
quilt, slice, python-gtk2-dev, libwxgtk2.8-dev,
python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
- python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk,
+ python-numpy (>= 1:1.4.1-4~), ttf-freefont, default-jdk,
fastjar, swig, gnat [!sh4]
Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
docbook2x, opensp, jadetex, ghostscript
@@ -140,8 +140,6 @@
This package contains the following utilities associated with PLplot.
.
* pltek - review a Tektronix vector file
- * plm2gif - converts PLplot metafiles to GIF files
- * plpr - converts PLplot metafile to something the printer will understand
Package: plplot9-driver-xwin
Architecture: any
@@ -189,8 +187,7 @@
.
This package contains the Tcl/Tk support for PLplot: shared libraries,
Tcl modules, the Tk driver, and some programs for interactive use of
- PLplot (plserver and pltcl). Also included is the utility program
- plrender to render PLplot metafiles.
+ PLplot (plserver and pltcl).
Package: plplot-tcl-dev
Architecture: any
@@ -242,14 +239,14 @@
virtually all aspects of plotting are configurable.
.
This package provides the Cairo driver module for PLplot. It is based
- on the Cairo 2D graphics library with supportting multiple output devices
+ on the Cairo 2D graphics library with supporting multiple output devices
(X-Window, PDF, PostScript, and PNG).
Package: python-plplot
Architecture: any
Section: python
Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends},
- ${python:Depends}, python-numpy, ${misc:Depends}
+ ${python:Depends}, ${misc:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python support for PLplot, a plotting library
diff -u plplot-5.9.5/debian/changelog plplot-5.9.5/debian/changelog
--- plplot-5.9.5/debian/changelog
+++ plplot-5.9.5/debian/changelog
@@ -1,3 +1,20 @@
+plplot (5.9.5-4) unstable; urgency=low
+
+ * debian/rules, debian/control.in: update to use dh_numpy in debian/rules
+ to get versioned numpy support. Requires python numpy >= 1:1.1.4.1-4~
+ (closes: 590770).
+ * debian/control.in: Bump standards version to 3.9.1.
+ * debian/control.in, debian/plplot-bin.files: remove references to plrender
+ in package descriptions (no longer included) and also remove plpr / plm2gif
+ scripts which rely on plrender.
+ * debian/control.in: Fix spelling mistake in cairo driver package
+ (closes: 592970)
+ * debian/patches/18_update_cmake_fortran.diff: Remove plplot workaround for
+ cmake fortran support as this is no longer needed with cmake 2.8.2 and
+ causes errors building the f77 and f95 libraries.
+
+ -- Andrew Ross <andrewross@users.sourceforge.net> Thu, 26 Aug 2010 13:38:26 +0100
+
plplot (5.9.5-3) unstable; urgency=low
* debian/control.in:
diff -u plplot-5.9.5/debian/control.in plplot-5.9.5/debian/control.in
--- plplot-5.9.5/debian/control.in
+++ plplot-5.9.5/debian/control.in
@@ -2,15 +2,15 @@
Section: math
Priority: optional
Maintainer: Andrew Ross <andrewross@users.sourceforge.net>
-Standards-Version: 3.8.4
-Build-Depends: cmake (>= 2.6.3), debhelper (>= 7),
+Standards-Version: 3.9.1
+Build-Depends: cmake (>= 2.8.2), debhelper (>= 7),
tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev,
libxi-dev, gfortran, itk3-dev, octave3.2-headers,
libgd2-noxpm-dev | libgd2-xpm-dev, m4, libqhull-dev (>= 2003.1-8),
libxml-parser-perl, libxml-dom-perl, libltdl3-dev, pkg-config,
quilt, slice, python-gtk2-dev, libwxgtk2.8-dev,
python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
- python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk,
+ python-numpy (>= 1:1.4.1-4~), ttf-freefont, default-jdk,
fastjar, swig, gnat [!sh4]
Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
docbook2x, opensp, jadetex, ghostscript
@@ -140,8 +140,6 @@
This package contains the following utilities associated with PLplot.
.
* pltek - review a Tektronix vector file
- * plm2gif - converts PLplot metafiles to GIF files
- * plpr - converts PLplot metafile to something the printer will understand
Package: plplot9-driver-xwin
Architecture: any
@@ -189,8 +187,7 @@
.
This package contains the Tcl/Tk support for PLplot: shared libraries,
Tcl modules, the Tk driver, and some programs for interactive use of
- PLplot (plserver and pltcl). Also included is the utility program
- plrender to render PLplot metafiles.
+ PLplot (plserver and pltcl).
Package: plplot-tcl-dev
Architecture: any
@@ -242,14 +239,14 @@
virtually all aspects of plotting are configurable.
.
This package provides the Cairo driver module for PLplot. It is based
- on the Cairo 2D graphics library with supportting multiple output devices
+ on the Cairo 2D graphics library with supporting multiple output devices
(X-Window, PDF, PostScript, and PNG).
Package: python-plplot
Architecture: any
Section: python
Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends},
- ${python:Depends}, python-numpy, ${misc:Depends}
+ ${python:Depends}, ${misc:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python support for PLplot, a plotting library
diff -u plplot-5.9.5/debian/patches/series plplot-5.9.5/debian/patches/series
--- plplot-5.9.5/debian/patches/series
+++ plplot-5.9.5/debian/patches/series
@@ -6,0 +7 @@
+18_update_cmake_fortran.diff
only in patch2:
unchanged:
--- plplot-5.9.5.orig/debian/plplot-bin.files
+++ plplot-5.9.5/debian/plplot-bin.files
@@ -1,3 +1,3 @@
-usr/bin
-usr/share/man
+usr/bin/pltek
+usr/share/man/man1/pltek.1
usr/share/doc/plplot-bin
only in patch2:
unchanged:
--- plplot-5.9.5.orig/debian/patches/18_update_cmake_fortran.diff
+++ plplot-5.9.5/debian/patches/18_update_cmake_fortran.diff
@@ -0,0 +1,219 @@
+# Patch to remove upstream workaround for cmake fortran support as this is not needed with cmake 2.8.2
+
+diff -urN plplot-5.9.5.orig/cmake/modules/CMakeFortranInformation.cmake plplot-5.9.5/cmake/modules/CMakeFortranInformation.cmake
+--- plplot-5.9.5.orig/cmake/modules/CMakeFortranInformation.cmake 2010-08-26 11:20:36.000000000 +0100
++++ plplot-5.9.5/cmake/modules/CMakeFortranInformation.cmake 1970-01-01 01:00:00.000000000 +0100
+@@ -1,189 +0,0 @@
+-
+-# This file sets the basic flags for the Fortran language in CMake.
+-# It also loads the available platform file for the system-compiler
+-# if it exists.
+-
+-GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_Fortran_COMPILER} NAME_WE)
+-# since the gnu compiler has several names force g++
+-IF(CMAKE_COMPILER_IS_GNUG77)
+- SET(CMAKE_BASE_NAME g77)
+-ENDIF(CMAKE_COMPILER_IS_GNUG77)
+-IF(CMAKE_Fortran_COMPILER_ID)
+- IF(EXISTS ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_ID}-Fortran.cmake OR EXISTS ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_ID}-Fortran.cmake)
+- SET(CMAKE_BASE_NAME ${CMAKE_Fortran_COMPILER_ID}-Fortran)
+- ENDIF(EXISTS ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_ID}-Fortran.cmake OR EXISTS ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_ID}-Fortran.cmake)
+-ENDIF(CMAKE_Fortran_COMPILER_ID)
+-IF(EXISTS ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
+- # Use this file if it exists.
+- SET(CMAKE_SYSTEM_AND_Fortran_COMPILER_INFO_FILE
+- ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
+-ELSE(EXISTS ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
+- # This one apparently doesn't have to actually exist, see OPTIONAL below.
+- SET(CMAKE_SYSTEM_AND_Fortran_COMPILER_INFO_FILE
+- ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
+-ENDIF(EXISTS ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
+-INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
+-
+-# This should be included before the _INIT variables are
+-# used to initialize the cache. Since the rule variables
+-# have if blocks on them, users can still define them here.
+-# But, it should still be after the platform file so changes can
+-# be made to those values.
+-
+-IF(CMAKE_USER_MAKE_RULES_OVERRIDE)
+- INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE})
+-ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE)
+-
+-IF(CMAKE_USER_MAKE_RULES_OVERRIDE_Fortran)
+- INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE_Fortran})
+-ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE_Fortran)
+-
+-
+-# Fortran needs cmake to do a requires step during its build process to
+-# catch any modules
+-SET(CMAKE_NEEDS_REQUIRES_STEP_Fortran_FLAG 1)
+-
+-# Create a set of shared library variable specific to Fortran
+-# For 90% of the systems, these are the same flags as the C versions
+-# so if these are not set just copy the flags from the c version
+-IF(NOT CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS)
+- SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
+-ENDIF(NOT CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS)
+-
+-IF(NOT CMAKE_SHARED_LIBRARY_Fortran_FLAGS)
+- SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS})
+-ENDIF(NOT CMAKE_SHARED_LIBRARY_Fortran_FLAGS)
+-
+-IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS)
+- SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS})
+-ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS)
+-
+-IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG)
+- SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG})
+-ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG)
+-
+-IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP)
+- SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP})
+-ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP)
+-
+-IF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Fortran_FLAG)
+- SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG})
+-ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Fortran_FLAG)
+-
+-# repeat for modules
+-IF(NOT CMAKE_SHARED_MODULE_CREATE_Fortran_FLAGS)
+- SET(CMAKE_SHARED_MODULE_CREATE_Fortran_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS})
+-ENDIF(NOT CMAKE_SHARED_MODULE_CREATE_Fortran_FLAGS)
+-
+-IF(NOT CMAKE_SHARED_MODULE_Fortran_FLAGS)
+- SET(CMAKE_SHARED_MODULE_Fortran_FLAGS ${CMAKE_SHARED_MODULE_C_FLAGS})
+-ENDIF(NOT CMAKE_SHARED_MODULE_Fortran_FLAGS)
+-
+-IF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG)
+- SET(CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG})
+-ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG)
+-
+-IF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP)
+- SET(CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP})
+-ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP)
+-
+-IF(NOT CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG)
+- SET(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG})
+-ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG)
+-
+-IF(NOT CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG_SEP)
+- SET(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP})
+-ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG_SEP)
+-
+-IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Fortran_FLAG)
+- SET(CMAKE_EXECUTABLE_RPATH_LINK_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_Fortran_FLAG})
+-ENDIF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Fortran_FLAG)
+-
+-IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Fortran_WITH_RUNTIME_PATH)
+- SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_WITH_RUNTIME_PATH ${CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH})
+-ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Fortran_WITH_RUNTIME_PATH)
+-
+-IF(NOT CMAKE_INCLUDE_FLAG_Fortran)
+- SET(CMAKE_INCLUDE_FLAG_Fortran ${CMAKE_INCLUDE_FLAG_C})
+-ENDIF(NOT CMAKE_INCLUDE_FLAG_Fortran)
+-
+-IF(NOT CMAKE_INCLUDE_FLAG_SEP_Fortran)
+- SET(CMAKE_INCLUDE_FLAG_SEP_Fortran ${CMAKE_INCLUDE_FLAG_SEP_C})
+-ENDIF(NOT CMAKE_INCLUDE_FLAG_SEP_Fortran)
+-
+-SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.")
+-
+-SET(CMAKE_Fortran_FLAGS_INIT "$ENV{FFLAGS} ${CMAKE_Fortran_FLAGS_INIT}")
+-# avoid just having a space as the initial value for the cache
+-IF(CMAKE_Fortran_FLAGS_INIT STREQUAL " ")
+- SET(CMAKE_Fortran_FLAGS_INIT)
+-ENDIF(CMAKE_Fortran_FLAGS_INIT STREQUAL " ")
+-SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS_INIT}" CACHE STRING
+- "Flags for Fortran compiler.")
+-
+-INCLUDE(CMakeCommonLanguageInclude)
+-
+-# now define the following rule variables
+-# CMAKE_Fortran_CREATE_SHARED_LIBRARY
+-# CMAKE_Fortran_CREATE_SHARED_MODULE
+-# CMAKE_Fortran_CREATE_STATIC_LIBRARY
+-# CMAKE_Fortran_COMPILE_OBJECT
+-# CMAKE_Fortran_LINK_EXECUTABLE
+-
+-# create a Fortran shared library
+-IF(NOT CMAKE_Fortran_CREATE_SHARED_LIBRARY)
+- SET(CMAKE_Fortran_CREATE_SHARED_LIBRARY
+- "<CMAKE_Fortran_COMPILER> <CMAKE_SHARED_LIBRARY_Fortran_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+-ENDIF(NOT CMAKE_Fortran_CREATE_SHARED_LIBRARY)
+-
+-# create a Fortran shared module just copy the shared library rule
+-IF(NOT CMAKE_Fortran_CREATE_SHARED_MODULE)
+- SET(CMAKE_Fortran_CREATE_SHARED_MODULE ${CMAKE_Fortran_CREATE_SHARED_LIBRARY})
+-ENDIF(NOT CMAKE_Fortran_CREATE_SHARED_MODULE)
+-
+-# create a Fortran static library
+-IF(NOT CMAKE_Fortran_CREATE_STATIC_LIBRARY)
+- SET(CMAKE_Fortran_CREATE_STATIC_LIBRARY
+- "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS> "
+- "<CMAKE_RANLIB> <TARGET> ")
+-ENDIF(NOT CMAKE_Fortran_CREATE_STATIC_LIBRARY)
+-
+-# compile a Fortran file into an object file
+-IF(NOT CMAKE_Fortran_COMPILE_OBJECT)
+- SET(CMAKE_Fortran_COMPILE_OBJECT
+- "<CMAKE_Fortran_COMPILER> -o <OBJECT> <DEFINES> <FLAGS> -c <SOURCE>")
+-ENDIF(NOT CMAKE_Fortran_COMPILE_OBJECT)
+-
+-# link a fortran program
+-IF(NOT CMAKE_Fortran_LINK_EXECUTABLE)
+- SET(CMAKE_Fortran_LINK_EXECUTABLE
+- "<CMAKE_Fortran_COMPILER> <CMAKE_Fortran_LINK_FLAGS> <LINK_FLAGS> <FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+-ENDIF(NOT CMAKE_Fortran_LINK_EXECUTABLE)
+-
+-IF(CMAKE_Fortran_STANDARD_LIBRARIES_INIT)
+- SET(CMAKE_Fortran_STANDARD_LIBRARIES "${CMAKE_Fortran_STANDARD_LIBRARIES_INIT}"
+- CACHE STRING "Libraries linked by defalut with all Fortran applications.")
+- MARK_AS_ADVANCED(CMAKE_Fortran_STANDARD_LIBRARIES)
+-ENDIF(CMAKE_Fortran_STANDARD_LIBRARIES_INIT)
+-
+-IF(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
+- SET (CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG_INIT}" CACHE STRING
+- "Flags used by the compiler during debug builds.")
+- SET (CMAKE_Fortran_FLAGS_MINSIZEREL "${CMAKE_Fortran_FLAGS_MINSIZEREL_INIT}" CACHE STRING
+- "Flags used by the compiler during release minsize builds.")
+- SET (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE_INIT}" CACHE STRING
+- "Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files).")
+- SET (CMAKE_Fortran_FLAGS_RELWITHDEBINFO "${CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
+- "Flags used by the compiler during Release with Debug Info builds.")
+-
+-ENDIF(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
+-
+-MARK_AS_ADVANCED(
+-CMAKE_Fortran_FLAGS
+-CMAKE_Fortran_FLAGS_DEBUG
+-CMAKE_Fortran_FLAGS_MINSIZEREL
+-CMAKE_Fortran_FLAGS_RELEASE
+-CMAKE_Fortran_FLAGS_RELWITHDEBINFO)
+-
+-# set this variable so we can avoid loading this more than once.
+-SET(CMAKE_Fortran_INFORMATION_LOADED 1)
+diff -urN plplot-5.9.5.orig/cmake/modules/language_support.cmake plplot-5.9.5/cmake/modules/language_support.cmake
+--- plplot-5.9.5.orig/cmake/modules/language_support.cmake 2010-08-26 21:45:20.000000000 +0100
++++ plplot-5.9.5/cmake/modules/language_support.cmake 2010-08-26 21:51:17.000000000 +0100
+@@ -49,7 +49,6 @@
+ elseif(language STREQUAL "Fortran")
+ set(language_special ON)
+ set(language_files
+- CMakeFortranInformation.cmake
+ Platform/Cygwin-GNU-Fortran.cmake
+ Platform/Windows-GNU-Fortran.cmake
+ Platform/Windows-df.cmake
+diff -urN plplot-5.9.5.orig/examples/CMakeLists.txt plplot-5.9.5/examples/CMakeLists.txt
+--- plplot-5.9.5.orig/examples/CMakeLists.txt 2010-08-26 11:21:08.000000000 +0100
++++ plplot-5.9.5/examples/CMakeLists.txt 2010-08-26 22:57:12.000000000 +0100
+@@ -355,9 +355,6 @@
+ endif(ENABLE_d)
+
+ if(ENABLE_f77 OR ENABLE_f95)
+- set(LANG_SUPPORT_FILES ${LANG_SUPPORT_FILES}
+- CMakeFortranInformation.cmake
+- )
+ set(PLATFORM_SUPPORT_FILES ${PLATFORM_SUPPORT_FILES}
+ Platform/Cygwin-GNU-Fortran.cmake
+ Platform/Windows-GNU-Fortran.cmak
Attachment:
signature.asc
Description: Digital signature