[Python-modules-commits] [cf-python] 14/14: merge patched into master

Klaus Zimmermann zklaus-guest at moszumanska.debian.org
Mon Sep 19 15:52:03 UTC 2016


This is an automated email from the git hooks/post-receive script.

zklaus-guest pushed a commit to branch master
in repository cf-python.

commit a7fc5a042de03465d29c7f9e232c3a83848ac758
Merge: 3ed71c2 833443d
Author: Klaus Zimmermann <klaus_zimmermann at gmx.de>
Date:   Mon Sep 19 17:06:53 2016 +0200

    merge patched into master

 cf/um/umread/c-lib/Makefile                        |  15 +-
 debian/.git-dpm                                    |   6 +-
 .../0001-Remove-check-for-python-version.patch     |   2 +-
 .../patches/0002-Added-stripping-of-type-lib.patch |   2 +-
 ...x-config-to-avoid-network-access-and-add-.patch |   2 +-
 .../0004-Remove-special-udunits2-database.patch    |   2 +-
 debian/patches/0005-Test-fixes.patch               |   2 +-
 ...k-with-gcc-for-standard-libs-and-dep-info.patch |  50 +++++++
 debian/patches/series                              |   1 +
 docs/_static/jquery.js                             | 154 ---------------------
 docs/_static/underscore.js                         |  16 ---
 docs/build/.buildinfo                              |   4 -
 12 files changed, 71 insertions(+), 185 deletions(-)

diff --cc debian/.git-dpm
index a8427b5,0000000..49365fa
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- c615699148d8456593c072622745b89e058e8748
- c615699148d8456593c072622745b89e058e8748
- a946e1c7699a0b716a845f590b53bc022f1e1cdc
++833443d6c08c527ed8ae51303643dffafaf5201b
++833443d6c08c527ed8ae51303643dffafaf5201b
++0a04259b30001c5b49f62c8f4902f376d9c97558
 +0a04259b30001c5b49f62c8f4902f376d9c97558
 +cf-python_1.3.1+dfsg.1.orig.tar.gz
 +13622776b4c9064e37a776ae09edc0b85c00a416
 +2261560
diff --cc debian/patches/0001-Remove-check-for-python-version.patch
index 7c3b304,0000000..c7a0c18
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-check-for-python-version.patch
+++ b/debian/patches/0001-Remove-check-for-python-version.patch
@@@ -1,33 -1,0 +1,33 @@@
- From 74db587517f2ed0e0d04e931810b6d21e284dd81 Mon Sep 17 00:00:00 2001
++From 72d661ce03c959443961def011f8a3382da2f004 Mon Sep 17 00:00:00 2001
 +From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
 +Date: Wed, 14 Sep 2016 12:10:45 +0200
 +Subject: Remove check for python version.
 +
 +The python version in sid at the moment is 2.7.12+.
 +The + breaks the check, which is superfluous in any case, since
 +the python2 version is guaranteed to be 2.7 anyway.
 +
 +Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
 +---
 + cf/__init__.py | 8 --------
 + 1 file changed, 8 deletions(-)
 +
 +diff --git a/cf/__init__.py b/cf/__init__.py
 +index 46a8b5f..2201cea 100644
 +--- a/cf/__init__.py
 ++++ b/cf/__init__.py
 +@@ -57,14 +57,6 @@ from distutils.version import StrictVersion
 + import imp
 + import platform
 + 
 +-# Check the version of python
 +-if not (StrictVersion('2.6.0')
 +-        <= StrictVersion(platform.python_version())
 +-        < StrictVersion('3.0.0')):
 +-    raise ValueError(
 +-        "Bad python version: cf requires 2.6 <= python < 3.0. Got %s" %
 +-        platform.python_version())
 +-
 + ## Check the version of numpy
 + #import numpy
 + #if StrictVersion(numpy.__version__) < StrictVersion('1.7'):
