spritsail/busybox
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix glibc build prefix

Browse Source 
Add ldd & ldconfig
This commit is contained in:
Joe Groocock 2017-08-15 21:54:36 +01:00
parent cbc10c6bd1
commit e12c5a3cfb
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Dockerfile
View File

@ -22,26 +22,26 @@ RUN curl -fL https://github.com/javabean/su-exec/releases/download/${SU_EXEC_VER
curl -fL https://github.com/krallin/tini/releases/download/${TINI_VER}/tini-amd64 > sbin/tini && \ curl -fL https://github.com/krallin/tini/releases/download/${TINI_VER}/tini-amd64 > sbin/tini && \
chmod +x sbin/su-exec sbin/tini chmod +x sbin/su-exec sbin/tini
WORKDIR /tmp/glibc WORKDIR /tmp/glibc/build
# Download and build glibc from source # Download and build glibc from source
RUN curl -fL https://ftp.gnu.org/gnu/glibc/glibc-${GLIBC_VER}.tar.xz | tar xJ && \ RUN curl -fL https://ftp.gnu.org/gnu/glibc/glibc-${GLIBC_VER}.tar.xz \
mkdir -p glibc-build && cd glibc-build && \ | tar xJ --strip-components=1 -C .. && \
\ \
echo "slibdir=/lib" >> configparms && \ echo "slibdir=/lib" >> configparms && \
echo "rtlddir=/lib" >> configparms && \ echo "rtlddir=/lib" >> configparms && \
echo "sbindir=/bin" >> configparms && \ echo "sbindir=/bin" >> configparms && \
echo "rootsbindir=/bin" >> configparms && \ echo "rootsbindir=/sbin" >> configparms && \
echo "build-programs=yes" >> configparms && \
\ \
# Fix debian lib path weirdness # Fix debian lib path weirdness
rm -rf /usr/include/${ARCH}-linux-gnu/c++ && \ rm -rf /usr/include/${ARCH}-linux-gnu/c++ && \
ln -s /usr/include/${ARCH}-linux-gnu/* /usr/include && \
\ \
../glibc-${GLIBC_VER}/configure \ exec >/dev/null && \
--prefix="$(pwd)/root" \ ../configure \
--libdir="$(pwd)/root/lib" \ --prefix=/ \
--libdir="/lib" \
--libexecdir=/lib \ --libexecdir=/lib \
--with-headers=/usr/include \
--enable-add-ons \ --enable-add-ons \
--enable-obsolete-rpc \ --enable-obsolete-rpc \
--enable-kernel=3.10.0 \ --enable-kernel=3.10.0 \
@ -53,12 +53,23 @@ RUN curl -fL https://ftp.gnu.org/gnu/glibc/glibc-${GLIBC_VER}.tar.xz | tar xJ &&
--enable-multi-arch \ --enable-multi-arch \
--disable-werror && \ --disable-werror && \
make -j "$(nproc)" && \ make -j "$(nproc)" && \
make install_root=$(pwd)/out install make -j "$(nproc)" install_root="$(pwd)/out" install
# Strip binaries to reduce their size
RUN apt-get install -y file && \
find out/{s,}bin -exec file {} \; | grep -i elf \
| sed 's|^\(.*\):.*|\1|' | xargs strip -s && \
\
# Patch ldd to use sh not bash
sed -i '1s/.*/#!\/bin\/sh/' out/bin/ldd && \
# Copy glibc libs & generate ld cache # Copy glibc libs & generate ld cache
RUN cp -d glibc-build/out/lib/*.so "${PREFIX}/lib" && \ cp -d out/lib/*.so "${PREFIX}/lib" && \
echo '/usr/lib' > "${PREFIX}/etc/ld.so.conf" && \ cp -d out/bin/ldd "${PREFIX}/bin" && \
ldconfig -r "${PREFIX}" cp -d out/sbin/ldconfig "${PREFIX}/sbin" && \
\
echo /usr/lib > "${PREFIX}/etc/ld.so.conf" && \
ldconfig -r "${PREFIX}" && \
ldconfig -r "${PREFIX}" -p
WORKDIR /tmp/busybox WORKDIR /tmp/busybox