summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2010-06-15 09:30:00 +0000
committerLuca Falavigna <dktrkranz@debian.org>2010-06-15 09:30:00 +0000
commit6a5f9cb502796cbe52b4c4de81adf6c6c58349ee (patch)
treefaeeed90fa6210dd40c0fb5053e6afdcde7e5d51 /debian
parent880267373c30bc10c55c54deffb289a776a77098 (diff)
Add fortran03 support
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/fortran03.patch54
-rw-r--r--debian/patches/series1
3 files changed, 58 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 7a1afcc..c94c4a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,12 @@ scons (2.0.0-1) UNRELEASED; urgency=low
* New upstream release.
- No longer use string exceptions (Closes: #585353).
* Refresh patches for new upstream release.
+ * debian/patches/fortran03.patch:
+ - Add fortran03 support, thanks Alastair McKinstry! (Closes: #583658).
* debian/watch:
- Look for 2.0 branch.
- -- Luca Falavigna <dktrkranz@debian.org> Tue, 15 Jun 2010 09:25:31 +0000
+ -- Luca Falavigna <dktrkranz@debian.org> Tue, 15 Jun 2010 11:28:52 +0200
scons (1.3.0-1) unstable; urgency=low
diff --git a/debian/patches/fortran03.patch b/debian/patches/fortran03.patch
new file mode 100644
index 0000000..c60b77b
--- /dev/null
+++ b/debian/patches/fortran03.patch
@@ -0,0 +1,54 @@
+Description: Add fortran03 support; tested with gfortran
+Author: Alastair McKinstry <mckinstry@debian.org>
+Forwarded: no
+Last-Updated: 2010-05-29
+
+Index: scons-1.3.0/engine/SCons/Tool/FortranCommon.py
+===================================================================
+--- scons-1.3.0.orig/engine/SCons/Tool/FortranCommon.py 2010-05-28 15:54:24.000000000 +0000
++++ scons-1.3.0/engine/SCons/Tool/FortranCommon.py 2010-05-28 15:55:55.000000000 +0000
+@@ -231,6 +231,22 @@
+ DialectAddToEnv(env, "F95", F95Suffixes, F95PPSuffixes,
+ support_module = 1)
+
++def add_f03_to_env(env):
++ """Add Builders and construction variables for f03 to an Environment."""
++ try:
++ F03Suffixes = env['F03FILESUFFIXES']
++ except KeyError:
++ F03Suffixes = ['.f03']
++
++ #print "Adding %s to f95 suffixes" % F95Suffixes
++ try:
++ F03PPSuffixes = env['F03PPFILESUFFIXES']
++ except KeyError:
++ F03PPSuffixes = []
++
++ DialectAddToEnv(env, "F03", F03Suffixes, F03PPSuffixes,
++ support_module = 1)
++
+ def add_all_to_env(env):
+ """Add builders and construction variables for all supported fortran
+ dialects."""
+@@ -238,6 +254,7 @@
+ add_f77_to_env(env)
+ add_f90_to_env(env)
+ add_f95_to_env(env)
++ add_f03_to_env(env)
+
+ # Local Variables:
+ # tab-width:4
+Index: scons-1.3.0/engine/SCons/Tool/gfortran.py
+===================================================================
+--- scons-1.3.0.orig/engine/SCons/Tool/gfortran.py 2010-05-28 15:53:05.000000000 +0000
++++ scons-1.3.0/engine/SCons/Tool/gfortran.py 2010-05-28 15:53:28.000000000 +0000
+@@ -43,7 +43,7 @@
+ Environment."""
+ fortran.generate(env)
+
+- for dialect in ['F77', 'F90', 'FORTRAN', 'F95']:
++ for dialect in ['F77', 'F90', 'FORTRAN', 'F95', 'F03']:
+ env['%s' % dialect] = 'gfortran'
+ env['SH%s' % dialect] = '$%s' % dialect
+ if env['PLATFORM'] in ['cygwin', 'win32']:
+
diff --git a/debian/patches/series b/debian/patches/series
index 4dc5402..5d3d8a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
java_ignore_nonexistent_files.patch
remove_stale_files.patch
+fortran03.patch