diff --cc debian/patches/0002-Added-stripping-of-type-lib.patch
index e7659db,0000000..2042c3a
mode 100644,000000..100644
--- a/debian/patches/0002-Added-stripping-of-type-lib.patch
+++ b/debian/patches/0002-Added-stripping-of-type-lib.patch
@@@ -1,19 -1,0 +1,19 @@@
- From a409cd26bd9bad8985811bba2645dbf32443e716 Mon Sep 17 00:00:00 2001
++From 56f6c6de408fac970d2bd04e51ced671bf62b85a Mon Sep 17 00:00:00 2001
 +From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
 +Date: Fri, 9 Sep 2016 14:27:24 +0200
 +Subject: Added stripping of type-lib.
 +
 +Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
 +---
 + cf/um/umread/c-lib/type-dep/Makefile | 1 +
 + 1 file changed, 1 insertion(+)
 +
 +diff --git a/cf/um/umread/c-lib/type-dep/Makefile b/cf/um/umread/c-lib/type-dep/Makefile
 +index 381c4a8..6052a5e 100644
 +--- a/cf/um/umread/c-lib/type-dep/Makefile
 ++++ b/cf/um/umread/c-lib/type-dep/Makefile
 +@@ -45,3 +45,4 @@ $(REDEFINES_DBL): $(DBL_TMP_OBJS)
 + $(LIB): $(OBJS)
 + 	rm -f $@
 + 	ar r $@ $(OBJS)
 ++	strip --remove-section=.comment --remove-section=.note --enable-deterministic-archives $@
diff --cc debian/patches/0003-Patch-sphinx-config-to-avoid-network-access-and-add-.patch
index 0716082,0000000..bde9384
mode 100644,000000..100644
--- a/debian/patches/0003-Patch-sphinx-config-to-avoid-network-access-and-add-.patch
+++ b/debian/patches/0003-Patch-sphinx-config-to-avoid-network-access-and-add-.patch
@@@ -1,56 -1,0 +1,56 @@@
- From 9f939f75126666052b245cf7ff99a19db9f134ca Mon Sep 17 00:00:00 2001
++From a5cd411fce8b3a178ff154bd081fa9e8055bc24f Mon Sep 17 00:00:00 2001
 +From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
 +Date: Wed, 14 Sep 2016 13:25:19 +0200
 +Subject: Patch sphinx config to avoid network access and add local intersphinx
 + links.
 +
 +Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
 +---
 + docs/source/conf.py | 27 +++++++++++++++++++++++++--
 + 1 file changed, 25 insertions(+), 2 deletions(-)
 +
 +diff --git a/docs/source/conf.py b/docs/source/conf.py
 +index 50084c5..7e24935 100755
 +--- a/docs/source/conf.py
 ++++ b/docs/source/conf.py
 +@@ -72,6 +72,30 @@ intersphinx_mapping = {
 +     'scipy':      ('http://docs.scipy.org/doc/scipy/reference', None),
 +     }
 + 
 ++def check_object_path(key, url, path):
 ++    if os.path.isfile(path):
 ++        return {key: (url, path)}
 ++    return {}
 ++
 ++intersphinx_mapping.update(check_object_path('sphinx',
 ++                                             'http://sphinx.pocoo.org/',
 ++                                             '/usr/share/doc/sphinx-doc/html/objects.inv'))
 ++intersphinx_mapping.update(check_object_path('python',
 ++                                            'http://docs.python.org/',
 ++                                            '/usr/share/doc/python'
 ++                                              + '.'.join([str(x) for x in sys.version_info[0:2]])
 ++                                              + '/html/objects.inv'))
 ++intersphinx_mapping.update(check_object_path('matplotlib',
 ++                                             'http://matplotlib.sourceforge.net/',
 ++                                             '/usr/share/doc/python-matplotlib-doc/html/objects.inv'))
 ++intersphinx_mapping.update(check_object_path('numpy',
 ++                                             'http://docs.scipy.org/doc/numpy/',
 ++                                             '/usr/share/doc/python-numpy-doc/html/objects.inv'))
 ++intersphinx_mapping.update(check_object_path('scipy',
 ++                                             'http://docs.scipy.org/doc/scipy/',
 ++                                             '/usr/share/doc/python-scipy-doc/html/objects.inv'))
 ++
 ++
 + # The name of the default domain. Can also be None to disable a
 + # default domain. The default is 'py'.
 + #primary_domain = 'cf'
 +@@ -324,8 +348,7 @@ def linkcode_resolve(domain, info):
 +     #=================================================================
 + 
 + 
 +-    online_source_code = True
 +-#    online_source_code = False
 ++    online_source_code = False
 + 
 +     if domain != 'py':
 +         return None
