riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added support for Scientific Linux 6.

This commit is contained in:
Jean-Paul Chaput 2011-03-18 13:41:02 +00:00
parent 2df0dd439b
commit 2318ac5b61
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bootstrap/buildCoriolis.py
View File

@ -128,6 +128,8 @@ class ProjectBuilder:
def _guessOs ( self ): def _guessOs ( self ):
self._libSuffix = None self._libSuffix = None
self._osSlsoc6x_64 = re.compile (".*Linux.*el6.*x86_64.*")
self._osSlsoc6x = re.compile (".*Linux.*el6.*")
self._osSLSoC5x_64 = re.compile (".*Linux.*el5.*x86_64.*") self._osSLSoC5x_64 = re.compile (".*Linux.*el5.*x86_64.*")
self._osSLSoC5x = re.compile (".*Linux.*(el5|2.6.23.13.*SoC).*") self._osSLSoC5x = re.compile (".*Linux.*(el5|2.6.23.13.*SoC).*")
self._osLinux_64 = re.compile (".*Linux.*x86_64.*") self._osLinux_64 = re.compile (".*Linux.*x86_64.*")
@ -137,7 +139,11 @@ class ProjectBuilder:
uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE ) uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE )
lines = uname.stdout.readlines() lines = uname.stdout.readlines()
if self._osSLSoC5x_64.match(lines[0]): if self._osSlsoc6x_64.match(lines[0]):
self._osType = "Linux.slsoc6x_64"
self._libSuffix = "64"
elif self._osSlsoc6x .match(lines[0]): self._osType = "Linux.slsoc6x"
elif self._osSLSoC5x_64.match(lines[0]):
self._osType = "Linux.SLSoC5x_64" self._osType = "Linux.SLSoC5x_64"
self._libSuffix = "64" self._libSuffix = "64"
elif self._osSLSoC5x .match(lines[0]): self._osType = "Linux.SLSoC5x" elif self._osSLSoC5x .match(lines[0]): self._osType = "Linux.SLSoC5x"

2
bootstrap/coriolisEnv.py
View File

@ -156,7 +156,7 @@ fi
if options.python: if options.python:
pyVersion = sys.version_info pyVersion = sys.version_info
version = "%d.%d" % (pyVersion[0],pyVersion[1]) version = "%d.%d" % (pyVersion[0],pyVersion[1])
if osType[8] == "Linux.SL": if osType[:8] == "Linux.SL":
sitePackagesDir = "%s/python%s/site-packages" % (absLibDir,version) sitePackagesDir = "%s/python%s/site-packages" % (absLibDir,version)
else: else:
sitePackagesDir = "%s/python%s/dist-packages" % (absLibDir,version) sitePackagesDir = "%s/python%s/dist-packages" % (absLibDir,version)