diff --git a/projects/ROCKNIX/packages/audio/fluidsynth/package.mk b/projects/ROCKNIX/packages/audio/fluidsynth/package.mk index 51a263feddc..19fd900f3f0 100644 --- a/projects/ROCKNIX/packages/audio/fluidsynth/package.mk +++ b/projects/ROCKNIX/packages/audio/fluidsynth/package.mk @@ -11,3 +11,7 @@ PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=1 \ -Denable-pulseaudio=1 \ -Denable-systemd=1 \ -Denable-readline=0" + +pre_configure_target() { + export LDFLAGS="${LDFLAGS} -Wl,-rpath-link,${TOOLCHAIN}/${TARGET_NAME}/lib" +} diff --git a/projects/ROCKNIX/packages/devel/ncurses/package.mk b/projects/ROCKNIX/packages/devel/ncurses/package.mk index b1fdfacf00d..2252410e9c8 100644 --- a/projects/ROCKNIX/packages/devel/ncurses/package.mk +++ b/projects/ROCKNIX/packages/devel/ncurses/package.mk @@ -62,13 +62,20 @@ PKG_CONFIGURE_OPTS_TARGET="--without-ada \ --enable-sigwinch \ --cache-file=config.cache" -PKG_CONFIGURE_OPTS_HOST="--enable-termcap \ +PKG_CONFIGURE_OPTS_HOST="--without-cxx-binding \ + --enable-termcap \ --with-termlib \ --with-shared \ --enable-pc-files \ --without-tests \ --without-manpages" +pre_configure_host() { + unset TERMINFO + unset TERMINFO_DIR +} + + pre_configure_target() { cat >config.cache <NumOperands(); + for (uint32_t i = 1; i < num_operands; i += 2) { + Operand op = inst->GetOperand(i); +- if (op.words[0] == from) { // add new pair of operands: (to, literal) ++ if (!op.words.empty() && ++ op.words[0] == from) { + inst->AddOperand( + Operand(spv_operand_type_t::SPV_OPERAND_TYPE_ID, {to})); + op = inst->GetOperand(i + 1); diff --git a/projects/ROCKNIX/packages/tools/grub/patches/grub-const-char.patch b/projects/ROCKNIX/packages/tools/grub/patches/grub-const-char.patch new file mode 100644 index 00000000000..ab6d6de383f --- /dev/null +++ b/projects/ROCKNIX/packages/tools/grub/patches/grub-const-char.patch @@ -0,0 +1,79 @@ +diff --git a/grub-core/osdep/linux/ofpath.c b/grub-core/osdep/linux/ofpath.c +index a6153d3..79e442b 100644 +--- a/grub-core/osdep/linux/ofpath.c ++++ b/grub-core/osdep/linux/ofpath.c +@@ -488,13 +488,13 @@ check_hba_identifiers (const char *sysfs_path, int *vendor, int *device_id) + static void + check_sas (const char *sysfs_path, int *tgt, unsigned long int *sas_address) + { +- char *ed = strstr (sysfs_path, "end_device"); +- char *p, *q, *path; ++ const char *sysfs_ed = strstr (sysfs_path, "end_device"); ++ char *ed, *p, *q, *path; + char phy[21]; + int fd; + size_t path_size; + +- if (!ed) ++ if (!sysfs_ed) + return; + + /* SAS devices are identified using disk@$PHY_ID */ +diff --git a/util/probe.c b/util/probe.c +index 81d91cf..a9158d6 100644 +--- a/util/probe.c ++++ b/util/probe.c +@@ -70,7 +70,7 @@ char * + grub_util_guess_bios_drive (const char *orig_path) + { + char *canon; +- char *ptr; ++ const char *ptr; + canon = grub_canonicalize_file_name (orig_path); + if (!canon) + return NULL; +@@ -99,7 +99,7 @@ char * + grub_util_guess_efi_drive (const char *orig_path) + { + char *canon; +- char *ptr; ++ const char *ptr; + canon = grub_canonicalize_file_name (orig_path); + if (!canon) + return NULL; +@@ -128,7 +128,7 @@ char * + grub_util_guess_baremetal_drive (const char *orig_path) + { + char *canon; +- char *ptr; ++ const char *ptr; + canon = grub_canonicalize_file_name (orig_path); + if (!canon) + return NULL; +diff --git a/util/resolve.c b/util/resolve.c +index b6e2631..5310a55 100644 +--- a/util/resolve.c ++++ b/util/resolve.c +@@ -138,8 +138,8 @@ read_dep_list (FILE *fp) + static char * + get_module_name (const char *str) + { +- char *base; +- char *ext; ++ const char *base; ++ const char *ext; + + base = strrchr (str, '/'); + if (! base) +@@ -164,9 +164,9 @@ get_module_name (const char *str) + static char * + get_module_path (const char *prefix, const char *str) + { +- char *dir; ++ const char *dir; + char *base; +- char *ext; ++ const char *ext; + char *ret; + + ext = strrchr (str, '.');