diff --cc debian/patches/0004-Remove-special-udunits2-database.patch
index 01b605b,0000000..485a675
mode 100644,000000..100644
--- a/debian/patches/0004-Remove-special-udunits2-database.patch
+++ b/debian/patches/0004-Remove-special-udunits2-database.patch
@@@ -1,114 -1,0 +1,114 @@@
- From c48f0febdc84e387bbe377f83db5c4af05fb138e Mon Sep 17 00:00:00 2001
++From 236c306f46c21191694836bd93263f28837712d2 Mon Sep 17 00:00:00 2001
 +From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
 +Date: Wed, 14 Sep 2016 14:42:49 +0200
 +Subject: Remove special udunits2 database.
 +
 +This removes the dependence of the program on the special cf udunits2
 +database. The changes are now performed programmatically.
 +
 +Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
 +---
 + cf/units.py | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 + 1 file changed, 63 insertions(+), 13 deletions(-)
 +
 +diff --git a/cf/units.py b/cf/units.py
 +index afbe7bf..ada337c 100644
 +--- a/cf/units.py
 ++++ b/cf/units.py
 +@@ -42,18 +42,6 @@ if sys.platform == 'darwin':
 + else:
 +     # Linux
 +     _udunits = ctypes.CDLL('libudunits2.so.0')
 +-
 +-# Get the name of the XML-formatted unit-database
 +-_unit_database = os.path.join(os.path.dirname(__file__),
 +-                              'etc/udunits/udunits2.xml')
 +-
 +-if os.path.isfile(_unit_database):
 +-    # The database included with this module exists, so use it
 +-    _unit_database = _c_char_p(_unit_database)
 +-else:
 +-    # Use the default (non-CF) database
 +-    print 'WARNING: Using the default (non-CF) Udunits database'
 +-    _unit_database = None
 + #--- End: if
 + 
 + # Suppress "overrides prefixed-unit" messages. This also suppresses
 +@@ -76,7 +64,7 @@ _ut_read_xml.argtypes = (_c_char_p, )
 + _ut_read_xml.restype = _c_void_p
 + 
 + #print 'units: before _udunits.ut_read_xml(',_unit_database,')'
 +-_ut_system = _ut_read_xml(_unit_database)
 ++_ut_system = _ut_read_xml(None)
 + #print 'units: after  _udunits.ut_read_xml(',_unit_database,')'
 + 
 + # Reinstate the reporting of error messages
 +@@ -194,6 +182,68 @@ _UT_DEFINITION = 8
 + _cv_convert_array = {4: _cv_convert_floats,
 +                      8: _cv_convert_doubles}
 + 
 ++# Some function definitions necessary for the following
 ++# changes to the unit system.
 ++_ut_get_unit_by_name = _udunits.ut_get_unit_by_name
 ++_ut_get_unit_by_name.argtypes = (_c_void_p, _c_char_p)
 ++_ut_get_unit_by_name.restype = _c_void_p
 ++_ut_get_status = _udunits.ut_get_status
 ++_ut_get_status.restype = _c_int
 ++_ut_unmap_symbol_to_unit = _udunits.ut_unmap_symbol_to_unit
 ++_ut_unmap_symbol_to_unit.argtypes = (_c_void_p, _c_char_p, _c_int)
 ++_ut_unmap_symbol_to_unit.restype = _c_int
 ++_ut_map_symbol_to_unit = _udunits.ut_map_symbol_to_unit
 ++_ut_map_symbol_to_unit.argtypes = (_c_char_p, _c_int, _c_void_p)
 ++_ut_map_symbol_to_unit.restype = _c_int
 ++_ut_map_unit_to_symbol = _udunits.ut_map_unit_to_symbol
 ++_ut_map_unit_to_symbol.argtypes = (_c_void_p, _c_char_p, _c_int)
 ++_ut_map_unit_to_symbol.restype = _c_int
 ++_ut_map_name_to_unit = _udunits.ut_map_name_to_unit
 ++_ut_map_name_to_unit.argtypes = (_c_char_p, _c_int, _c_void_p)
 ++_ut_map_name_to_unit.restype = _c_int
 ++_ut_map_unit_to_name = _udunits.ut_map_unit_to_name
 ++_ut_map_unit_to_name.argtypes = (_c_void_p, _c_char_p, _c_int)
 ++_ut_map_unit_to_name.restype = _c_int
 ++_ut_new_base_unit = _udunits.ut_new_base_unit
 ++_ut_new_base_unit.argtypes = (_c_void_p, )
 ++_ut_new_base_unit.restype = _c_void_p
 ++
 ++# Change Sv mapping. Both sievert and sverdrup are just aliases,
 ++# so no unit to symbol mapping needs to be changed.
 ++# We don't need to remove rem, since it was constructed with
 ++# the correct sievert mapping in place; because that mapping
 ++# was only an alias, the unit now doesn't depend on the mapping
 ++# persisting.
 ++assert(0 == _ut_unmap_symbol_to_unit(_ut_system, _c_char_p('Sv'), _UT_ASCII))
 ++assert(0 == _ut_map_symbol_to_unit(_c_char_p('Sv'), _UT_ASCII,
 ++                                   _ut_get_unit_by_name(_ut_system, _c_char_p('sverdrup'))))
 ++
 ++# Add new base unit calendar_year
 ++calendar_year_unit = _ut_new_base_unit(_ut_system)
 ++assert(0 == _ut_map_symbol_to_unit(_c_char_p('cY'), _UT_ASCII, calendar_year_unit))
 ++assert(0 == _ut_map_unit_to_symbol(calendar_year_unit, _c_char_p('cY'), _UT_ASCII))
 ++assert(0 == _ut_map_name_to_unit(_c_char_p('calendar_year'), _UT_ASCII, calendar_year_unit))
 ++assert(0 == _ut_map_unit_to_name(calendar_year_unit, _c_char_p('calendar_year'), _UT_ASCII))
 ++assert(0 == _ut_map_name_to_unit(_c_char_p('calendar_years'), _UT_ASCII, calendar_year_unit))
 ++
 ++# Add various aliases useful for CF.
 ++def add_unit_alias(definition, symbol, singular, plural):
 ++    unit = _ut_parse(_ut_system, _c_char_p(definition), _UT_ASCII)
 ++    if symbol is not None:
 ++        assert(0 == _ut_map_symbol_to_unit(_c_char_p(symbol), _UT_ASCII, unit))
 ++    if singular is not None:
 ++        assert(0 == _ut_map_name_to_unit(_c_char_p(singular), _UT_ASCII, unit))
 ++    if plural is not None:
 ++        assert(0 == _ut_map_name_to_unit(_c_char_p(plural), _UT_ASCII, unit))
 ++
 ++add_unit_alias("1.e-3", "psu", "practical_salinity_unit", "practical_salinity_units")
 ++add_unit_alias("calendar_year/12", "cM", "calendar_month", "calendar_months")
 ++add_unit_alias("1", None, "level", "levels")
 ++add_unit_alias("1", None, "layer", "layers")
 ++add_unit_alias("1", None, "sigma_level", "sigma_levels")
 ++add_unit_alias("1", "dB", "decibel", "debicels")
 ++add_unit_alias("10 dB", None, "bel", "bels")
 ++
 + #_udunits.ut_get_unit_by_name(_udunits.ut_new_base_unit(_ut_system),
 + #                             _ut_system, 'calendar_year')
 + 
