add binutils-dev, use repo texinfo, ditch glib and libffi

This commit is contained in:
sparklyballs 2017-08-28 17:54:24 +01:00
parent 12784fccf1
commit 150aad9dd2

View File

@ -7,9 +7,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
# package versions
ARG CMAKE_VER="3.9.1"
ARG GLIB_VER="2.52.3"
ARG NASM_VER="2.13.01"
ARG TEXINFO_VER="6.4"
ARG YASM_VER="1.3.0"
# install fetch packages
@ -39,6 +37,8 @@ RUN \
/etc/apt/sources.list.d/toolchain.list && \
apt-get update && \
DEBIAN_FRONTEND="noninteractive" apt-get install -y \
binutils \
binutils-dev \
g++-6 \
gcc-6 && \
DEBIAN_FRONTEND="noninteractive" update-alternatives --install \
@ -61,52 +61,19 @@ RUN \
libarchive-dev \
libbz2-dev \
libcurl4-gnutls-dev \
libmount-dev \
libpcre++-dev \
libtool \
lsb-release \
make \
pkg-config \
python-dev \
texinfo \
zlib1g-dev && \
rm -rf \
/var/lib/apt/lists/*
# compile libffi
RUN \
curl -o \
/tmp/libffi-3.2.1.tar.gz -L \
"https://sourceware.org/ftp/libffi/libffi-3.2.1.tar.gz" && \
tar xf \
/tmp/libffi-3.2.1.tar.gz -C /tmp/ && \
cd /tmp/libffi-3.2.1 && \
sed -e \
'/^includesdir/ s/$(libdir).*$/$(includedir)/' \
-i include/Makefile.in && \
sed -e \
'/^includedir/ s/=.*$/=@includedir@/' \
-e 's/^Cflags: -I${includedir}/Cflags:/' \
-i libffi.pc.in && \
./configure \
--disable-static \
--prefix=/usr && \
make && \
make install && \
# compile glib2
curl -o \
/tmp/glib-${GLIB_VER}.tar.xz -L \
"http://ftp.gnome.org/pub/gnome/sources/glib/${GLIB_VER%.*}/glib-${GLIB_VER}.tar.xz" && \
tar xf \
/tmp/glib-${GLIB_VER}.tar.xz -C /tmp/ && \
cd /tmp/glib-${GLIB_VER} && \
./configure \
--prefix=/usr \
--with-pcre=system && \
make && \
make install && \
# compile cmake
RUN \
curl -o \
/tmp/cmake-${CMAKE_VER}.tar.gz -L \
"https://cmake.org/files/v3.9/cmake-${CMAKE_VER}.tar.gz" && \
@ -150,21 +117,6 @@ RUN \
make && \
make install && \
# compile texinfo
curl -o \
/tmp/texinfo-${TEXINFO_VER}.tar.xz -L \
"http://ftp.gnu.org/gnu/texinfo/texinfo-${TEXINFO_VER}.tar.xz" && \
tar xf \
/tmp/texinfo-${TEXINFO_VER}.tar.xz -C /tmp/ && \
cd /tmp/texinfo-${TEXINFO_VER} && \
./configure \
--disable-static \
--prefix=/usr && \
make && \
make check && \
make install && \
make TEXMF=/usr/share/texmf install-tex && \
# cleanup
rm -rf \
/tmp/*