This is an automated email from the ASF dual-hosted git repository.
dingyu pushed a commit to branch v1.1.1-testing
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-sgx-sdk.git
The following commit(s) were added to refs/heads/v1.1.1-testing by this push:
new b2ae047 make binutils.sh compatible with all docker images
b2ae047 is described below
commit b2ae0471cad660a0563603166b2ab3bd60931327
Author: Yu Ding <[email protected]>
AuthorDate: Mon Mar 23 16:41:21 2020 -0700
make binutils.sh compatible with all docker images
---
dockerfile/02_binutils.sh | 8 ++++----
dockerfile/Dockerfile.1604.nightly | 2 +-
dockerfile/Dockerfile.1804.nightly | 2 +-
dockerfile/Dockerfile.centos7.nightly | 7 +++++--
dockerfile/Dockerfile.full.1604.nightly | 2 +-
5 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/dockerfile/02_binutils.sh b/dockerfile/02_binutils.sh
index bbc910f..93d23af 100644
--- a/dockerfile/02_binutils.sh
+++ b/dockerfile/02_binutils.sh
@@ -9,10 +9,10 @@ cd binutils-gdb && \
git checkout fe26d3a34a223a86fddb59ed70a621a13940a088 && \
mkdir build && \
cd build && \
-../configure --prefix=/usr --enable-gold --enable-ld=default --enable-plugins
--enable-shared --disable-werror --enable-64-bit-bfd --with-system-zlib && \
+../configure --prefix=$BINUTILS_PREFIX --enable-gold --enable-ld=default
--enable-plugins --enable-shared --disable-werror --enable-64-bit-bfd
--with-system-zlib && \
make -j "$(nproc)" && \
-LD_LIBRARY_PATH=$(BINUTILS_PREFIX) make install && \
+make install && \
cd /root && \
rm -rf binutils-gdb && \
-echo 'export LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH' >> /root/.bashrc && \
-echo 'export LD_RUN_PATH=/usr/lib:$LD_RUN_PATH'
+echo 'export LD_LIBRARY_PATH=/usr/lib:$BINUTILS_PREFIX' >> /root/.bashrc && \
+echo 'export LD_RUN_PATH=/usr/lib:$BINUTILS_PREFIX'
diff --git a/dockerfile/Dockerfile.1604.nightly
b/dockerfile/Dockerfile.1604.nightly
index 2170b1a..749c8b6 100644
--- a/dockerfile/Dockerfile.1604.nightly
+++ b/dockerfile/Dockerfile.1604.nightly
@@ -19,7 +19,7 @@ RUN apt-get update && \
#ADD 01_gcc_8.sh /root
#RUN bash /root/01_gcc_8.sh
-ENV BINUTILS_PREFIX=/usr/lib
+ENV BINUTILS_PREFIX=/usr
ADD 02_binutils.sh /root
RUN bash /root/02_binutils.sh
diff --git a/dockerfile/Dockerfile.1804.nightly
b/dockerfile/Dockerfile.1804.nightly
index 54807d8..a965da2 100644
--- a/dockerfile/Dockerfile.1804.nightly
+++ b/dockerfile/Dockerfile.1804.nightly
@@ -9,7 +9,7 @@ RUN apt update && apt install -y autoconf automake bison
build-essential cmake c
#ADD 01_gcc_8.sh /root
#RUN bash /root/01_gcc_8.sh
-ENV BINUTILS_PREFIX=/usr/lib
+ENV BINUTILS_PREFIX=/usr
ADD 02_binutils.sh /root
RUN bash /root/02_binutils.sh
diff --git a/dockerfile/Dockerfile.centos7.nightly
b/dockerfile/Dockerfile.centos7.nightly
index 3daeab5..d682c57 100644
--- a/dockerfile/Dockerfile.centos7.nightly
+++ b/dockerfile/Dockerfile.centos7.nightly
@@ -10,13 +10,16 @@ RUN yum install -y centos-release-scl && \
yum install -y devtoolset-8-gcc devtoolset-8-gcc-c++ zlib-devel flex bison
texinfo && \
mv /usr/bin/gcc /usr/bin/gcc.bak && \
mv /usr/bin/g++ /usr/bin/g++.bak && \
- update-alternatives --install /usr/bin/gcc gcc
/opt/rh/devtoolset-8/root/usr/bin/gcc 60 --slave /usr/bin/g++ g++
/opt/rh/devtoolset-8/root/usr/bin/g++
+ mv /usr/bin/c++ /usr/bin/c++.bak && \
+ update-alternatives --install /usr/bin/gcc gcc
/opt/rh/devtoolset-8/root/usr/bin/gcc 60 --slave /usr/bin/g++ g++
/opt/rh/devtoolset-8/root/usr/bin/g++ --slave /usr/bin/c++ c++
/opt/rh/devtoolset-8/root/usr/bin/c++
-ENV
BINUTILS_PREFIX=/opt/rh/devtoolset-8/root/usr/libexec/gcc/x86_64-redhat-linux/8
+ENV BINUTILS_PREFIX=/opt/binutils
+ENV LD_LIBRARY_PATH=/usr/lib
ADD 02_binutils.sh /root
RUN bash /root/02_binutils.sh
+RUN cp -r $BINUTILS_PREFIX/bin/*
/opt/rh/devtoolset-8/root/usr/libexec/gcc/x86_64-redhat-linux/8/
ENV LD_LIBRARY_PATH=$(BINUTILS_PREFIX)
ADD 03_sdk.sh /root
diff --git a/dockerfile/Dockerfile.full.1604.nightly
b/dockerfile/Dockerfile.full.1604.nightly
index 121b0a4..aa1d140 100644
--- a/dockerfile/Dockerfile.full.1604.nightly
+++ b/dockerfile/Dockerfile.full.1604.nightly
@@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y autoconf automake
bison build-essential
ADD 01_gcc_8.sh /root
RUN bash /root/01_gcc_8.sh
-ENV BINUTILS_PREFIX=/usr/lib
+ENV BINUTILS_PREFIX=/usr
ADD 02_binutils.sh /root
RUN bash /root/02_binutils.sh
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
