diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install.sh | 2 | ||||
| -rwxr-xr-x | scripts/prereq.sh | 21 |
2 files changed, 11 insertions, 12 deletions
diff --git a/scripts/install.sh b/scripts/install.sh index 1efbaad02..dd541c396 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -148,7 +148,7 @@ tgt=$2 src=$3 case $target { -(atmel-ngw100|banana-pro|banana-pro-zero|orange-pi0|pcengines-apu|phytec-imx6|phytec-wega|raspberry-pi|raspberry-pi0|raspberry-pi2|raspberry-pi3|raspberry-pi3-64|raspberry-pi4|raspberry-pi4-64|raspberry-pi5|rockpi4-plus|solidrun-imx6|solidrun-clearfog|imgtec-ci20|default) ;; +(atmel-ngw100|banana-pro|banana-pro-zero|orange-pi0|pcengines-apu|phytec-imx6|phytec-wega|raspberry-pi|raspberry-pi0|raspberry-pi2|raspberry-pi3|raspberry-pi3-64|raspberry-pi4|raspberry-pi4-64|raspberry-pi5|rockpi4-plus|solidrun-imx6|solidrun-clearfog|imgtec-ci20|hp-jornada|default) ;; (*) print -u2 "Unknown target '$target', exiting" exit 1 ;; diff --git a/scripts/prereq.sh b/scripts/prereq.sh index aed832da4..786d379c6 100755 --- a/scripts/prereq.sh +++ b/scripts/prereq.sh @@ -751,6 +751,9 @@ else # scan host-tool prerequisites of certain packages before building. . $topdir/.config + if [ -n "$ADK_TARGET_ARCH_X86_64" ]; then + NEED_LIBELF="$NEED_LIBELF x86_64 arch" + fi if [ -n "$ADK_PACKAGE_FIREFOX" ]; then NEED_RUST="$NEED_RUST firefox" fi @@ -771,10 +774,6 @@ else NEED_STATIC_LIBSTDCXX="$NEED_STATIC_LIBSTDCXX icu4c" fi - if [ -n "$ADK_PACKAGE_XKEYBOARD_CONFIG" ]; then - NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config" - fi - if [ -n "$ADK_PACKAGE_FONT_BH_100DPI" ]; then NEED_MKFONTDIR="$NEED_MKFONTDIR font-bh-100dpi" fi @@ -845,13 +844,6 @@ else fi fi - if [ -n "$NEED_XKBCOMP" ]; then - if ! which xkbcomp >/dev/null 2>&1; then - printf "You need xkbcomp to build $NEED_XKBCOMP \n" - out=1 - fi - fi - if [ -n "$NEED_JAVA" ]; then if ! which java >/dev/null 2>&1; then printf "You need java to build $NEED_JAVA \n" @@ -887,6 +879,13 @@ else fi fi + if [ -n "$NEED_LIBELF" ]; then + if ! test -f /usr/include/gelf.h >/dev/null 2>&1; then + printf "You need libelf-dev to build $NEED_LIBELF \n" + out=1 + fi + fi + if [ -n "$NEED_STATIC_LIBSTDCXX" ]; then cat >test.c <<-'EOF' #include <stdio.h> |