diff options
| -rw-r--r-- | kconfig/Makefile.am | 11 | ||||
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 6 | ||||
| -rw-r--r-- | scripts/functions | 8 |
3 files changed, 18 insertions, 7 deletions
diff --git a/kconfig/Makefile.am b/kconfig/Makefile.am index a6d47fc..1a6611c 100644 --- a/kconfig/Makefile.am +++ b/kconfig/Makefile.am @@ -7,7 +7,7 @@ pkglibexec_PROGRAMS = conf nconf mconf EXTRA_DIST = parser.y lexer.l \ expr.h list.h lkc.h lkc_proto.h nconf.h lxdialog/dialog.h \ - confdata.c expr.c kconf_id.c menu.c symbol.c util.c + menu.c CLEANFILES = lexer.lex.c parser.tab.c parser.tab.h BUILT_SOURCES = lexer.lex.c parser.tab.c @@ -17,17 +17,20 @@ AM_YFLAGS = -t -l AM_CPPFLAGS = -include config.h -DCONFIG_=\"CT_\" AM_LIBTOOLFLAGS = --tag CC -conf_SOURCES = conf.c confdata.c expr.c symbol.c preprocess.c util.c lexer.lex.c parser.tab.c +conf_SOURCES = conf.c confdata.c expr.c symbol.c preprocess.c util.c +nodist_conf_SOURCES = parser.tab.c lexer.lex.c conf_LDADD = $(LIBINTL) -nconf_SOURCES = nconf.c nconf.gui.c confdata.c expr.c symbol.c preprocess.c util.c lexer.lex.c parser.tab.c +nconf_SOURCES = nconf.c nconf.gui.c confdata.c expr.c symbol.c preprocess.c util.c +nodist_nconf_SOURCES = parser.tab.c lexer.lex.c nconf_CFLAGS = $(CURSES_CFLAGS) nconf_LDADD = $(MENU_LIBS) $(PANEL_LIBS) $(CURSES_LIBS) $(LIBINTL) -mconf_SOURCES = mconf.c confdata.c expr.c symbol.c preprocess.c util.c lexer.lex.c parser.tab.c \ +mconf_SOURCES = mconf.c confdata.c expr.c symbol.c preprocess.c util.c \ lxdialog/checklist.c lxdialog/inputbox.c \ lxdialog/menubox.c lxdialog/textbox.c lxdialog/util.c \ lxdialog/yesno.c +nodist_mconf_SOURCES = parser.tab.c lexer.lex.c mconf_LDADD = $(CURSES_LIBS) $(LIBINTL) # automake's support for yacc/lex/gperf is too idiosyncratic. It doesn't diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index e6eec2a..75c683d 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 11717e4..da90980 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 |