diff --cc debian/patches/0005-Test-fixes.patch
index 3dc82da,0000000..fd95086
mode 100644,000000..100644
--- a/debian/patches/0005-Test-fixes.patch
+++ b/debian/patches/0005-Test-fixes.patch
@@@ -1,132 -1,0 +1,132 @@@
- From c615699148d8456593c072622745b89e058e8748 Mon Sep 17 00:00:00 2001
++From cb0f225a844796af205b9963b62b708f6215c997 Mon Sep 17 00:00:00 2001
 +From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
 +Date: Fri, 16 Sep 2016 11:11:48 +0200
 +Subject: Test fixes
 +
 +Move some class variables to setUp methods in order to avoid import errors.
 +Added skipping of tests relying on esmf.
 +
 +Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
 +---
 + test/test_Field.py    | 39 ++++++++++++++++++---------------------
 + test/test_Regrid.py   |  2 ++
 + test/test_Variable.py | 15 +++++++--------
 + test/test_general.py  |  9 ++++-----
 + 4 files changed, 31 insertions(+), 34 deletions(-)
 +
 +diff --git a/test/test_Field.py b/test/test_Field.py
 +index 1816060..a144580 100644
 +--- a/test/test_Field.py
 ++++ b/test/test_Field.py
 +@@ -6,27 +6,24 @@ import inspect
 + import datetime
 + 
 + class FieldTest(unittest.TestCase):
 +-    filename = os.path.join(os.path.dirname(os.path.abspath(__file__)),
 +-                            'test_file.nc')
 +-
 +-    filename2 = os.path.join(os.path.dirname(os.path.abspath(__file__)),
 +-                             'test_file2.nc')
 +-
 +-    chunk_sizes = (17, 34, 300, 100000)[::-1]
 +-    original_chunksize = cf.CHUNKSIZE()
 +-
 +-    f = cf.read(filename)[0]  
 +-
 +-    test_only = ()
 +-#    test_only = ('test_Field_transpose','test_Field_squeeze',)
 +-#    test_only = ('test_Field_collapse',)
 +-#    test_only = ('test_Field_match','test_Field_items',)
 +-#    test_only = ('test_Field_items',)
 +-#    test_only = ('test_Field_axes','test_Field_data_axes',)
 +-#    test_only = ('test_Field_where',)
 +-#    test_only = ('test_Field_anchor',)
 +-#    test_only = ('test_Field_period',)
 +-#    test_only = ('test_FieldList_argless_methods',)
 ++    def setUp(self):
 ++        self.filename = os.path.join(os.path.dirname(os.path.abspath(__file__)),
 ++                                     'test_file.nc')
 ++        self.filename2 = os.path.join(os.path.dirname(os.path.abspath(__file__)),
 ++                                      'test_file2.nc')
 ++        self.chunk_sizes = (17, 34, 300, 100000)[::-1]
 ++        self.original_chunksize = cf.CHUNKSIZE()
 ++        self.f = cf.read(self.filename)[0]
 ++        self.test_only = ()
 ++        # self.test_only = ('test_Field_transpose','test_Field_squeeze',)
 ++        # self.test_only = ('test_Field_collapse',)
 ++        # self.test_only = ('test_Field_match','test_Field_items',)
 ++        # self.test_only = ('test_Field_items',)
 ++        # self.test_only = ('test_Field_axes','test_Field_data_axes',)
 ++        # self.test_only = ('test_Field_where',)
 ++        # self.test_only = ('test_Field_anchor',)
 ++        # self.test_only = ('test_Field_period',)
 ++        # self.test_only = ('test_FieldList_argless_methods',)
 + 
 +     def test_Field_anchor(self):  
 +         if self.test_only and inspect.stack()[0][3] not in self.test_only:
 +diff --git a/test/test_Regrid.py b/test/test_Regrid.py
 +index b182ac9..4eff69a 100644
 +--- a/test/test_Regrid.py
 ++++ b/test/test_Regrid.py
 +@@ -38,6 +38,7 @@ class RegridTest(unittest.TestCase):
 + #    test_only('test_Field_section',)
 + #    test_only('test_Data_section',)
 + 
 ++    @unittest.skipUnless(cf._found_ESMF, "Requires esmf package.")
 +     def test_Field_regrids(self):
 +         if self.test_only and inspect.stack()[0][3] not in self.test_only:
 +             return
 +@@ -72,6 +73,7 @@ class RegridTest(unittest.TestCase):
 +         cf.ATOL(original_atol)
 +     #--- End: def
 +     
 ++    @unittest.skipUnless(cf._found_ESMF, "Requires esmf package.")
 +     def test_Field_regridc(self):
 +         if self.test_only and inspect.stack()[0][3] not in self.test_only:
 +             return
 +diff --git a/test/test_Variable.py b/test/test_Variable.py
 +index 97a47ba..e0dbe4c 100644
 +--- a/test/test_Variable.py
 ++++ b/test/test_Variable.py
 +@@ -5,14 +5,13 @@ import unittest
 + import inspect
 + 
 + class VariableTest(unittest.TestCase):
 +-    filename = os.path.join(os.path.dirname(os.path.abspath(__file__)),
 +-                            'test_file.nc')
 +-    chunk_sizes = (17, 34, 300, 100000)[::-1]
 +-    original_chunksize = cf.CHUNKSIZE()
 +-
 +-    f = cf.read(filename)[0]  
 +-
 +-    test_only = ()
 ++    def setUp(self):
 ++        self.filename = os.path.join(os.path.dirname(os.path.abspath(__file__)),
 ++                                     'test_file.nc')
 ++        self.chunk_sizes = (17, 34, 300, 100000)[::-1]
 ++        self.original_chunksize = cf.CHUNKSIZE()
 ++        self.f = cf.read(self.filename)[0]
 ++        self.test_only = ()
 + 
 +     def test_Variable_max_mean_mid_range_min_range_sd_sum_var(self):    
 +         if self.test_only and inspect.stack()[0][3] not in self.test_only:
 +diff --git a/test/test_general.py b/test/test_general.py
 +index 340fd3b..f14d34f 100644
 +--- a/test/test_general.py
 ++++ b/test/test_general.py
 +@@ -27,11 +27,10 @@ atexit.register(_remove_tmpfiles)
 + 
 + 
 + class generalTest(unittest.TestCase):
 +-    filename = os.path.join(os.path.dirname(os.path.abspath(__file__)),
 +-                            'test_file.nc')
 +-    chunk_sizes = (17, 34, 300, 100000)[::-1]
 +-
 +-    f = cf.read(filename)[0]  
 ++    def setUp(self):
 ++        filename = os.path.join(os.path.dirname(os.path.abspath(__file__)),
 ++                                'test_file.nc')
 ++        self.f = cf.read(filename)[0]
 + 
 +     def test_GENERAL(self):
 +         # Save original chunksize
