libssp: Download directory from gitlab instead of svn
svn is typically blocked on corporate firewalls.
This commit is contained in:
1 parent
93e0b63f3c
commit
959f14a1c1
5 files changed
+7
-5
No files matched your search
+1
-1
@@ -2,7 +2,7 @@ FROM ubuntu:18.04
|
|||||||
|
|
||||||
RUN apt-get update -qq && apt-get install -qqy --no-install-recommends \
|
RUN apt-get update -qq && apt-get install -qqy --no-install-recommends \
|
||||||
git wget bzip2 file unzip libtool pkg-config cmake build-essential \
|
git wget bzip2 file unzip libtool pkg-config cmake build-essential \
|
||||||
automake yasm gettext autopoint vim python ninja-build subversion \
|
automake yasm gettext autopoint vim python ninja-build \
|
||||||
ca-certificates curl less && \
|
ca-certificates curl less && \
|
||||||
apt-get clean -y && \
|
apt-get clean -y && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@ FROM ubuntu:18.04
|
|||||||
|
|
||||||
RUN apt-get update -qq && apt-get install -qqy --no-install-recommends \
|
RUN apt-get update -qq && apt-get install -qqy --no-install-recommends \
|
||||||
git wget bzip2 file unzip libtool pkg-config cmake build-essential \
|
git wget bzip2 file unzip libtool pkg-config cmake build-essential \
|
||||||
automake yasm gettext autopoint vim python ninja-build subversion \
|
automake yasm gettext autopoint vim python ninja-build \
|
||||||
ca-certificates curl less && \
|
ca-certificates curl less && \
|
||||||
apt-get clean -y && \
|
apt-get clean -y && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ Building in MSYS2
|
|||||||
|
|
||||||
To build in MSYS2, install the following set of packages with `pacman -S --needed`:
|
To build in MSYS2, install the following set of packages with `pacman -S --needed`:
|
||||||
|
|
||||||
git subversion mingw-w64-x86_64-gcc mingw-w64-x86_64-ninja mingw-w64-x86_64-cmake make mingw-w64-x86_64-python3
|
git wget mingw-w64-x86_64-gcc mingw-w64-x86_64-ninja mingw-w64-x86_64-cmake make mingw-w64-x86_64-python3
|
||||||
|
|
||||||
|
|
||||||
Status
|
Status
|
||||||
|
|||||||
+1
-1
@@ -22,7 +22,7 @@ if [ $# -lt 1 ]; then
|
|||||||
fi
|
fi
|
||||||
PREFIX="$1"
|
PREFIX="$1"
|
||||||
|
|
||||||
for dep in git svn cmake; do
|
for dep in git wget cmake; do
|
||||||
if ! hash $dep 2>/dev/null; then
|
if ! hash $dep 2>/dev/null; then
|
||||||
echo "$dep not installed. Please install it and retry" 1>&2
|
echo "$dep not installed. Please install it and retry" 1>&2
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
+3
-1
@@ -37,7 +37,9 @@ export PATH="$PREFIX/bin:$PATH"
|
|||||||
: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
|
: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
|
||||||
|
|
||||||
if [ ! -d libssp ]; then
|
if [ ! -d libssp ]; then
|
||||||
svn checkout -q svn://gcc.gnu.org/svn/gcc/tags/gcc_7_3_0_release/libssp
|
wget -O libssp.tar.bz2 'https://gitlab.com/watched/gcc-mirror/gcc/-/archive/releases/gcc-7.3.0/gcc-releases-gcc-7.3.0.tar.bz2?path=libssp'
|
||||||
|
tar xf libssp.tar.bz2 --strip-components=1
|
||||||
|
rm -f libssp.tar.bz2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cp libssp-Makefile libssp/Makefile
|
cp libssp-Makefile libssp/Makefile
|
||||||
|
|||||||
Reference in new issue
Block a user