Unbreak after the upgrade of Gcc to 4.9.

It appears that now an explicit link to libc++ is required.

Analysed with pfg@ and Thomas Helfer (tfel-mfront upstream at cea.fr).
This commit is contained in:
Thierry Thomas 2017-01-22 20:35:34 +00:00
parent e39970ebe9
commit f8308bb926
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=432159
3 changed files with 11 additions and 2 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= aster
DISTVERSION= ${ASTER_DISTVERSION}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= french cad
CATEGORIES= french cad

View File

@ -17,7 +17,7 @@
self._print(self._fmt_title % _('Extraction'))
if kargs.get('external')<>None:
self._call_external(**kargs)
@@ -518,6 +521,52 @@ class SETUP:
@@ -518,6 +521,60 @@ class SETUP:
if iextr_as:
self.Clean(to_delete=path)
@ -30,6 +30,14 @@
+ if nl > 0:
+ ligne =ligne.replace("self.check_cc", "# self.check_cc")
+ sys.stdout.write(ligne)
+ file2patch = os.path.join(self.workdir, self.content, 'bibcxx/wscript')
+ self._print('FreeBSD patch: explicit link with libc++ required since Gcc 4.9 => modify ' + file2patch)
+ for ligne in fileinput.input(file2patch, inplace=1):
+ nl = 0
+ nl = string.find(ligne, "uselib_store='CXX', lib='stdc++'")
+ if nl > 0:
+ ligne =ligne.replace("lib='stdc++'", "lib='c++ stdc++'")
+ sys.stdout.write(ligne)
+ file2patch = os.path.join(self.workdir, self.content, 'waftools/scotch.py')
+ self._print('FreeBSD patch: int64_t missing => modify ' + file2patch)
+ for ligne in fileinput.input(file2patch, inplace=1):

View File

@ -2610,6 +2610,7 @@ aster/%%VE%%/lib/aster/aster_pkginfo.pyo
aster/%%VE%%/lib/aster/aster_settings.py
aster/%%VE%%/lib/aster/aster_settings.pyc
aster/%%VE%%/lib/aster/aster_settings.pyo
aster/%%VE%%/lib/aster/libAsterBehaviour.so
aster/%%VE%%/lib/aster/elem.1
aster/%%VE%%/profile.sh
aster/%%VE%%/share/aster/CTestTestfile.cmake