Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
freebsd
GitHub Repository: freebsd/freebsd-ports-kde
 Path: blob/main/french/aster/files/patch-products.py
16461 views
1
--- products.py.orig	2020-10-26 15:54:27 UTC

2
+++ products.py

3
@@ -136,8 +136,8 @@ def setup_hdf5(dep, summary, **kargs):

4
 

5
       actions=(

6
          ('IsInstalled', { 'filename' :

7
-             [osp.join('__setup.installdir__', 'lib', 'libhdf5.a'),

8
-              osp.join('__setup.installdir__', 'include', 'hdf5.h')]

9
+             [osp.join('__setup.installdir__', 'lib', 'libhdf5-110.a'),

10
+              osp.join('__setup.installdir__', 'include/hdf5-110', 'hdf5.h')]

11
          } ),

12
          ('Extract'  , {}),

13
          # gcc>=4.9 not supported by configure, should not use -ansi

14
@@ -651,14 +651,15 @@ def setup_mumps(dep, summary, **kargs):

15
          ('Configure', {

16
             'command'   : '%(PYTHON_ALIAS)s ; CC=%(CC)s FC=%(F90)s '

17
                           'LIBPATH="%(HOME_SCOTCH)s/lib %(HOME_METIS)s/lib" '

18
-                          'INCLUDES="%(HOME_SCOTCH)s/include %(HOME_METIS)s/include" '

19
+                          'INCLUDES="%(HOME_HDF)s/include/hdf5-110 %(HOME_SCOTCH)s/include %(HOME_METIS)s/include" '

20
                           'OPTLIB_FLAGS="%(MATHLIB)s %(OTHERLIB)s" '

21
-                          './waf configure --maths-libs="" '

22
+                          './waf configure --maths-libs="" --hdf5-libs="hdf5-110"'

23
                           '   --prefix=%(HOME_MUMPS)s --install-tests' % cfg,

24
             'capturestderr' : False,

25
          }),

26
          ('Make'     , {

27
-            'command' : '%(PYTHON_ALIAS)s ; ./waf build --jobs=1' % cfg,

28
+	 # Work-around on FreeBSD: MAKE_JOBS_UNSAFE + -vvv to get full logs in setup.dbg

29
+            'command' : '%(PYTHON_ALIAS)s ; ./waf build -vvv --jobs=1' % cfg,

30
             'capturestderr' : False,

31
          }),

32
          ('Install',   {

33
@@ -718,7 +719,8 @@ def setup_aster(dep, summary, **kargs):

34
            'HOME_MED', 'HOME_HDF', 'HOME_MFRONT', 'HOME_BOOST',

35
            'LIBPATH_BOOST', 'LIBNAME_BOOST',

36
            #'HOME_GMSH', 'HOME_HOMARD', optional

37
-           'LD', 'CC', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', ],

38
+           'LD', 'CC', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', 'CFLAGS', 'LDFLAGS',

39
+           'CFLAGS_DBG', 'FFLAGS', 'FFLAGS_DBG','F90FLAGS', 'F90FLAGS_DBG', 'CXXLIB', ],

40
       set=['LIBPATH_HDF', 'LIBPATH_MED', 'LIBPATH_METIS', 'LIBPATH_SCOTCH',

41
            'LIBPATH_MUMPS', 'LIBPATH_MFRONT'],

42
       reqobj=['file:?ASTER_ROOT?/bin/as_run',

43
@@ -736,9 +738,9 @@ def setup_aster(dep, summary, **kargs):

44
    os.environ['DEVTOOLS_COMPUTER_ID'] = cfg['DEVTOOLS_COMPUTER_ID']

45
    if cfg['ASTER_NUMVERS'] < (15, 2):

46
       WAF_ENV = ""

47
-      WAF_CONFIGURE = ("./waf configure"

48
-                       " --use-config=aster_full_config"

49
-                       " --install-tests --prefix=%(ASTER_VERSION_DIR)s")

50
+      WAF_CONFIGURE = ('./waf configure'

51
+                       ' --use-config=aster_full_config --hdf5-libs="hdf5-110"'

52
+                       ' --install-tests --prefix=%(ASTER_VERSION_DIR)s')

53
    else:

54
       WAF_ENV = ". env.d/aster_full_std.sh ; "

55
       WAF_CONFIGURE = ("./waf configure"

56


57