boost:rebuild
This commit is contained in:
@@ -9,7 +9,8 @@ from pisi.actionsapi import shelltools
|
|||||||
|
|
||||||
|
|
||||||
def setup():
|
def setup():
|
||||||
shelltools.system("./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2.7 --prefix=%s/usr" % get.installDIR())
|
shelltools.system("./bootstrap.sh --with-toolset=gcc --with-icu --prefix=%s/usr" % get.installDIR())
|
||||||
|
#shelltools.system("./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2.7 --prefix=%s/usr" % get.installDIR())
|
||||||
|
|
||||||
shelltools.echo("project-config.jam","using python : 3.6 : /usr/bin/python3 : /usr/include/python3.6m : /usr/lib ;")
|
shelltools.echo("project-config.jam","using python : 3.6 : /usr/bin/python3 : /usr/include/python3.6m : /usr/lib ;")
|
||||||
#shelltools.echo("project-config.jam","--without-mpi ;")
|
#shelltools.echo("project-config.jam","--without-mpi ;")
|
||||||
@@ -22,7 +23,6 @@ def build():
|
|||||||
runtime-link=shared \
|
runtime-link=shared \
|
||||||
link=shared,static \
|
link=shared,static \
|
||||||
toolset=gcc \
|
toolset=gcc \
|
||||||
python=2.7 \
|
|
||||||
cflags=-fno-strict-aliasing \
|
cflags=-fno-strict-aliasing \
|
||||||
--layout=system")
|
--layout=system")
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
diff -Nuar a/bootstrap.sh b/bootstrap.sh
|
||||||
|
--- a/bootstrap.sh 2016-12-22 15:33:11.000000000 +0300
|
||||||
|
+++ b/bootstrap.sh 2017-11-09 14:38:57.766903693 +0300
|
||||||
|
@@ -17,8 +17,8 @@
|
||||||
|
INCLUDEDIR=
|
||||||
|
LIBS=""
|
||||||
|
PYTHON=python
|
||||||
|
-PYTHON_VERSION=
|
||||||
|
-PYTHON_ROOT=
|
||||||
|
+PYTHON_VERSION=2.7
|
||||||
|
+PYTHON_ROOT=3.6
|
||||||
|
ICU_ROOT=
|
||||||
|
|
||||||
|
# Handle case where builtin shell version of echo command doesn't
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
<!--Dependency>openmpi-devel</Dependency-->
|
<!--Dependency>openmpi-devel</Dependency-->
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
<Patches>
|
||||||
<!-- <Patch>boost-serialization-1.64.0-fixes.patch</Patch> -->
|
<Patch>pythonfix.patch</Patch>
|
||||||
</Patches>
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
@@ -85,7 +85,7 @@
|
|||||||
|
|
||||||
<History>
|
<History>
|
||||||
<Update release="6">
|
<Update release="6">
|
||||||
<Date>2017-11-05</Date>
|
<Date>2017-11-09</Date>
|
||||||
<Version>1.63.0</Version>
|
<Version>1.63.0</Version>
|
||||||
<Comment>Rebuild.</Comment>
|
<Comment>Rebuild.</Comment>
|
||||||
<Name>Mustafa Cinasal</Name>
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
|||||||
Reference in New Issue
Block a user