diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 6 | ||||
| -rw-r--r-- | scripts/functions | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index e6eec2a3..75c683d9 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -230,10 +230,16 @@ do_gdb_backend() if [ "${static}" = "y" ]; then cflags+=" -static" ldflags+=" -static" + # There is no static libsource-highlight + extra_config+=("--disable-source-highlight") fi if [ "${static_libstdcxx}" = "y" ]; then ldflags+=" -static-libgcc" ldflags+=" -static-libstdc++" + # libsource-highlight is a dynamic library that uses exception + # exceptions are handled by libstdc++ + # this combination is very buggy, so configure don't use it and abort + extra_config+=("--disable-source-highlight") fi diff --git a/scripts/functions b/scripts/functions index 11717e43..da909800 100644 --- a/scripts/functions +++ b/scripts/functions @@ -2240,6 +2240,7 @@ CT_DoExtractPatch() local bundled_patch_dir local bundled_common_patch_dir local local_patch_dir + local local_common_patch_dir local overlay # Inherit global value if requested @@ -2315,12 +2316,13 @@ CT_DoExtractPatch() bundled_patch_dir="${CT_LIB_DIR}/packages/${pkg_dir}" bundled_common_patch_dir="${CT_LIB_DIR}/packages/${pkg_name}" local_patch_dir="${CT_LOCAL_PATCH_DIR}/${pkg_dir}" + local_common_patch_dir="${CT_LOCAL_PATCH_DIR}/${pkg_name}" case "${patch_order}" in bundled) patch_dirs=("${bundled_patch_dir}" "${bundled_common_patch_dir}");; - local) patch_dirs=("${local_patch_dir}");; - bundled,local) patch_dirs=("${bundled_patch_dir}" "${bundled_common_patch_dir}" "${local_patch_dir}");; - local,bundled) patch_dirs=("${local_patch_dir}" "${bundled_patch_dir}" "${bundled_common_patch_dir}");; + local) patch_dirs=("${local_patch_dir}" "${local_common_patch_dir}");; + bundled,local) patch_dirs=("${bundled_patch_dir}" "${bundled_common_patch_dir}" "${local_patch_dir}" "${local_common_patch_dir}");; + local,bundled) patch_dirs=("${local_patch_dir}" "${local_common_patch_dir}" "${bundled_patch_dir}" "${bundled_common_patch_dir}");; none) patch_dirs=;; esac |