Skip to content

Commit

Permalink
build_script: Re-use do_standard_install where possible
Browse files Browse the repository at this point in the history
  • Loading branch information
jcfr committed Apr 2, 2018
1 parent 2198291 commit 8efa4ef
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions docker/build_scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@ curl -fsSLO https://sqlite.org/2017/$SQLITE_AUTOCONF_VERSION.tar.gz
check_sha256sum $SQLITE_AUTOCONF_VERSION.tar.gz $SQLITE_AUTOCONF_HASH
tar xfz $SQLITE_AUTOCONF_VERSION.tar.gz
cd $SQLITE_AUTOCONF_VERSION
./configure
make install
do_standard_install
cd ..
rm -rf $SQLITE_AUTOCONF_VERSION*

Expand Down Expand Up @@ -137,7 +136,7 @@ rm -rf /usr/local/ssl
curl -fsSL -o patchelf.tar.gz https://github.com/NixOS/patchelf/archive/$PATCHELF_VERSION.tar.gz
check_sha256sum patchelf.tar.gz $PATCHELF_HASH
tar -xzf patchelf.tar.gz
(cd patchelf-$PATCHELF_VERSION && ./bootstrap.sh && ./configure && make && make install)
(cd patchelf-$PATCHELF_VERSION && ./bootstrap.sh && do_standard_install)
rm -rf patchelf.tar.gz patchelf-$PATCHELF_VERSION

ln -s $PY36_BIN/auditwheel /usr/local/bin/auditwheel
Expand Down

0 comments on commit 8efa4ef

Please sign in to comment.