Merge pull request #3652 from themasch/patch-1

add a few missing dependencies for fedora, gentoo and arch
This commit is contained in:
MilhouseVH 2019-07-06 15:44:16 +01:00 committed by GitHub
commit 31756fcf15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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