diff options
Diffstat (limited to 'external/meta-gplv2')
28 files changed, 663 insertions, 80 deletions
diff --git a/external/meta-gplv2/conf/layer.conf b/external/meta-gplv2/conf/layer.conf index 43d578b5..9a665b4b 100644 --- a/external/meta-gplv2/conf/layer.conf +++ b/external/meta-gplv2/conf/layer.conf @@ -14,4 +14,9 @@ LAYERVERSION_gplv2 = "1" LAYERDEPENDS_gplv2 = "core" -LAYERSERIES_COMPAT_gplv2 = "thud" +LAYERSERIES_COMPAT_gplv2 = "dunfell" + +LICENSE_PATH += "${LAYERDIR}/licenses" + +PREFERRED_VERSION_shared-mime-info = "${@['', '1.10']['GPLV3' in (d.getVar('INCOMPATIBLE_LICENSE') or '').upper()]}" +PREFERRED_VERSION_shared-mime-info-native = "${@['', '1.10']['GPLV3' in (d.getVar('INCOMPATIBLE_LICENSE') or '').upper()]}" diff --git a/external/meta-gplv2/licenses/Elfutils-Exception b/external/meta-gplv2/licenses/Elfutils-Exception new file mode 100644 index 00000000..627d7691 --- /dev/null +++ b/external/meta-gplv2/licenses/Elfutils-Exception @@ -0,0 +1,12 @@ + This file describes the limits of the Exception under which you are allowed + to distribute Non-GPL Code in linked combination with Red Hat elfutils. + For the full text of the license, please see one of the header files + included with the source distribution or the file COPYING found in the + top level directory of the source. + + The Approved Interfaces are the functions declared in the files: + + libelf.h + libdw.h + libdwfl.h + diff --git a/external/meta-gplv2/recipes-core/coreutils/coreutils_6.9.bb b/external/meta-gplv2/recipes-core/coreutils/coreutils_6.9.bb index 080100d1..42b4f3c4 100644 --- a/external/meta-gplv2/recipes-core/coreutils/coreutils_6.9.bb +++ b/external/meta-gplv2/recipes-core/coreutils/coreutils_6.9.bb @@ -32,8 +32,16 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \ SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06" SRC_URI[sha256sum] = "89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0" -EXTRA_OECONF += "ac_cv_func_getgroups_works=yes \ - ac_cv_func_strcoll_works=yes" +CACHED_CONFIGUREVARS = "ac_cv_func_getgroups_works=yes \ + ac_cv_func_strcoll_works=yes \ + ac_cv_func_working_mktime=yes \ + jm_ac_cv_func_link_follows_symlink=no \ + jm_cv_func_unlink_busy_text=yes \ + jm_cv_have_proc_uptime=yes \ + gl_cv_func_mkdir_trailing_slash_bug=no \ + gl_cv_func_rename_trailing_slash_bug=no \ + gl_cv_func_rename_trailing_dest_slash_bug=no \ + " # acl is not a default feature # diff --git a/external/meta-gplv2/recipes-devtools/bison/bison/bison-2.3_m4.patch b/external/meta-gplv2/recipes-devtools/bison/bison/bison-2.3_m4.patch index 348ce1d2..626bc42c 100644 --- a/external/meta-gplv2/recipes-devtools/bison/bison/bison-2.3_m4.patch +++ b/external/meta-gplv2/recipes-devtools/bison/bison/bison-2.3_m4.patch @@ -76,34 +76,35 @@ Upstream-Status: Pending +]) --- /dev/null +++ bison-1.875/m4/uintmax_t.m4 -@@ -0,0 +1,29 @@ -+# uintmax_t.m4 serial 6 (gettext-0.11) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. +@@ -0,0 +1,30 @@ ++# uintmax_t.m4 serial 12 (gettext-0.20.1) ++dnl Copyright (C) 1997-2004, 2007-2019 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. + +dnl From Paul Eggert. + -+AC_PREREQ(2.13) ++AC_PREREQ([2.13]) + -+# Define uintmax_t to `unsigned long' or `unsigned long long' -+# if <inttypes.h> does not exist. ++# Define uintmax_t to 'unsigned long' or 'unsigned long long' ++# if it is not already defined in <stdint.h> or <inttypes.h>. + -+AC_DEFUN([jm_AC_TYPE_UINTMAX_T], ++AC_DEFUN([gl_AC_TYPE_UINTMAX_T], +[ -+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) -+ AC_REQUIRE([jm_AC_HEADER_STDINT_H]) -+ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then -+ AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) -+ test $ac_cv_type_unsigned_long_long = yes \ ++ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) ++ AC_REQUIRE([gl_AC_HEADER_STDINT_H]) ++ if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then ++ AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) ++ test $ac_cv_type_unsigned_long_long_int = yes \ + && ac_type='unsigned long long' \ + || ac_type='unsigned long' -+ AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, -+ [Define to unsigned long or unsigned long long -+ if <inttypes.h> and <stdint.h> don't define.]) ++ AC_DEFINE_UNQUOTED([uintmax_t], [$ac_type], ++ [Define to unsigned long or unsigned long long ++ if <stdint.h> and <inttypes.h> don't define.]) ++ else ++ AC_DEFINE([HAVE_UINTMAX_T], [1], ++ [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.]) + fi +]) --- /dev/null @@ -143,64 +144,64 @@ Upstream-Status: Pending +) --- /dev/null +++ bison-1.875/m4/stdint_h.m4 -@@ -0,0 +1,28 @@ -+# stdint_h.m4 serial 2 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. +@@ -0,0 +1,27 @@ ++# stdint_h.m4 serial 9 (gettext-0.20.1) ++dnl Copyright (C) 1997-2004, 2006, 2008-2019 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. + +dnl From Paul Eggert. + +# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, +# doesn't clash with <sys/types.h>, and declares uintmax_t. + -+AC_DEFUN([jm_AC_HEADER_STDINT_H], ++AC_DEFUN([gl_AC_HEADER_STDINT_H], +[ -+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, -+ [AC_TRY_COMPILE( -+ [#include <sys/types.h> -+#include <stdint.h>], -+ [uintmax_t i = (uintmax_t) -1;], -+ jm_ac_cv_header_stdint_h=yes, -+ jm_ac_cv_header_stdint_h=no)]) -+ if test $jm_ac_cv_header_stdint_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, -+[Define if <stdint.h> exists, doesn't clash with <sys/types.h>, -+ and declares uintmax_t. ]) ++ AC_CACHE_CHECK([for stdint.h], [gl_cv_header_stdint_h], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include <sys/types.h> ++ #include <stdint.h>]], ++ [[uintmax_t i = (uintmax_t) -1; return !i;]])], ++ [gl_cv_header_stdint_h=yes], ++ [gl_cv_header_stdint_h=no])]) ++ if test $gl_cv_header_stdint_h = yes; then ++ AC_DEFINE_UNQUOTED([HAVE_STDINT_H_WITH_UINTMAX], [1], ++ [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, ++ and declares uintmax_t. ]) + fi +]) --- /dev/null +++ bison-1.875/m4/inttypes_h.m4 -@@ -0,0 +1,28 @@ -+# inttypes_h.m4 serial 4 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. +@@ -0,0 +1,29 @@ ++# inttypes_h.m4 serial 10 (gettext-0.20.1) ++dnl Copyright (C) 1997-2004, 2006, 2008-2019 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. + +dnl From Paul Eggert. + +# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists, +# doesn't clash with <sys/types.h>, and declares uintmax_t. + -+AC_DEFUN([jm_AC_HEADER_INTTYPES_H], ++AC_DEFUN([gl_AC_HEADER_INTTYPES_H], +[ -+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, -+ [AC_TRY_COMPILE( -+ [#include <sys/types.h> -+#include <inttypes.h>], -+ [uintmax_t i = (uintmax_t) -1;], -+ jm_ac_cv_header_inttypes_h=yes, -+ jm_ac_cv_header_inttypes_h=no)]) -+ if test $jm_ac_cv_header_inttypes_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, -+[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, -+ and declares uintmax_t. ]) ++ AC_CACHE_CHECK([for inttypes.h], [gl_cv_header_inttypes_h], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[ ++#include <sys/types.h> ++#include <inttypes.h> ++ ]], ++ [[uintmax_t i = (uintmax_t) -1; return !i;]])], ++ [gl_cv_header_inttypes_h=yes], ++ [gl_cv_header_inttypes_h=no])]) ++ if test $gl_cv_header_inttypes_h = yes; then ++ AC_DEFINE_UNQUOTED([HAVE_INTTYPES_H_WITH_UINTMAX], [1], ++ [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, ++ and declares uintmax_t. ]) + fi +]) --- /dev/null diff --git a/external/meta-gplv2/recipes-devtools/dosfstools/dosfstools/fixing-out-of-bound-writes.patch b/external/meta-gplv2/recipes-devtools/dosfstools/dosfstools/fixing-out-of-bound-writes.patch new file mode 100644 index 00000000..f80f5abc --- /dev/null +++ b/external/meta-gplv2/recipes-devtools/dosfstools/dosfstools/fixing-out-of-bound-writes.patch @@ -0,0 +1,54 @@ +Fix out of bound write issues where sprintf writes across both +name and ext fields and drops the final null ternimator outside the struct + +Upstream-Status: Inappropriate [licensing] +We're tracking an old release of dosfstools due to licensing issues. + +diff --git a/dosfsck/check.c b/dosfsck/check.c +index e8c13bb..91177d3 100644 +--- a/dosfsck/check.c ++++ b/dosfsck/check.c +@@ -58,6 +58,13 @@ static DOS_FILE *root; + } \ + } while(0) + ++static void de_printf(DIR_ENT *de, const char *pattern, int curr_num) ++{ ++ char buffer[12]; ++ sprintf(buffer, pattern, curr_num); ++ memcpy(de->name, buffer, 8); ++ memcpy(de->ext, buffer + 8, 3); ++} + + loff_t alloc_rootdir_entry(DOS_FS *fs, DIR_ENT *de, const char *pattern) + { +@@ -110,7 +117,8 @@ loff_t alloc_rootdir_entry(DOS_FS *fs, DIR_ENT *de, const char *pattern) + } + memset(de,0,sizeof(DIR_ENT)); + while (1) { +- sprintf(de->name,pattern,curr_num); ++ de_printf(de, pattern, curr_num); ++ + clu_num = fs->root_cluster; + i = 0; + offset2 = cluster_start(fs,clu_num); +@@ -150,7 +158,7 @@ loff_t alloc_rootdir_entry(DOS_FS *fs, DIR_ENT *de, const char *pattern) + offset = fs->root_start+next_free*sizeof(DIR_ENT); + memset(de,0,sizeof(DIR_ENT)); + while (1) { +- sprintf(de->name,pattern,curr_num); ++ de_printf(de, pattern, curr_num); + for (scan = 0; scan < fs->root_entries; scan++) + if (scan != next_free && + !strncmp(root[scan].name,de->name,MSDOS_NAME)) +@@ -311,8 +319,8 @@ static void auto_rename(DOS_FILE *file) + first = file->parent ? file->parent->first : root; + number = 0; + while (1) { +- sprintf(file->dir_ent.name,"FSCK%04d",number); +- strncpy(file->dir_ent.ext,"REN",3); ++ de_printf(&file->dir_ent, "FSCK%04dREN", number); ++ + for (walk = first; walk; walk = walk->next) + if (walk != file && !strncmp(walk->dir_ent.name,file->dir_ent. + name,MSDOS_NAME)) break; diff --git a/external/meta-gplv2/recipes-devtools/dosfstools/dosfstools_2.11.bb b/external/meta-gplv2/recipes-devtools/dosfstools/dosfstools_2.11.bb index dd543b16..37c21810 100644 --- a/external/meta-gplv2/recipes-devtools/dosfstools/dosfstools_2.11.bb +++ b/external/meta-gplv2/recipes-devtools/dosfstools/dosfstools_2.11.bb @@ -19,6 +19,7 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.src.tar.gz/407d4 file://nofat32_autoselect.patch \ file://fix_populated_dosfs_creation.patch \ file://0001-Include-fcntl.h-for-getting-loff_t-definition.patch \ + file://fixing-out-of-bound-writes.patch \ " SRC_URI[md5sum] = "407d405ade410f7597d364ab5dc8c9f6" diff --git a/external/meta-gplv2/recipes-devtools/elfutils/elfutils_0.148.bb b/external/meta-gplv2/recipes-devtools/elfutils/elfutils_0.148.bb index a03b74e9..1f07a285 100644 --- a/external/meta-gplv2/recipes-devtools/elfutils/elfutils_0.148.bb +++ b/external/meta-gplv2/recipes-devtools/elfutils/elfutils_0.148.bb @@ -57,6 +57,10 @@ SRC_URI += "\ " inherit autotools gettext +# There is a fix in 0.175 version (https://sourceware.org/bugzilla/show_bug.cgi?id=23884) +# but 0.175 has different license, so to be safe don't backport the fix, just ignore the issue +CFLAGS += "-Wno-error=missing-attributes" + EXTRA_OECONF = "--program-prefix=eu- --without-lzma" EXTRA_OECONF_append_class-native = " --without-bzlib" EXTRA_OECONF_append_libc-uclibc = " --enable-uclibc" diff --git a/external/meta-gplv2/recipes-extended/bc/bc_1.06.bb b/external/meta-gplv2/recipes-extended/bc/bc_1.06.bb index d8c8a860..3de1b24f 100644 --- a/external/meta-gplv2/recipes-extended/bc/bc_1.06.bb +++ b/external/meta-gplv2/recipes-extended/bc/bc_1.06.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea7 inherit autotools texinfo update-alternatives -ALTERNATIVE_${PN} = "dc" +ALTERNATIVE_${PN} = "bc dc" ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native" diff --git a/external/meta-gplv2/recipes-extended/diffutils/diffutils-2.8.1/0002-included-libc-use-mempcpy-instead-of.patch b/external/meta-gplv2/recipes-extended/diffutils/diffutils-2.8.1/0002-included-libc-use-mempcpy-instead-of.patch new file mode 100644 index 00000000..6994ec77 --- /dev/null +++ b/external/meta-gplv2/recipes-extended/diffutils/diffutils-2.8.1/0002-included-libc-use-mempcpy-instead-of.patch @@ -0,0 +1,56 @@ +From 61db4da387676690c0f731ef2eccc014d85c23a6 Mon Sep 17 00:00:00 2001 +From: Nicola Lunghi <nicola.lunghi@jci.com> +Date: Wed, 20 Nov 2019 18:30:10 +0000 +Subject: [PATCH] included libc: use mempcpy instead of __mempcpy + +Fix to use mempcpy instead of __mempcpy. This is needed for uclibc and musl +which doesn't define __mempcpy, only mempcpy. Since they all have +mempcpy, we'll just use that instead. + +Signed-off-by: Nicola Lunghi <nick83ola@gmail.com> + +Patch source: OpenEmbedded (grep) +Upstream-Status: Inappropriate [licensing] +--- + lib/getopt.c | 4 ++-- + lib/regex.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/getopt.c b/lib/getopt.c +index ed32692..6626f5e 100644 +--- a/lib/getopt.c ++++ b/lib/getopt.c +@@ -334,7 +334,7 @@ exchange (argv) + nonoption_flags_len = nonoption_flags_max_len = 0; + else + { +- memset (__mempcpy (new_str, __getopt_nonoption_flags, ++ memset (mempcpy (new_str, __getopt_nonoption_flags, + nonoption_flags_max_len), + '\0', top + 1 - nonoption_flags_max_len); + nonoption_flags_max_len = top + 1; +@@ -445,7 +445,7 @@ _getopt_initialize (argc, argv, optstring) + if (__getopt_nonoption_flags == NULL) + nonoption_flags_max_len = -1; + else +- memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), ++ memset (mempcpy (__getopt_nonoption_flags, orig_str, len), + '\0', nonoption_flags_max_len - len); + } + } +diff --git a/lib/regex.c b/lib/regex.c +index 6daec76..797b20a 100644 +--- a/lib/regex.c ++++ b/lib/regex.c +@@ -8314,7 +8314,7 @@ regerror (errcode, preg, errbuf, errbuf_size) + if (msg_size > errbuf_size) + { + #if defined HAVE_MEMPCPY || defined _LIBC +- *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; ++ *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; + #else + memcpy (errbuf, msg, errbuf_size - 1); + errbuf[errbuf_size - 1] = 0; +-- +2.20.1 + diff --git a/external/meta-gplv2/recipes-extended/diffutils/diffutils-2.8.1/0003-context-fix-compilation-with-64bit-time_t-on-32bit-a.patch b/external/meta-gplv2/recipes-extended/diffutils/diffutils-2.8.1/0003-context-fix-compilation-with-64bit-time_t-on-32bit-a.patch new file mode 100644 index 00000000..a8fcde09 --- /dev/null +++ b/external/meta-gplv2/recipes-extended/diffutils/diffutils-2.8.1/0003-context-fix-compilation-with-64bit-time_t-on-32bit-a.patch @@ -0,0 +1,46 @@ +From 07c75310fecbaec62a24a3ee98b4209e1bf9ff62 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net> +Date: Mon, 6 Jan 2020 13:31:50 +0000 +Subject: [PATCH] context: fix compilation with 64bit time_t on 32bit arches +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In file included from ../../diffutils-2.8.1/src/diff.h:23, + from ../../diffutils-2.8.1/src/context.c:23: +../../diffutils-2.8.1/src/context.c: In function 'print_context_label': +../../diffutils-2.8.1/src/system.h:41:52: error: size of array 'a' is negative + 41 | #define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; } + | ^ +../../diffutils-2.8.1/src/context.c:65:4: note: in expansion of macro 'verify' + 65 | verify (info_preserved, sizeof inf->stat.st_mtime <= sizeof sec); + | ^~~~~~ + +struct stat::st_mtime is a time_t and will not fit into a +long (when 64bit time_t has been requested on a 32bit machine). + +Signed-off-by: André Draszik <git@andred.net> +Upstream-Status: Inappropriate [fixing an old version] +--- + src/context.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/context.c b/src/context.c +index 18d7023..d41efde 100644 +--- a/src/context.c ++++ b/src/context.c +@@ -61,9 +61,9 @@ print_context_label (char const *mark, + int nsec = TIMESPEC_NS (inf->stat.st_mtim); + if (! (tm && nstrftime (buf, sizeof buf, time_format, tm, 0, nsec))) + { +- long sec = inf->stat.st_mtime; ++ time_t sec = inf->stat.st_mtime; + verify (info_preserved, sizeof inf->stat.st_mtime <= sizeof sec); +- sprintf (buf, "%ld.%.9d", sec, nsec); ++ sprintf (buf, "%lld.%.9d", (long long) sec, nsec); + } + fprintf (outfile, "%s %s\t%s\n", mark, inf->name, buf); + } +-- +2.23.0.rc1 + diff --git a/external/meta-gplv2/recipes-extended/diffutils/diffutils.inc b/external/meta-gplv2/recipes-extended/diffutils/diffutils.inc index 243341aa..c81348b3 100644 --- a/external/meta-gplv2/recipes-extended/diffutils/diffutils.inc +++ b/external/meta-gplv2/recipes-extended/diffutils/diffutils.inc @@ -6,13 +6,6 @@ SECTION = "base" inherit autotools texinfo update-alternatives gettext -# diffutils assumes non-glibc compilation with uclibc and -# this causes it to generate its own implementations of -# standard functionality. regex.c actually breaks compilation -# because it uses __mempcpy, there are other things (TBD: -# see diffutils.mk in buildroot) -EXTRA_OECONF_libc-uclibc = "--without-included-regex" - ALTERNATIVE_${PN} = "diff cmp" ALTERNATIVE_PRIORITY = "100" diff --git a/external/meta-gplv2/recipes-extended/diffutils/diffutils_2.8.1.bb b/external/meta-gplv2/recipes-extended/diffutils/diffutils_2.8.1.bb index 466bf285..7c43c4be 100644 --- a/external/meta-gplv2/recipes-extended/diffutils/diffutils_2.8.1.bb +++ b/external/meta-gplv2/recipes-extended/diffutils/diffutils_2.8.1.bb @@ -9,11 +9,18 @@ SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz \ file://diffutils_fix_for_automake-1.12.patch \ file://fix_gcc6.patch \ file://0001-Make-it-build-with-compile-time-hardening-enabled.patch \ + file://0002-included-libc-use-mempcpy-instead-of.patch \ + file://0003-context-fix-compilation-with-64bit-time_t-on-32bit-a.patch \ " SRC_URI[md5sum] = "71f9c5ae19b60608f6c7f162da86a428" SRC_URI[sha256sum] = "c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a" +CACHED_CONFIGUREVARS = "\ + jm_cv_func_working_malloc=yes \ + jm_cv_func_working_realloc=yes \ +" + do_configure_prepend () { chmod u+w ${S}/po/Makefile.in.in } diff --git a/external/meta-gplv2/recipes-extended/grep/grep-2.5.1a/0001-Fix-builds-with-gettext-0.20.patch b/external/meta-gplv2/recipes-extended/grep/grep-2.5.1a/0001-Fix-builds-with-gettext-0.20.patch new file mode 100644 index 00000000..ee9a6b1b --- /dev/null +++ b/external/meta-gplv2/recipes-extended/grep/grep-2.5.1a/0001-Fix-builds-with-gettext-0.20.patch @@ -0,0 +1,63 @@ +From cd814b2203a1b5e71eaf97c3b9efedc94b680a19 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 17 Dec 2019 16:46:05 +0100 +Subject: [PATCH] Fix builds with gettext 0.20 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +André: +Updated patch to also AC_CHECK_FUNCS([setlocale]). +Various #include <locale.h> are guarded by the outcome of that, +and otherwise compilation fails, e.g.: +| ../../grep-2.5.1a/src/dfa.c:1366:34: error: 'LC_COLLATE' undeclared (first use in this function); did you mean 'REG_ECOLLATE'? +| 1366 | hard_LC_COLLATE = hard_locale (LC_COLLATE); +| | ^~~~~~~~~~ +| | REG_ECOLLATE + +Upstream-Status: Inappropriate [fixing an old version] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +Signed-off-by: André Draszik <git@andred.net> +--- + Makefile.am | 2 +- + configure.in | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index e4b58c4..a851b9d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to create Makefile.in + AUTOMAKE_OPTIONS = no-dependencies + +-SUBDIRS = intl po lib doc src tests m4 vms bootstrap ++SUBDIRS = po lib doc src tests m4 vms bootstrap + + EXTRA_DIST = TODO README README-alpha PATCHES.AC PATCHES.AM + +diff --git a/configure.in b/configure.in +index 2fa6c71..e1e04ea 100644 +--- a/configure.in ++++ b/configure.in +@@ -48,6 +48,8 @@ AC_FUNC_ALLOCA + AC_FUNC_CLOSEDIR_VOID + AC_FUNC_MMAP + ++AC_CHECK_FUNCS([setlocale]) ++ + dnl getpagesize is checked for by AC_FUNC_MMAP. + AC_CHECK_FUNCS(btowc isascii memmove setmode strerror wctype mbrtowc) + AC_REPLACE_FUNCS(memchr stpcpy strtoul atexit fnmatch) +@@ -70,7 +72,7 @@ esac + + dnl I18N feature + ALL_LINGUAS="cs de el eo es et fr gl hr id it ja ko nl no pl pt_BR ru sl sv" +-AM_GNU_GETTEXT ++AM_GNU_GETTEXT([external]) + + dnl DOS file name convention + dnl sets HAVE_DOS_FILE_NAMES +-- +2.23.0.rc1 + diff --git a/external/meta-gplv2/recipes-extended/grep/grep_2.5.1a.bb b/external/meta-gplv2/recipes-extended/grep/grep_2.5.1a.bb index b331feeb..d3b4ddc4 100644 --- a/external/meta-gplv2/recipes-extended/grep/grep_2.5.1a.bb +++ b/external/meta-gplv2/recipes-extended/grep/grep_2.5.1a.bb @@ -17,7 +17,8 @@ SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \ file://fix-for-texinfo-5.1.patch \ file://grep-egrep-fgrep-Fix-LSB-NG-cases.patch \ file://search-fix-compilation-error-with-security-flags-ena.patch \ - " + file://0001-Fix-builds-with-gettext-0.20.patch \ + " SRC_URI[md5sum] = "52202fe462770fa6be1bb667bd6cf30c" SRC_URI[sha256sum] = "38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92bdd3132" diff --git a/external/meta-gplv2/recipes-extended/gzip/gzip-1.3.12/fix-shell.patch b/external/meta-gplv2/recipes-extended/gzip/gzip-1.3.12/fix-shell.patch new file mode 100644 index 00000000..13b479bf --- /dev/null +++ b/external/meta-gplv2/recipes-extended/gzip/gzip-1.3.12/fix-shell.patch @@ -0,0 +1,16 @@ +We want /bin/sh left as the shell, not bash for example +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Inappropriate [fixed differently in new versions] + +Index: gzip-1.3.12/Makefile.am +=================================================================== +--- gzip-1.3.12.orig/Makefile.am ++++ gzip-1.3.12/Makefile.am +@@ -55,7 +55,6 @@ gzip.doc.gz: gzip.doc + SUFFIXES = .in + .in: + sed \ +- -e 's|/bin/sh|$(SHELL)|g' \ + -e 's|BINDIR|$${GZIP_BINDIR-'\''$(bindir)'\''}|g' \ + -e 's|[@]VERSION@|$(VERSION)|g' \ + $(srcdir)/$@.in >$@ diff --git a/external/meta-gplv2/recipes-extended/gzip/gzip_1.3.12.bb b/external/meta-gplv2/recipes-extended/gzip/gzip_1.3.12.bb index e4062827..5f7f6cdf 100644 --- a/external/meta-gplv2/recipes-extended/gzip/gzip_1.3.12.bb +++ b/external/meta-gplv2/recipes-extended/gzip/gzip_1.3.12.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ SRC_URI = "${GNU_MIRROR}/gzip/gzip-${PV}.tar.gz \ file://m4-extensions-fix.patch \ + file://fix-shell.patch \ file://dup-def-fix.patch" SRC_URI[md5sum] = "b5bac2d21840ae077e0217bc5e4845b1" diff --git a/external/meta-gplv2/recipes-extended/mc/mc/0001-Fix-builds-wit-the-gettext-0.20.patch b/external/meta-gplv2/recipes-extended/mc/mc/0001-Fix-builds-wit-the-gettext-0.20.patch new file mode 100644 index 00000000..dbf18cab --- /dev/null +++ b/external/meta-gplv2/recipes-extended/mc/mc/0001-Fix-builds-wit-the-gettext-0.20.patch @@ -0,0 +1,52 @@ +From 56aef108be94019c7828c14f0c4849336f811847 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 17 Dec 2019 16:34:06 +0100 +Subject: [PATCH] Fix builds wit the gettext 0.20 + +Upstream-Status: Inappropriate [fixing an old version] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Makefile.am | 2 +- + configure.ac | 2 +- + src/Makefile.am | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index ab4f9b7..b27ab4a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to create Makefile.in. + AUTOMAKE_OPTIONS = 1.5 + +-SUBDIRS = intl po lib src doc contrib misc ++SUBDIRS = po lib src doc contrib misc + + EXTRA_DIST = + +diff --git a/configure.ac b/configure.ac +index c05902d..0430714 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -88,7 +88,7 @@ fi + dnl + dnl Internationalization + dnl +-AM_GNU_GETTEXT(no-libtool, need-ngettext) ++AM_GNU_GETTEXT([external],no-libtool, need-ngettext) + AM_GNU_GETTEXT_VERSION(0.14.3) + + if test "x$USE_INCLUDED_LIBINTL" = xyes; then +diff --git a/src/Makefile.am b/src/Makefile.am +index 2da86c3..1859f0d 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -52,7 +52,7 @@ else + mc_LDADD += $(GLIB_LIBS) + endif + +-mc_LDADD += $(PCRE_LIBS) $(LIBICONV) $(INTLLIBS) ++mc_LDADD += $(PCRE_LIBS) $(INTLLIBS) + + SRC_mc_conssaver = \ + cons.handler.c consaver/cons.saver.h diff --git a/external/meta-gplv2/recipes-extended/mc/mc_4.7.5.2.bb b/external/meta-gplv2/recipes-extended/mc/mc_4.7.5.2.bb index ca849663..5f56641b 100644 --- a/external/meta-gplv2/recipes-extended/mc/mc_4.7.5.2.bb +++ b/external/meta-gplv2/recipes-extended/mc/mc_4.7.5.2.bb @@ -11,6 +11,7 @@ PR = "r3" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ file://mc-CTRL.patch \ file://0001-disable-Ctrl-g-key-and-Ctrl-key.patch \ + file://0001-Fix-builds-wit-the-gettext-0.20.patch \ " SRC_URI[md5sum] = "bdae966244496cd4f6d282d80c9cf3c6" @@ -22,10 +23,12 @@ EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --without- do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* - sed -i -e '1s,#!.*python,#!${bindir}/env python,' ${D}${libexecdir}/mc/extfs.d/* + # These use python2 which is no longer supported + rm ${D}${libexecdir}/mc/extfs.d/s3+ + rm ${D}${libexecdir}/mc/extfs.d/uc1541 } -PACKAGES =+ "${BPN}-helpers-perl ${BPN}-helpers-python ${BPN}-helpers ${BPN}-fish" +PACKAGES =+ "${BPN}-helpers-perl ${BPN}-helpers ${BPN}-fish" SUMMARY_${BPN}-helpers-perl = "Midnight Commander Perl-based helper scripts" FILES_${BPN}-helpers-perl = "${libexecdir}/mc/extfs.d/a+ ${libexecdir}/mc/extfs.d/apt+ \ @@ -36,10 +39,6 @@ FILES_${BPN}-helpers-perl = "${libexecdir}/mc/extfs.d/a+ ${libexecdir}/mc/extfs. ${libexecdir}/mc/extfs.d/uzip" RDEPENDS_${BPN}-helpers-perl = "perl" -SUMMARY_${BPN}-helpers-python = "Midnight Commander Python-based helper scripts" -FILES_${BPN}-helpers-python = "${libexecdir}/mc/extfs.d/s3+ ${libexecdir}/mc/extfs.d/uc1541" -RDEPENDS_${BPN}-helpers-python = "python" - SUMMARY_${BPN}-helpers = "Midnight Commander shell helper scripts" FILES_${BPN}-helpers = "${libexecdir}/mc/extfs.d/* ${libexecdir}/mc/ext.d/*" diff --git a/external/meta-gplv2/recipes-extended/sed/sed-4.1.2/0001-Fix-builds-with-gettext-0.20.patch b/external/meta-gplv2/recipes-extended/sed/sed-4.1.2/0001-Fix-builds-with-gettext-0.20.patch new file mode 100644 index 00000000..e366b5aa --- /dev/null +++ b/external/meta-gplv2/recipes-extended/sed/sed-4.1.2/0001-Fix-builds-with-gettext-0.20.patch @@ -0,0 +1,38 @@ +From 2792bccbfd41427a79edd462906aba78144b8c6a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 17 Dec 2019 16:40:58 +0100 +Subject: [PATCH] Fix builds with gettext 0.20 + +Upstream-Status: Inappropriate [fixing an old version] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Makefile.am | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index f0aaa7f..1ebc805 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I config + + PACKAGE = sed + +-SUBDIRS = intl lib po sed doc testsuite ++SUBDIRS = lib po sed testsuite + + noinst_DATA = bootstrap.sh + noinst_HEADERS = basicdefs.h +diff --git a/configure.ac b/configure.ac +index e08c9a3..df20044 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -130,7 +130,7 @@ AM_CONDITIONAL(TEXI2HTML_HTML, test "x$enable_html" = xtexi2html) + + ALL_LINGUAS="af ca cs da de el eo es et fi fr ga gl he hr hu id it ja ko nl pl pt_BR ro ru sk sl sr sv tr zh_CN" + AM_GNU_GETTEXT_VERSION(0.11) +-AM_GNU_GETTEXT(, need-ngettext) ++AM_GNU_GETTEXT([external], need-ngettext) + + AC_CONFIG_FILES([bootstrap.sh], chmod +x bootstrap.sh) + AC_CONFIG_FILES([Makefile doc/Makefile \ diff --git a/external/meta-gplv2/recipes-extended/sed/sed_4.1.2.bb b/external/meta-gplv2/recipes-extended/sed/sed_4.1.2.bb index 40e3a53c..4a584426 100644 --- a/external/meta-gplv2/recipes-extended/sed/sed_4.1.2.bb +++ b/external/meta-gplv2/recipes-extended/sed/sed_4.1.2.bb @@ -9,7 +9,9 @@ PR = "r7" SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz \ file://fix_return_type.patch \ file://sed-4.1.2_fix_for_automake-1.12.patch \ - file://Makevars" + file://Makevars \ + file://0001-Fix-builds-with-gettext-0.20.patch \ + " SRC_URI[md5sum] = "928f0e06422f414091917401f1a834d0" SRC_URI[sha256sum] = "638e837ba765d5da0a30c98b57c2953cecea96827882f594612acace93ceeeab" diff --git a/external/meta-gplv2/recipes-extended/tar/tar/0001-lib-argp-parse.c-Fix-compiler-error.patch b/external/meta-gplv2/recipes-extended/tar/tar/0001-lib-argp-parse.c-Fix-compiler-error.patch new file mode 100644 index 00000000..001d2b68 --- /dev/null +++ b/external/meta-gplv2/recipes-extended/tar/tar/0001-lib-argp-parse.c-Fix-compiler-error.patch @@ -0,0 +1,35 @@ +From 153c0aab9e2a4a97b1a2c6b530594cd9a211e9ec Mon Sep 17 00:00:00 2001 +From: Joakim Roubert <joakimr@axis.com> +Date: Thu, 6 Dec 2018 10:33:14 +0100 +Subject: [PATCH] lib/argp-parse.c: Fix compiler error + +This avoids the following error: + + lib/argp-parse.c: In function 'argp_version_parser': + lib/argp-parse.c:158:2: error: format not a string literal and no + format arguments [-Werror=format-security] + __argp_error (state, dgettext (state->root_argp->argp_domain, + ^~~~~~~~~~~~ + +Upstream-Status: Inappropriate [old version] +Signed-off-by: Joakim Roubert <joakim.roubert@axis.com> +--- + lib/argp-parse.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/argp-parse.c b/lib/argp-parse.c +index a7de729..09511ba 100644 +--- a/lib/argp-parse.c ++++ b/lib/argp-parse.c +@@ -155,7 +155,7 @@ argp_version_parser (int key, char *arg, struct argp_state *state) + else if (argp_program_version) + fprintf (state->out_stream, "%s\n", argp_program_version); + else +- __argp_error (state, dgettext (state->root_argp->argp_domain, ++ __argp_error (state, "%s", dgettext (state->root_argp->argp_domain, + "(PROGRAM ERROR) No version known!?")); + if (! (state->flags & ARGP_NO_EXIT)) + exit (0); +-- +2.11.0 + diff --git a/external/meta-gplv2/recipes-extended/tar/tar_1.17.bb b/external/meta-gplv2/recipes-extended/tar/tar_1.17.bb index b9ca2063..1ee5e342 100644 --- a/external/meta-gplv2/recipes-extended/tar/tar_1.17.bb +++ b/external/meta-gplv2/recipes-extended/tar/tar_1.17.bb @@ -8,6 +8,7 @@ PR = "r3" SRC_URI += "file://m4extensions.patch \ file://gcc43build.patch \ file://avoid_heap_overflow.patch \ + file://0001-lib-argp-parse.c-Fix-compiler-error.patch \ " SRC_URI[md5sum] = "c6c4f1c075dbf0f75c29737faa58f290" diff --git a/external/meta-gplv2/recipes-support/gnupg/gnupg-1.4.7/0001-Make-it-build-with-gettext-0.20.patch b/external/meta-gplv2/recipes-support/gnupg/gnupg-1.4.7/0001-Make-it-build-with-gettext-0.20.patch new file mode 100644 index 00000000..a8eddbe7 --- /dev/null +++ b/external/meta-gplv2/recipes-support/gnupg/gnupg-1.4.7/0001-Make-it-build-with-gettext-0.20.patch @@ -0,0 +1,80 @@ +From 26076b28b79f6a2f2989a301ad7474cfa1153ebd Mon Sep 17 00:00:00 2001 +From: Peter Kjellerstedt <pkj@axis.com> +Date: Tue, 7 Jan 2020 11:08:39 +0100 +Subject: [PATCH] Make it build with gettext 0.20 + +Upstream-Status: Inappropriate [legacy version] +Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> +--- + Makefile.am | 2 +- + configure.ac | 2 +- + g10/Makefile.am | 2 +- + keyserver/Makefile.am | 2 +- + tools/Makefile.am | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 3423e70..1eebbc2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -28,7 +28,7 @@ else + checks = checks + endif + +-SUBDIRS = m4 intl zlib util mpi cipher tools g10 keyserver po doc ${checks} ++SUBDIRS = m4 zlib util mpi cipher tools g10 keyserver po doc ${checks} + EXTRA_DIST = scripts/config.rpath PROJECTS BUGS config.h.in autogen.sh + DISTCLEANFILES = + +diff --git a/configure.ac b/configure.ac +index 9f64b75..d9e5f69 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -813,7 +813,7 @@ dnl Checks for libraries. + + AM_GNU_GETTEXT_VERSION(0.14.1) + if test "$try_gettext" = yes; then +- AM_GNU_GETTEXT(,[need-ngettext]) ++ AM_GNU_GETTEXT([external],[need-ngettext]) + + # gettext requires some extra checks. These really should be part of + # the basic AM_GNU_GETTEXT macro. TODO: move other gettext-specific +diff --git a/g10/Makefile.am b/g10/Makefile.am +index 74a8db1..ff51b7f 100644 +--- a/g10/Makefile.am ++++ b/g10/Makefile.am +@@ -32,7 +32,7 @@ AM_CPPFLAGS += -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\"" + endif + + needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a +-other_libs = $(LIBICONV) $(DNSLIBS) $(LIBINTL) $(CAPLIBS) ++other_libs = $(DNSLIBS) $(LIBINTL) $(CAPLIBS) + + bin_PROGRAMS = gpg gpgv + dist_pkgdata_DATA = options.skel +diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am +index 3379910..3527c60 100644 +--- a/keyserver/Makefile.am ++++ b/keyserver/Makefile.am +@@ -33,7 +33,7 @@ gpgkeys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h + gpgkeys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h + gpgkeys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h + +-other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) ++other_libs = $(LIBINTL) $(CAPLIBS) + + gpgkeys_ldap_CPPFLAGS = @LDAP_CPPFLAGS@ + gpgkeys_ldap_LDADD = ../util/libcompat.a @LDAPLIBS@ @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 8a9c035..22cdb1e 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -28,7 +28,7 @@ AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\"" + endif + + needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a +-other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) ++other_libs = $(LIBINTL) $(CAPLIBS) + + + bin_PROGRAMS = gpgsplit diff --git a/external/meta-gplv2/recipes-support/gnupg/gnupg_1.4.7.bb b/external/meta-gplv2/recipes-support/gnupg/gnupg_1.4.7.bb index 85636ab8..6a950fdd 100644 --- a/external/meta-gplv2/recipes-support/gnupg/gnupg_1.4.7.bb +++ b/external/meta-gplv2/recipes-support/gnupg/gnupg_1.4.7.bb @@ -19,7 +19,8 @@ SRC_URI = "${GNUPG_MIRROR}/gnupg/gnupg-${PV}.tar.bz2 \ file://CVE-2013-4576.patch \ file://CVE-2013-4242.patch \ file://fix-ustar-check-issue.patch \ - " + file://0001-Make-it-build-with-gettext-0.20.patch \ + " SRC_URI[md5sum] = "b06a141cca5cd1a55bbdd25ab833303c" SRC_URI[sha256sum] = "69d18b7d193f62ca27ed4febcb4c9044aa0c95305d3258fe902e2fae5fc6468d" @@ -84,6 +85,7 @@ EXTRA_OECONF = "--disable-ldap \ " # Force gcc's traditional handling of inline to avoid issues with gcc 5 +BUILD_CFLAGS += "-fgnu89-inline" CFLAGS += "-fgnu89-inline" do_install () { @@ -95,6 +97,8 @@ do_install () { # split out gpgv from main package RDEPENDS_${PN} = "gpgv" +RDEPENDS_${PN}_class-native = "" + PACKAGES =+ "gpgv" FILES_gpgv = "${bindir}/gpgv" @@ -104,3 +108,5 @@ FILES_${PN} = "${bindir}/* ${datadir}/${BPN} ${libexecdir}/${BPN}/*" PACKAGECONFIG ??= "" PACKAGECONFIG[curl] = "--with-libcurl=${STAGING_LIBDIR},--without-libcurl,curl" PACKAGECONFIG[libusb] = "--with-libusb=${STAGING_LIBDIR},--without-libusb,libusb-compat" + +BBCLASSEXTEND += "native" diff --git a/external/meta-gplv2/recipes-support/shared-mime-info/shared-mime-info.inc b/external/meta-gplv2/recipes-support/shared-mime-info/shared-mime-info.inc new file mode 100644 index 00000000..2614d3ad --- /dev/null +++ b/external/meta-gplv2/recipes-support/shared-mime-info/shared-mime-info.inc @@ -0,0 +1,37 @@ +SUMMARY = "Shared MIME type database and specification" +HOMEPAGE = "http://freedesktop.org/wiki/Software/shared-mime-info" +SECTION = "base" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native" + +SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.xz" + +inherit autotools pkgconfig gettext mime + +EXTRA_OECONF = "--disable-update-mimedb" + +FILES_${PN} += "${datadir}/mime" +FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc" + +# freedesktop.org.xml is only required when updating the mime database, +# package it separately +PACKAGES =+ "shared-mime-info-data" +FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml" +RDEPENDS_shared-mime-info-data = "shared-mime-info" + +do_install () { + autotools_do_install + + update-mime-database ${D}${datadir}/mime +} + +do_install_class-native () { + autotools_do_install + + ${B}/update-mime-database ${D}${datadir}/mime +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/external/meta-gplv2/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/external/meta-gplv2/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch new file mode 100644 index 00000000..262ff756 --- /dev/null +++ b/external/meta-gplv2/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch @@ -0,0 +1,25 @@ +fix shared-mime-info build race condition + +The definition of install-data-hook in Makefile.am leads +to multiple, overlapping, executions of install-binPROGRAMS +target. We modify the definition to avoid that. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater <jslater@windriver.com> + +Index: shared-mime-info-1.9/Makefile.am +=================================================================== +--- shared-mime-info-1.9.orig/Makefile.am ++++ shared-mime-info-1.9/Makefile.am +@@ -50,7 +50,9 @@ else + update_mime_database="$(top_builddir)/update-mime-database$(EXEEXT)" + endif + +-install-data-hook: install-binPROGRAMS ++# do NOT make this dependent on anything! ++# ++install-data-hook: + if ENABLE_UPDATE_MIMEDB + $(update_mime_database) -V "$(DESTDIR)$(datadir)/mime" + endif diff --git a/external/meta-gplv2/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/external/meta-gplv2/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch new file mode 100644 index 00000000..fea34a55 --- /dev/null +++ b/external/meta-gplv2/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch @@ -0,0 +1,33 @@ +The Makefile used by shared-mime-info is one big race with the SUBDIRS +option and the dependency specifically calling make all combining to +create multiple make instances all of which may try and build targets +like update-mime-database. + +This patch removes those options meaning make can correctly identify +dependencies and stop itself racing itself. + +RP 10/10/2011 + +Upstream-Status: Pending +Signed-off-by: Constantin Musca <constantinx.musca@intel.com> + +Index: shared-mime-info-1.9/Makefile.am +=================================================================== +--- shared-mime-info-1.9.orig/Makefile.am ++++ shared-mime-info-1.9/Makefile.am +@@ -1,5 +1,3 @@ +-SUBDIRS=. po +- + AM_CPPFLAGS = $(ALL_CFLAGS) + + packagesdir = $(datadir)/mime/packages +@@ -81,8 +79,7 @@ endif + + all: $(defaultmakedeps) + +-create-pot: +- $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot ++create-pot: po + + local-test: create-pot freedesktop.org.xml update-mime-database$(EXEEXT) + if CROSS_COMPILING diff --git a/external/meta-gplv2/recipes-support/shared-mime-info/shared-mime-info_1.10.bb b/external/meta-gplv2/recipes-support/shared-mime-info/shared-mime-info_1.10.bb new file mode 100644 index 00000000..9fc210b7 --- /dev/null +++ b/external/meta-gplv2/recipes-support/shared-mime-info/shared-mime-info_1.10.bb @@ -0,0 +1,7 @@ +require shared-mime-info.inc + +SRC_URI += "file://parallelmake.patch \ + file://install-data-hook.patch" + +SRC_URI[md5sum] = "418c2ced9dc4dd5ca8b06a755e6d64e9" +SRC_URI[sha256sum] = "c625a83b4838befc8cafcd54e3619946515d9e44d63d61c4adf7f5513ddfbebf" |