From 3f9fa1df5648d03dca3235bbf7bf9667e604f419 Mon Sep 17 00:00:00 2001 From: Mark Schmale Date: Fri, 5 Jul 2019 13:51:29 +0200 Subject: [PATCH] adding a few dependencies for arch, fedora and gentoo - perls XML::Parser package is call perl-XML-Parser in fedora Uppercase P according to my local install and https://apps.fedoraproject.org/packages/perl-XML-Parser. - fedora (and maybe gentoo) need perls Thread::Queue since its not provided by the default packages. In gentoo its a virutal package, so its certainly provided already but depending on it should not cause any problems - rpcgen is required by samba and not provided by all current glibc packages - add perl as a generic dependency for distris that bundle Thread::Queue in the central perl package ot balance out the dep-list --- scripts/checkdeps | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/checkdeps b/scripts/checkdeps index 4e3ccb1ceb..41cddbe902 100755 --- a/scripts/checkdeps +++ b/scripts/checkdeps @@ -64,12 +64,12 @@ deps_pkg=(wget bash bc gcc sed patch patchutils tar bzip2 gzip perl gawk gperf z files=(/usr/include/stdio.h /usr/include/ncurses.h) files_pkg=(libc6-dev libncurses5-dev) -perl_mod=(JSON XML::Parser) +perl_mod=(JSON XML::Parser Thread::Queue) case "${DISTRO}" in fedora|centos|rhel) - deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python) - deps_pkg+=(gcc-c++ xorg-x11-font-utils xorg-x11-font-utils xorg-x11-font-utils libxslt java-1.7.0-openjdk python2) + deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python rpcgen) + deps_pkg+=(gcc-c++ xorg-x11-font-utils xorg-x11-font-utils xorg-x11-font-utils libxslt java-1.7.0-openjdk python2 rpcgen) if [[ ! $(rpm -qa glibc-static) ]]; then deps+=(glibc-static) deps_pkg+=(glibc-static) @@ -79,18 +79,18 @@ case "${DISTRO}" in deps_pkg+=(libstdc++-static) fi files_pkg=(glibc-headers ncurses-devel) - perl_pkg=(perl-JSON perl-XML-parser) + perl_pkg=(perl-JSON perl-XML-Parser perl-Thread-Queue) ;; gentoo|sabayon) - deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python) - deps_pkg+=("gcc[cxx]" mkfontscale mkfontdir bdftopcf libxslt virtual/jre python) + deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python rpcgen) + deps_pkg+=("gcc[cxx]" mkfontscale mkfontdir bdftopcf libxslt virtual/jre python net-libs/rpcsvc-proto) files_pkg=(glibc ncurses) - perl_pkg=(JSON XML-Parser) + perl_pkg=(JSON XML-Parser perl-Thread-Queue) ;; arch) - deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python) - deps_pkg+=(g++ xorg-mkfontscale xorg-mkfontdir xorg-bdftopcf libxslt "java-runtime-common jdk8-openjdk" python2) - perl_pkg=(perl-json perl-xml-parser) + deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python rpcgen) + deps_pkg+=(g++ xorg-mkfontscale xorg-mkfontdir xorg-bdftopcf libxslt "java-runtime-common jdk8-openjdk" python2 rpcsvc-proto) + perl_pkg=(perl-json perl-xml-parser perl) ;; opensuse) deps+=( g++ mkfontscale mkfontdir bdftopcf xsltproc java python) @@ -99,12 +99,12 @@ case "${DISTRO}" in deps+=(glibc-devel-static) deps_pkg+=(glibc-devel-static) fi - perl_pkg=(perl-JSON perl-XML-Parser) + perl_pkg=(perl-JSON perl-XML-Parser perl) ;; *) deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python) deps_pkg+=(g++ xfonts-utils xfonts-utils xfonts-utils xsltproc default-jre python) - perl_pkg=(libjson-perl libxml-parser-perl) + perl_pkg=(libjson-perl libxml-parser-perl perl) ;; esac