From 6e5ca42d21205902c94b125dfd90a214ef994f39 Mon Sep 17 00:00:00 2001 From: Simon South Date: Wed, 7 Aug 2019 17:11:28 -0400 Subject: [PATCH] build: Make Debugger usable in minimum profiles Add a missing dependency (libedit) that prevented Debugger from starting, and include Debugger in the Applications menu in the Taskbar. Change-Id: I43c69fe969e51a3a59d1f2d9aa65c00b20848b87 Reviewed-on: https://review.haiku-os.org/c/haiku/+/1713 Reviewed-by: waddlesplash --- src/data/package_infos/arm/haiku | 3 +++ src/data/package_infos/m68k/haiku | 3 +++ src/data/package_infos/ppc/haiku | 3 +++ src/data/package_infos/riscv64/haiku | 3 +++ src/data/package_infos/sparc/haiku | 3 +++ src/data/package_infos/x86/haiku | 3 +++ src/data/package_infos/x86_64/haiku | 3 +++ src/data/package_infos/x86_gcc2/haiku | 3 +++ 8 files changed, 24 insertions(+) diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku index 213b474303..7b1323b149 100644 --- a/src/data/package_infos/arm/haiku +++ b/src/data/package_infos/arm/haiku @@ -54,6 +54,9 @@ requires { cmd:gunzip cmd:tar cmd:unzip +#endif +#ifdef HAIKU_BUILD_FEATURE_ARM_LIBEDIT_ENABLED + lib:libedit #endif lib:libfreetype #ifdef HAIKU_BUILD_FEATURE_ARM_FONTCONFIG_ENABLED diff --git a/src/data/package_infos/m68k/haiku b/src/data/package_infos/m68k/haiku index 667b54fab1..7a1c2d14d2 100644 --- a/src/data/package_infos/m68k/haiku +++ b/src/data/package_infos/m68k/haiku @@ -54,6 +54,9 @@ requires { cmd:gunzip cmd:tar cmd:unzip +#endif +#ifdef HAIKU_BUILD_FEATURE_M68K_LIBEDIT_ENABLED + lib:libedit #endif lib:libfreetype lib:libfontconfig diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku index 44dec7fb5c..7382344ff9 100644 --- a/src/data/package_infos/ppc/haiku +++ b/src/data/package_infos/ppc/haiku @@ -54,6 +54,9 @@ requires { cmd:gunzip cmd:tar cmd:unzip +#endif +#ifdef HAIKU_BUILD_FEATURE_PPC_LIBEDIT_ENABLED + lib:libedit #endif lib:libfreetype #ifdef HAIKU_BUILD_FEATURE_PPC_FONTCONFIG_ENABLED diff --git a/src/data/package_infos/riscv64/haiku b/src/data/package_infos/riscv64/haiku index 133a5fe9b5..59ed57f0b6 100644 --- a/src/data/package_infos/riscv64/haiku +++ b/src/data/package_infos/riscv64/haiku @@ -54,6 +54,9 @@ requires { cmd:gunzip cmd:tar cmd:unzip +#endif +#ifdef HAIKU_BUILD_FEATURE_RISCV64_LIBEDIT_ENABLED + lib:libedit #endif lib:libfreetype #ifdef HAIKU_BUILD_FEATURE_RISCV64_FONTCONFIG_ENABLED diff --git a/src/data/package_infos/sparc/haiku b/src/data/package_infos/sparc/haiku index f52b1f208a..68e835f577 100644 --- a/src/data/package_infos/sparc/haiku +++ b/src/data/package_infos/sparc/haiku @@ -54,6 +54,9 @@ requires { cmd:gunzip cmd:tar cmd:unzip +#endif +#ifdef HAIKU_BUILD_FEATURE_SPARC_LIBEDIT_ENABLED + lib:libedit #endif lib:libfreetype #ifdef HAIKU_BUILD_FEATURE_SPARC_FONTCONFIG_ENABLED diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku index 71037cd963..8ed37c9ce3 100644 --- a/src/data/package_infos/x86/haiku +++ b/src/data/package_infos/x86/haiku @@ -56,6 +56,9 @@ requires { cmd:unzip #endif lib:libcurl +#ifdef HAIKU_BUILD_FEATURE_X86_LIBEDIT_ENABLED + lib:libedit +#endif #ifdef HAIKU_BUILD_FEATURE_X86_FONTCONFIG_ENABLED lib:libfontconfig #endif diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku index b9267cf714..5fe3a7d771 100644 --- a/src/data/package_infos/x86_64/haiku +++ b/src/data/package_infos/x86_64/haiku @@ -56,6 +56,9 @@ requires { cmd:unzip #endif lib:libcurl +#ifdef HAIKU_BUILD_FEATURE_X86_64_LIBEDIT_ENABLED + lib:libedit +#endif #ifdef HAIKU_BUILD_FEATURE_X86_64_FONTCONFIG_ENABLED lib:libfontconfig #endif diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku index 5a3acc09ed..f75d41ad2e 100644 --- a/src/data/package_infos/x86_gcc2/haiku +++ b/src/data/package_infos/x86_gcc2/haiku @@ -57,6 +57,9 @@ requires { cmd:unzip #endif lib:libcurl +#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBEDIT_ENABLED + lib:libedit +#endif #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_FONTCONFIG_ENABLED lib:libfontconfig #endif