Skip to content
Snippets Groups Projects
Commit 9a698c5f authored by Jens Steidl's avatar Jens Steidl
Browse files

- bugfix libxslt build

parent 12c5bc7b
Branches
Tags
No related merge requests found
...@@ -65,26 +65,26 @@ ENV PATH=$PATH:$DISTDIR/bin ...@@ -65,26 +65,26 @@ ENV PATH=$PATH:$DISTDIR/bin
RUN echo $PATH RUN echo $PATH
# build of libxslt v1.1.34 will fail, expects newer version of autotools
ENV libxsltVERSION=v1.1.33
# get and compile libxslt, because RHEL uses outdated and errorneous version # get and compile libxslt, because RHEL uses outdated and errorneous version
# the configure-script must be patched, because empty else branch somewhere # the configure-script must be patched, because empty else branch somewhere
# also we disabled python support and crypto and building static variants only # also we disabled python support and crypto and building static variants only
RUN wget -np https://gitlab.gnome.org/GNOME/libxslt/-/archive/master/libxslt-master.tar.gz RUN wget -np https://gitlab.gnome.org/GNOME/libxslt/-/archive/${libxsltVERSION}/libxslt-${libxsltVERSION}.tar.gz
RUN tar xfz libxslt-master.tar.gz RUN tar xfz libxslt-${libxsltVERSION}.tar.gz
RUN cd libxslt-master && ./autogen.sh RUN cd libxslt-${libxsltVERSION} && ./autogen.sh
RUN cd libxslt-master && ./configure --help # patch errorneous configure for v1.1.33
# patch errorneous configure RUN cd libxslt-${libxsltVERSION} && sed -i -e "16113s/.*/echo nothing/" configure
RUN cd libxslt-master && sed -i -e "16135s/.*/echo nothing/" configure #RUN cd libxslt-${libxsltVERSION} && (cat -n configure | head -n 16122 | tail -n 10)
RUN cd libxslt-master && (cat -n configure | head -n 16143 | tail -n 10) RUN cd libxslt-${libxsltVERSION} && \
RUN cd libxslt-master && \
./configure --prefix=$DISTDIR --without-python --without-crypto \ ./configure --prefix=$DISTDIR --without-python --without-crypto \
--disable-shared --enable-static \ --disable-shared --enable-static \
--with-libxml-src=/home/builder/libxml2-master \ --with-libxml-src=/home/builder/libxml2-master \
--with-libxml-prefix=$DISTDIR/bin \ --with-libxml-prefix=$DISTDIR/bin \
--with-libxml-include-prefix=$DISTDIR/include \ --with-libxml-include-prefix=$DISTDIR/include \
--with-libxml-libs-prefix=$DISTDIR/lib &&\ --with-libxml-libs-prefix=$DISTDIR/lib
make -j &&\ RUN cd libxslt-${libxsltVERSION} && make -j && make install
make install
...@@ -140,7 +140,7 @@ RUN cd MediaInfoLib/Project/GNU/Library/ &&\ ...@@ -140,7 +140,7 @@ RUN cd MediaInfoLib/Project/GNU/Library/ &&\
# because Mediaconch configure script expects libml2 and libxslt as hardcoded # because Mediaconch configure script expects libml2 and libxslt as hardcoded
# names, we set symlinks # names, we set symlinks
RUN ln -s libxml2-master libxml2 RUN ln -s libxml2-master libxml2
RUN ln -s libxslt-master libxslt RUN ln -s libxslt-${libxsltVERSION} libxslt
# get and compile mediaconch # get and compile mediaconch
RUN git clone https://github.com/MediaArea/MediaConch_SourceCode.git RUN git clone https://github.com/MediaArea/MediaConch_SourceCode.git
...@@ -169,4 +169,3 @@ RUN tree $DISTDIR ...@@ -169,4 +169,3 @@ RUN tree $DISTDIR
RUN cd $DISTDIR/../../ && tar -cz -f /tmp/mediaconch.tgz * RUN cd $DISTDIR/../../ && tar -cz -f /tmp/mediaconch.tgz *
RUN ls -lha /tmp/ RUN ls -lha /tmp/
RUN echo "Finished, in /tmp/mediaconch.tgz should be the binary found" RUN echo "Finished, in /tmp/mediaconch.tgz should be the binary found"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment