svn commit: r432159 - in head/french/aster: . files
Thierry Thomas
thierry at FreeBSD.org
Sun Jan 22 20:35:36 UTC 2017
Author: thierry
Date: Sun Jan 22 20:35:34 2017
New Revision: 432159
URL: https://svnweb.freebsd.org/changeset/ports/432159
Log:
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).
Modified:
head/french/aster/Makefile
head/french/aster/files/patch-as_setup.py
head/french/aster/pkg-plist
Modified: head/french/aster/Makefile
==============================================================================
--- head/french/aster/Makefile Sun Jan 22 20:28:52 2017 (r432158)
+++ head/french/aster/Makefile Sun Jan 22 20:35:34 2017 (r432159)
@@ -3,7 +3,7 @@
PORTNAME= aster
DISTVERSION= ${ASTER_DISTVERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= french cad
CATEGORIES= french cad
Modified: head/french/aster/files/patch-as_setup.py
==============================================================================
--- head/french/aster/files/patch-as_setup.py Sun Jan 22 20:28:52 2017 (r432158)
+++ head/french/aster/files/patch-as_setup.py Sun Jan 22 20:35:34 2017 (r432159)
@@ -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):
Modified: head/french/aster/pkg-plist
==============================================================================
--- head/french/aster/pkg-plist Sun Jan 22 20:28:52 2017 (r432158)
+++ head/french/aster/pkg-plist Sun Jan 22 20:35:34 2017 (r432159)
@@ -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
More information about the svn-ports-head
mailing list