[gentoo-commits] gentoo-x86 commit in sci-physics/camfr/files: machine_cfg.py.gentoo

[gentoo-commits] gentoo-x86 commit in sci-physics/camfr/files: machine_cfg.py.gentoo

[Sebastien Fabbro (bicatali)]

bicatali    08/12/09 15:39:43

  Added:                machine_cfg.py.gentoo
  Log:
  Propagate LDFLAGS, FFLAGS for newer scons, avoid parsing make.conf
  (Portage version: 2.2_rc17/cvs/Linux 2.6.25-gentoo-r7 x86_64)

Revision  Changes    Path
1.1                  sci-physics/camfr/files/machine_cfg.py.gentoo

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/camfr/files/machine_cfg.py.gentoo?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/camfr/files/machine_cfg.py.gentoo?rev=1.1&content-type=text/plain

Index: machine_cfg.py.gentoo
===================================================================
import os

cc = os.getenv("CC")
if cc == None:
   cc = "gcc"
cxx = os.getenv("CXX")
if cxx == None:
   cxx = "g++"
f77 = os.getenv("F77")
if f77 == None:
   f77 = "gfortran"    
link = cxx
flags = os.getenv("CXXFLAGS")
if flags == None:
   flags = "-O"
fflags = os.getenv("FFLAGS")
if fflags == None:
   fflags = flags
link_flags = os.getenv("LDFLAGS")
if link_flags == None:
   link_flags = ""

base_flags = " -DFORTRAN_SYMBOLS_WITH_SINGLE_TRAILING_UNDERSCORE -DNDEBUG "
flags_noopt = base_flags
flags = flags + base_flags 
fflags =  fflags + base_flags


include_dirs = []

if os.path.isdir("/usr/include/python2.5"):
   include_dirs.append("/usr/include/python2.5")   
   include_dirs.append("/usr/lib/python2.5/site-packages")
elif os.path.isdir("/usr/include/python2.4"):
   include_dirs.append("/usr/include/python2.4")
   include_dirs.append("/usr/lib/python2.4/site-packages")
elif os.path.isdir("/usr/include/python2.3"):
   include_dirs.append("/usr/include/python2.3")   
   include_dirs.append("/usr/lib/python2.3/site-packages")
else:
   print "Python dir not found!"
   sys.exit()

dllsuffix = ".so"
strip_command = ""
extra_files = [("doc", ["docs/camfr.pdf"])]

[gentoo-commits] gentoo-x86 commit in sci-physics/camfr/files: machine_cfg.py.gentoo

[Sebastien Fabbro (bicatali)]

bicatali    09/07/26 00:24:15

  Modified:             machine_cfg.py.gentoo
  Log:
  Make it work for python 2.6, thanks Dustin Polke, closing bug #278028
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sci-physics/camfr/files/machine_cfg.py.gentoo

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/camfr/files/machine_cfg.py.gentoo?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/camfr/files/machine_cfg.py.gentoo?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/camfr/files/machine_cfg.py.gentoo?r1=1.1&r2=1.2

Index: machine_cfg.py.gentoo
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-physics/camfr/files/machine_cfg.py.gentoo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- machine_cfg.py.gentoo	9 Dec 2008 15:39:43 -0000	1.1
+++ machine_cfg.py.gentoo	26 Jul 2009 00:24:15 -0000	1.2
@@ -26,21 +26,6 @@
 fflags =  fflags + base_flags
 
 
-include_dirs = []
-
-if os.path.isdir("/usr/include/python2.5"):
-   include_dirs.append("/usr/include/python2.5")   
-   include_dirs.append("/usr/lib/python2.5/site-packages")
-elif os.path.isdir("/usr/include/python2.4"):
-   include_dirs.append("/usr/include/python2.4")
-   include_dirs.append("/usr/lib/python2.4/site-packages")
-elif os.path.isdir("/usr/include/python2.3"):
-   include_dirs.append("/usr/include/python2.3")   
-   include_dirs.append("/usr/lib/python2.3/site-packages")
-else:
-   print "Python dir not found!"
-   sys.exit()
-
 dllsuffix = ".so"
 strip_command = ""
 extra_files = [("doc", ["docs/camfr.pdf"])]