diff --cc debian/patches/0006-Link-with-gcc-for-standard-libs-and-dep-info.patch
index 0000000,0000000..d6c56d1
new file mode 100644
--- /dev/null
+++ b/debian/patches/0006-Link-with-gcc-for-standard-libs-and-dep-info.patch
@@@ -1,0 -1,0 +1,50 @@@
++From 833443d6c08c527ed8ae51303643dffafaf5201b Mon Sep 17 00:00:00 2001
++From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
++Date: Mon, 19 Sep 2016 15:32:24 +0200
++Subject: Link with gcc for standard libs and dep info.
++
++Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
++---
++ cf/um/umread/c-lib/Makefile | 15 ++++++++++++---
++ 1 file changed, 12 insertions(+), 3 deletions(-)
++
++diff --git a/cf/um/umread/c-lib/Makefile b/cf/um/umread/c-lib/Makefile
++index bc6d336..a9a3298 100644
++--- a/cf/um/umread/c-lib/Makefile
+++++ b/cf/um/umread/c-lib/Makefile
++@@ -5,7 +5,7 @@ LIBRARY=umfile.so
++ CC=gcc
++ CFLAGS=-Wall -fPIC -g
++ CPP=gcc -E -P
++-LD=ld
+++LD=gcc
++ LDFLAGS=-shared
++ OBJS = umfile.o error.o filetype.o \
++ 	malloc.o linklist.o new_structs.o swap.o
++@@ -14,6 +14,14 @@ TYPE_DEP_LIBRARY = umfile_typedep.a
++ TYPE_DEP_DIR = type-dep
++ TYPE_DEP_LIBRARY_PATH = $(TYPE_DEP_DIR)/$(TYPE_DEP_LIBRARY)
++ 
+++STEMS = umfile_test_typedep interpret_header read process_vars \
+++        debug_dump date_and_time compare levels axes unwgdos
+++
+++SGL_OBJS=$(foreach stem, $(STEMS), $(TYPE_DEP_DIR)/$(stem)_sgl.o)
+++DBL_OBJS=$(foreach stem, $(STEMS), $(TYPE_DEP_DIR)/$(stem)_dbl.o)
+++
+++OBJS += $(SGL_OBJS) $(DBL_OBJS)
+++
++ export CC CFLAGS CPP TYPE_DEP_LIBRARY
++ 
++ .PHONY: clean all type-dep
++@@ -27,8 +35,9 @@ clean:
++ type-dep:
++ 	$(MAKE) -C $(TYPE_DEP_DIR)
++ 
++-$(LIBRARY): $(OBJS) type-dep
++-	$(LD) $(LDFLAGS) -o $@ $(OBJS) --whole-archive $(TYPE_DEP_LIBRARY_PATH)
+++$(LIBRARY): type-dep $(OBJS)
+++	$(LD) $(LDFLAGS) -o $@ $(OBJS)
+++	strip --remove-section=.comment --remove-section=.note --enable-deterministic-archives $@
++ 
++ %.o: %.c $(HEADERS)
++ 	$(CC) $(CFLAGS) -c $<
diff --cc debian/patches/series
index f79b0a7,0000000..7ac7f62
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,6 @@@
 +0001-Remove-check-for-python-version.patch
 +0002-Added-stripping-of-type-lib.patch
 +0003-Patch-sphinx-config-to-avoid-network-access-and-add-.patch
 +0004-Remove-special-udunits2-database.patch
 +0005-Test-fixes.patch
++0006-Link-with-gcc-for-standard-libs-and-dep-info.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cf-python.git



More information about the Python-modules-commits mailing list