From d1f696c8bde076818278ef60f77c69d3a1684d8c Mon Sep 17 00:00:00 2001 From: Andreas Romeyke <andreas.romeyke@slub-dresden.de> Date: Wed, 31 Jul 2019 10:49:51 +0200 Subject: [PATCH] - changes to build static version, because on target system there were conflicts with outdated libxml2 --- deploy_mediaconch/Dockerfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/deploy_mediaconch/Dockerfile b/deploy_mediaconch/Dockerfile index d2f65ff..70402d8 100644 --- a/deploy_mediaconch/Dockerfile +++ b/deploy_mediaconch/Dockerfile @@ -54,8 +54,9 @@ RUN mkdir -p $DISTDIR RUN wget -np https://gitlab.gnome.org/GNOME/libxml2/-/archive/master/libxml2-master.tar.gz RUN tar xfz libxml2-master.tar.gz RUN cd libxml2-master && ./autogen.sh +RUN cd libxml2-master && ./configure --help RUN cd libxml2-master &&\ - ./configure --prefix=$DISTDIR --without-python &&\ + ./configure --prefix=$DISTDIR --without-python --disable-shared --enable-static &&\ make -j &&\ make install ENV PATH=$PATH:$DISTDIR/bin @@ -73,6 +74,7 @@ RUN cd libxslt-master && sed -i -e "16135s/.*/echo nothing/" configure RUN cd libxslt-master && (cat -n configure | head -n 16143 | tail -n 10) RUN cd libxslt-master && \ ./configure --prefix=$DISTDIR --without-python --without-crypto \ + --disable-shared --enable-static \ --with-libxml-src=/home/builder/libxml2-master \ --with-libxml-prefix=$DISTDIR/bin \ --with-libxml-include-prefix=$DISTDIR/include \ @@ -98,7 +100,7 @@ RUN cd ZenLib &&\ sed -e "s/-O2/-O3/g" -i configure.ac && \ ./autogen.sh RUN cd ZenLib/Project/GNU/Library &&\ - ./configure --prefix=$DISTDIR &&\ + ./configure --prefix=$DISTDIR --disable-shared --enable-static &&\ make -j &&\ make install @@ -120,7 +122,7 @@ RUN cd MediaInfoLib &&\ sed -e "s/-O2/-O3/g" -i configure.ac && \ ./autogen.sh RUN cd MediaInfoLib/Project/GNU/Library/ &&\ - ./configure --prefix=$DISTDIR &&\ + ./configure --prefix=$DISTDIR --disable-shared --enable-static &&\ make -j &&\ make install @@ -142,7 +144,9 @@ RUN cd MediaConch_SourceCode/Project/GNU/CLI/ &&\ RUN cd MediaConch_SourceCode/Project/GNU/CLI/ &&\ fgrep --color -C 4 libxml2 configure RUN cd MediaConch_SourceCode/Project/GNU/CLI/ &&\ - CXXFLAGS="-O3 -I$DISTDIR/include -L$DISTDIR/lib -L$DISTDIR/lib64" ./configure --prefix=$DISTDIR --without-sqlite --without-jansson --without-libevent + CXXFLAGS="-O3 -I$DISTDIR/include -L/lib -L/lib64 -lrt -L$DISTDIR/lib -L$DISTDIR/lib64" \ + ./configure --prefix=$DISTDIR --without-sqlite --without-jansson\ + --without-libevent --disable-shared --enable-static --enable-staticlibs RUN cd MediaConch_SourceCode/Project/GNU/CLI/ &&\ make -j &&\ -- GitLab