[PATCH 1/9] psmisc: improve autopoint-enabling

[PATCH 1/9] psmisc: improve autopoint-enabling

[Ross Burton]

Instead of globally clearing EXTRA_AUTORECONF (which by default currently
contains --exclude=autopoint) use _remove to selectively remove the piece we
care about.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-extended/psmisc/psmisc.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc
index 527a1d590f3..82ef947709a 100644
--- a/meta/recipes-extended/psmisc/psmisc.inc
+++ b/meta/recipes-extended/psmisc/psmisc.inc
@@ -18,8 +18,8 @@ inherit autotools gettext
 
 # Upstream has a custom autogen.sh which invokes po/update-potfiles as they 
 # don't ship a po/POTFILES.in (which is silly).  Without that file gettext 
-#doesn't believe po/ is a gettext directory and won't generate po/Makefile.
-EXTRA_AUTORECONF=""
+# doesn't believe po/ is a gettext directory and won't generate po/Makefile.
+EXTRA_AUTORECONF_remove = "--exclude=autopoint"
 do_configure_prepend() {
     ( cd ${S} && po/update-potfiles )
 }
-- 
2.11.0

[PATCH 2/9] bison: remove obsolete patch

[Ross Burton]

m4.patch was added before 2005 (history isn't in git, only BitKeeper) and
doesn't appear to be needed anymore.

Also add a comment to clarify why acpaths is required.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-devtools/bison/bison/m4.patch | 414 -----------------------------
 meta/recipes-devtools/bison/bison_3.0.4.bb |   3 +-
 2 files changed, 2 insertions(+), 415 deletions(-)
 delete mode 100644 meta/recipes-devtools/bison/bison/m4.patch

diff --git a/meta/recipes-devtools/bison/bison/m4.patch b/meta/recipes-devtools/bison/bison/m4.patch
deleted file mode 100644
index d139da5e790..00000000000
--- a/meta/recipes-devtools/bison/bison/m4.patch
+++ /dev/null
@@ -1,414 +0,0 @@
-Upstream-Status: Pending
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
-Index: bison-2.4.2/m4/lcmessage.m4
-===================================================================
---- /dev/null
-+++ bison-2.4.2/m4/lcmessage.m4
-@@ -0,0 +1,32 @@
-+# lcmessage.m4 serial 3 (gettext-0.11.3)
-+dnl Copyright (C) 1995-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.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-+
-+dnl Authors:
-+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
-+
-+# Check whether LC_MESSAGES is available in <locale.h>.
-+
-+AC_DEFUN([AM_LC_MESSAGES],
-+[
-+  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-+    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-+  if test $am_cv_val_LC_MESSAGES = yes; then
-+    AC_DEFINE(HAVE_LC_MESSAGES, 1,
-+      [Define if your <locale.h> file defines LC_MESSAGES.])
-+  fi
-+])
-Index: bison-2.4.2/m4/uintmax_t.m4
-===================================================================
---- /dev/null
-+++ bison-2.4.2/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.
-+
-+dnl From Paul Eggert.
-+
-+AC_PREREQ(2.13)
-+
-+# Define uintmax_t to `unsigned long' or `unsigned long long'
-+# if <inttypes.h> does not exist.
-+
-+AC_DEFUN([jm_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_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.])
-+  fi
-+])
-Index: bison-2.4.2/m4/ulonglong.m4
-===================================================================
---- /dev/null
-+++ bison-2.4.2/m4/ulonglong.m4
-@@ -0,0 +1,23 @@
-+# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
-+dnl Copyright (C) 1999-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.
-+
-+dnl From Paul Eggert.
-+
-+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
-+[
-+  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
-+  [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
-+    [unsigned long long ullmax = (unsigned long long) -1;
-+     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
-+    ac_cv_type_unsigned_long_long=yes,
-+    ac_cv_type_unsigned_long_long=no)])
-+  if test $ac_cv_type_unsigned_long_long = yes; then
-+    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
-+      [Define if you have the unsigned long long type.])
-+  fi
-+])
-Index: bison-2.4.2/m4/intdiv0.m4
-===================================================================
---- /dev/null
-+++ bison-2.4.2/m4/intdiv0.m4
-@@ -0,0 +1,72 @@
-+# intdiv0.m4 serial 1 (gettext-0.11.3)
-+dnl Copyright (C) 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.
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([gt_INTDIV0],
-+[
-+  AC_REQUIRE([AC_PROG_CC])dnl
-+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+
-+  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
-+    gt_cv_int_divbyzero_sigfpe,
-+    [
-+      AC_TRY_RUN([
-+#include <stdlib.h>
-+#include <signal.h>
-+
-+static void
-+#ifdef __cplusplus
-+sigfpe_handler (int sig)
-+#else
-+sigfpe_handler (sig) int sig;
-+#endif
-+{
-+  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-+  exit (sig != SIGFPE);
-+}
-+
-+int x = 1;
-+int y = 0;
-+int z;
-+int nan;
-+
-+int main ()
-+{
-+  signal (SIGFPE, sigfpe_handler);
-+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
-+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-+  signal (SIGTRAP, sigfpe_handler);
-+#endif
-+/* Linux/SPARC yields signal SIGILL.  */
-+#if defined (__sparc__) && defined (__linux__)
-+  signal (SIGILL, sigfpe_handler);
-+#endif
-+
-+  z = x / y;
-+  nan = y / y;
-+  exit (1);
-+}
-+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
-+        [
-+          # Guess based on the CPU.
-+          case "$host_cpu" in
-+            alpha* | i[34567]86 | m68k | s390*)
-+              gt_cv_int_divbyzero_sigfpe="guessing yes";;
-+            *)
-+              gt_cv_int_divbyzero_sigfpe="guessing no";;
-+          esac
-+        ])
-+    ])
-+  case "$gt_cv_int_divbyzero_sigfpe" in
-+    *yes) value=1;;
-+    *) value=0;;
-+  esac
-+  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
-+    [Define if integer division by zero raises signal SIGFPE.])
-+])
-Index: bison-2.4.2/m4/glib.m4
-===================================================================
---- /dev/null
-+++ bison-2.4.2/m4/glib.m4
-@@ -0,0 +1,196 @@
-+# Configure paths for GLIB
-+# Owen Taylor     97-11-3
-+
-+dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
-+dnl gthread is specified in MODULES, pass to glib-config
-+dnl
-+AC_DEFUN(AM_PATH_GLIB,
-+[dnl 
-+dnl Get the cflags and libraries from the glib-config script
-+dnl
-+AC_ARG_WITH(glib-prefix,[  --with-glib-prefix=PFX   Prefix where GLIB is installed (optional)],
-+            glib_config_prefix="$withval", glib_config_prefix="")
-+AC_ARG_WITH(glib-exec-prefix,[  --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
-+            glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
-+AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and run a test GLIB program],
-+		    , enable_glibtest=yes)
-+
-+  if test x$glib_config_exec_prefix != x ; then
-+     glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
-+     if test x${GLIB_CONFIG+set} != xset ; then
-+        GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
-+     fi
-+  fi
-+  if test x$glib_config_prefix != x ; then
-+     glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
-+     if test x${GLIB_CONFIG+set} != xset ; then
-+        GLIB_CONFIG=$glib_config_prefix/bin/glib-config
-+     fi
-+  fi
-+
-+  for module in . $4
-+  do
-+      case "$module" in
-+         gmodule) 
-+             glib_config_args="$glib_config_args gmodule"
-+         ;;
-+         gthread) 
-+             glib_config_args="$glib_config_args gthread"
-+         ;;
-+      esac
-+  done
-+
-+  AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
-+  min_glib_version=ifelse([$1], ,0.99.7,$1)
-+  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-+  no_glib=""
-+  if test "$GLIB_CONFIG" = "no" ; then
-+    no_glib=yes
-+  else
-+    GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-+    GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-+    glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+    glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+    glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+    if test "x$enable_glibtest" = "xyes" ; then
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+      LIBS="$GLIB_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-+dnl checks the results of glib-config to some extent
-+dnl
-+      rm -f conf.glibtest
-+      AC_TRY_RUN([
-+#include <glib.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+int 
-+main ()
-+{
-+  int major, minor, micro;
-+  char *tmp_version;
-+
-+  system ("touch conf.glibtest");
-+
-+  /* HP/UX 9 (%@#!) writes to sscanf strings */
-+  tmp_version = g_strdup("$min_glib_version");
-+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+     printf("%s, bad version string\n", "$min_glib_version");
-+     exit(1);
-+   }
-+
-+  if ((glib_major_version != $glib_config_major_version) ||
-+      (glib_minor_version != $glib_config_minor_version) ||
-+      (glib_micro_version != $glib_config_micro_version))
-+    {
-+      printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-+             glib_major_version, glib_minor_version, glib_micro_version);
-+      printf ("*** was found! If glib-config was correct, then it is best\n");
-+      printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
-+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+      printf("*** required on your system.\n");
-+      printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
-+      printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
-+      printf("*** before re-running configure\n");
-+    } 
-+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-+           (glib_micro_version != GLIB_MICRO_VERSION))
-+    {
-+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-+      printf("*** library (version %d.%d.%d)\n",
-+	     glib_major_version, glib_minor_version, glib_micro_version);
-+    }
-+  else
-+    {
-+      if ((glib_major_version > major) ||
-+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-+      {
-+        return 0;
-+       }
-+     else
-+      {
-+        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-+               glib_major_version, glib_minor_version, glib_micro_version);
-+        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-+	       major, minor, micro);
-+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-+        printf("***\n");
-+        printf("*** If you have already installed a sufficiently new version, this error\n");
-+        printf("*** probably means that the wrong copy of the glib-config shell script is\n");
-+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+        printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
-+        printf("*** correct copy of glib-config. (In this case, you will have to\n");
-+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+        printf("*** so that the correct libraries are found at run-time))\n");
-+      }
-+    }
-+  return 1;
-+}
-+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+     fi
-+  fi
-+  if test "x$no_glib" = x ; then
-+     AC_MSG_RESULT(yes)
-+     ifelse([$2], , :, [$2])     
-+  else
-+     AC_MSG_RESULT(no)
-+     if test "$GLIB_CONFIG" = "no" ; then
-+       echo "*** The glib-config script installed by GLIB could not be found"
-+       echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
-+       echo "*** your path, or set the GLIB_CONFIG environment variable to the"
-+       echo "*** full path to glib-config."
-+     else
-+       if test -f conf.glibtest ; then
-+        :
-+       else
-+          echo "*** Could not run GLIB test program, checking why..."
-+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+          LIBS="$LIBS $GLIB_LIBS"
-+          AC_TRY_LINK([
-+#include <glib.h>
-+#include <stdio.h>
-+],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-+        [ echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system"
-+	  echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-+          echo "***"
-+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-+          echo "*** came with the system with the command"
-+          echo "***"
-+          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
-+          echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
-+          echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+       fi
-+     fi
-+     GLIB_CFLAGS=""
-+     GLIB_LIBS=""
-+     ifelse([$3], , :, [$3])
-+  fi
-+  AC_SUBST(GLIB_CFLAGS)
-+  AC_SUBST(GLIB_LIBS)
-+  rm -f conf.glibtest
-+])
-Index: bison-2.4.2/m4/isc-posix.m4
-===================================================================
---- /dev/null
-+++ bison-2.4.2/m4/isc-posix.m4
-@@ -0,0 +1,26 @@
-+# isc-posix.m4 serial 2 (gettext-0.11.2)
-+dnl Copyright (C) 1995-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.
-+
-+# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
-+
-+# This test replaces the one in autoconf.
-+# Currently this macro should have the same name as the autoconf macro
-+# because gettext's gettext.m4 (distributed in the automake package)
-+# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-+# give these diagnostics:
-+#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-+#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-+
-+undefine([AC_ISC_POSIX])
-+
-+AC_DEFUN([AC_ISC_POSIX],
-+  [
-+    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-+    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-+  ]
-+)
diff --git a/meta/recipes-devtools/bison/bison_3.0.4.bb b/meta/recipes-devtools/bison/bison_3.0.4.bb
index 7d066be0adf..e5ac5672f86 100644
--- a/meta/recipes-devtools/bison/bison_3.0.4.bb
+++ b/meta/recipes-devtools/bison/bison_3.0.4.bb
@@ -10,7 +10,6 @@ SECTION = "devel"
 DEPENDS = "bison-native flex-native"
 
 SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
-           file://m4.patch \
            file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
            file://dont-depend-on-help2man.patch.patch \
            file://0001-src-local.mk-fix-parallel-issue.patch \
@@ -26,6 +25,8 @@ SRC_URI[sha256sum] = "a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0
 DEPENDS_class-native = "gettext-minimal-native"
 
 inherit autotools gettext texinfo
+
+# The automatic m4 path detection gets confused, so force the right value
 acpaths = "-I ${S}/m4"
 
 do_compile_prepend() {
-- 
2.11.0

[PATCH 3/9] bison: remove pointless gettext-minimal-native DEPENDS

[Ross Burton]

In native builds USE_NLS is set to 'no' so the gettext class will handle adding
gettext-minimal-native to DEPENDS.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-devtools/bison/bison_3.0.4.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-devtools/bison/bison_3.0.4.bb b/meta/recipes-devtools/bison/bison_3.0.4.bb
index e5ac5672f86..58728f5021f 100644
--- a/meta/recipes-devtools/bison/bison_3.0.4.bb
+++ b/meta/recipes-devtools/bison/bison_3.0.4.bb
@@ -22,8 +22,6 @@ EXTRA_OECONF += "M4=m4"
 SRC_URI[md5sum] = "c342201de104cc9ce0a21e0ad10d4021"
 SRC_URI[sha256sum] = "a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1"
 
-DEPENDS_class-native = "gettext-minimal-native"
-
 inherit autotools gettext texinfo
 
 # The automatic m4 path detection gets confused, so force the right value
-- 
2.11.0

[PATCH 4/9] pango: don't wipe EXTRA_AUTORECONF

[Ross Burton]

This was added in 2007 to solve unspecified build errors, but the autotools
support has improved a lot since then and nothing breaks with it removed.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/pango/pango_1.40.12.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-graphics/pango/pango_1.40.12.bb b/meta/recipes-graphics/pango/pango_1.40.12.bb
index 951afbe991c..cbad9a9a28a 100644
--- a/meta/recipes-graphics/pango/pango_1.40.12.bb
+++ b/meta/recipes-graphics/pango/pango_1.40.12.bb
@@ -25,8 +25,6 @@ DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo h
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
 PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft"
 
-EXTRA_AUTORECONF = ""
-
 EXTRA_OECONF = " \
 	        --disable-debug \
 	        "
-- 
2.11.0

[PATCH 5/9] native/cross: remove redundant DEPENDS_GETTEXT assignment

[Ross Burton]

DEPENDS_GETTEXT defaults to gettext-native, so there's no need to set it again
in these classes.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/cross.bbclass  | 2 --
 meta/classes/native.bbclass | 2 --
 2 files changed, 4 deletions(-)

diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index e9fafed7835..4e85cab2d19 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -41,8 +41,6 @@ LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}"
 
 TOOLCHAIN_OPTIONS = ""
 
-DEPENDS_GETTEXT = "gettext-native"
-
 # This class encodes staging paths into its scripts data so can only be
 # reused if we manipulate the paths.
 SSTATE_SCAN_CMD ?= "${SSTATE_SCAN_CMD_NATIVE}"
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 9c434dce83e..a911f2aebdb 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -52,8 +52,6 @@ STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}"
 # native pkg doesn't need the TOOLCHAIN_OPTIONS.
 TOOLCHAIN_OPTIONS = ""
 
-DEPENDS_GETTEXT = "gettext-native"
-
 # Don't build ptest natively
 PTEST_ENABLED = "0"
 
-- 
2.11.0

[PATCH 6/9] m4: merge two .inc files

[Ross Burton]

Now that oe-core only has one copy of m4, there's no need to maintain two inc
files.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-devtools/m4/m4-1.4.18.inc | 31 +++++++++++++++++++------------
 meta/recipes-devtools/m4/m4.inc        | 10 ----------
 2 files changed, 19 insertions(+), 22 deletions(-)
 delete mode 100644 meta/recipes-devtools/m4/m4.inc

diff --git a/meta/recipes-devtools/m4/m4-1.4.18.inc b/meta/recipes-devtools/m4/m4-1.4.18.inc
index d7c86485771..7790a88d759 100644
--- a/meta/recipes-devtools/m4/m4-1.4.18.inc
+++ b/meta/recipes-devtools/m4/m4-1.4.18.inc
@@ -1,22 +1,29 @@
-require m4.inc
+SUMMARY = "Traditional Unix macro processor"
+HOMEPAGE = "https://www.gnu.org/software/m4/m4.html"
+DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor.  It is mostly SVR4 \
+compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \
+GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."
 
-EXTRA_OECONF += "--without-libsigsegv-prefix"
+inherit autotools texinfo
+
+SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
+           file://ac_config_links.patch \
+           file://remove-gets.patch \
+           "
+
+SRC_URI_append_class-target = "file://0001-Unset-need_charset_alias-when-building-for-musl.patch"
+
+SRC_URI[md5sum] = "a077779db287adf4e12a035029002d28"
+SRC_URI[sha256sum] = "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab"
 
 LICENSE = "GPLv3"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
 	            file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede"
 
-SRC_URI += "file://ac_config_links.patch \
-            file://remove-gets.patch \
-           "
-
-SRC_URI_append_class-target = "\
-           file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
-	   "
-
 # Fix "Argument list too long" error when len(TMPDIR) = 410
 acpaths = "-I ./m4"
 
-SRC_URI[md5sum] = "a077779db287adf4e12a035029002d28"
-SRC_URI[sha256sum] = "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab"
+EXTRA_OECONF += "--without-libsigsegv-prefix"
+
+EXTRA_OEMAKE += "'infodir=${infodir}'"
diff --git a/meta/recipes-devtools/m4/m4.inc b/meta/recipes-devtools/m4/m4.inc
deleted file mode 100644
index 2002594e899..00000000000
--- a/meta/recipes-devtools/m4/m4.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SUMMARY = "Traditional Unix macro processor"
-HOMEPAGE = "https://www.gnu.org/software/m4/m4.html"
-DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor.  It is mostly SVR4 \
-compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \
-GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."
-
-inherit autotools texinfo
-
-EXTRA_OEMAKE += "'infodir=${infodir}'"
-SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
-- 
2.11.0

Re: [PATCH 6/9] m4: merge two .inc files

[Dan McGregor]

On 8 January 2018 at 10:00, Ross Burton <ross.burton@intel.com> wrote:
> Now that oe-core only has one copy of m4, there's no need to maintain two inc
> files.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-devtools/m4/m4-1.4.18.inc | 31 +++++++++++++++++++------------
>  meta/recipes-devtools/m4/m4.inc        | 10 ----------
>  2 files changed, 19 insertions(+), 22 deletions(-)
>  delete mode 100644 meta/recipes-devtools/m4/m4.inc
>
> diff --git a/meta/recipes-devtools/m4/m4-1.4.18.inc b/meta/recipes-devtools/m4/m4-1.4.18.inc
> index d7c86485771..7790a88d759 100644
> --- a/meta/recipes-devtools/m4/m4-1.4.18.inc
> +++ b/meta/recipes-devtools/m4/m4-1.4.18.inc
> @@ -1,22 +1,29 @@
> -require m4.inc
> +SUMMARY = "Traditional Unix macro processor"
> +HOMEPAGE = "https://www.gnu.org/software/m4/m4.html"
> +DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor.  It is mostly SVR4 \
> +compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \
> +GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."
>
> -EXTRA_OECONF += "--without-libsigsegv-prefix"
> +inherit autotools texinfo
> +
> +SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
> +           file://ac_config_links.patch \
> +           file://remove-gets.patch \
> +           "
> +
> +SRC_URI_append_class-target = "file://0001-Unset-need_charset_alias-when-building-for-musl.patch"

There's no space here, so it breaks with meta-clang enabled. It only
works right now as-is because SRC_URI ends with whitespace.

I think it should be:
SRC_URI_append_class-target = "
file://0001-Unset-need_charset_alias-when-building-for-musl.patch"

> +
> +SRC_URI[md5sum] = "a077779db287adf4e12a035029002d28"
> +SRC_URI[sha256sum] = "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab"
>
>  LICENSE = "GPLv3"
>
>  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
>                     file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede"
>
> -SRC_URI += "file://ac_config_links.patch \
> -            file://remove-gets.patch \
> -           "
> -
> -SRC_URI_append_class-target = "\
> -           file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
> -          "
> -
>  # Fix "Argument list too long" error when len(TMPDIR) = 410
>  acpaths = "-I ./m4"
>
> -SRC_URI[md5sum] = "a077779db287adf4e12a035029002d28"
> -SRC_URI[sha256sum] = "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab"
> +EXTRA_OECONF += "--without-libsigsegv-prefix"
> +
> +EXTRA_OEMAKE += "'infodir=${infodir}'"
> diff --git a/meta/recipes-devtools/m4/m4.inc b/meta/recipes-devtools/m4/m4.inc
> deleted file mode 100644
> index 2002594e899..00000000000
> --- a/meta/recipes-devtools/m4/m4.inc
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -SUMMARY = "Traditional Unix macro processor"
> -HOMEPAGE = "https://www.gnu.org/software/m4/m4.html"
> -DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor.  It is mostly SVR4 \
> -compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \
> -GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."
> -
> -inherit autotools texinfo
> -
> -EXTRA_OEMAKE += "'infodir=${infodir}'"
> -SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 6/9] m4: merge two .inc files

[Richard Purdie]

On Fri, 2018-01-12 at 11:30 -0600, Dan McGregor wrote:
> On 8 January 2018 at 10:00, Ross Burton <ross.burton@intel.com>
> wrote:
> > -EXTRA_OECONF += "--without-libsigsegv-prefix"
> > +inherit autotools texinfo
> > +
> > +SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
> > +           file://ac_config_links.patch \
> > +           file://remove-gets.patch \
> > +           "
> > +
> > +SRC_URI_append_class-target = "file://0001-Unset-
> > need_charset_alias-when-building-for-musl.patch"
> There's no space here, so it breaks with meta-clang enabled. It only
> works right now as-is because SRC_URI ends with whitespace.
> 
> I think it should be:
> SRC_URI_append_class-target = "
> file://0001-Unset-need_charset_alias-when-building-for-musl.patch"

I've pushed a tweak to fix that.

Cheers,

Richard

[PATCH 7/9] avahi: remove explicit avahi-dev RDEPENDS

[Ross Burton]

These were added to the avahi-dev package back in 2011 before avahi-ui existed
at all.  The problem of GTK+ being pulled in via avahi-dev was finally solved
with the avahi-ui split, so these explicit (and by being manually maintained,
incomplete) dependencies can be removed.

This also results in gettext-dev being removed from the dependency tree (the
gettext library API is provided by glibc/musl), which means that for a standard
image we don't need to build target gettext at all anymore.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-connectivity/avahi/avahi.inc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index ef655dec443..ec368de4f4a 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -109,11 +109,6 @@ RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPK
 RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns"
 RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns"
 
-RRECOMMENDS_avahi-dev = "expat-dev libcap-dev libdaemon-dev dbus-dev glib-2.0-dev update-rc.d-dev"
-RRECOMMENDS_avahi-dev_append_libc-glibc = " gettext-dev"
-
-RRECOMMENDS_avahi-dev[nodeprrecs] = "1"
-
 CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
 
 INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
-- 
2.11.0

Re: [PATCH 7/9] avahi: remove explicit avahi-dev RDEPENDS

[Alexander Kanavin]

On 01/08/2018 06:00 PM, Ross Burton wrote:

> -RRECOMMENDS_avahi-dev = "expat-dev libcap-dev libdaemon-dev dbus-dev glib-2.0-dev update-rc.d-dev"
> -RRECOMMENDS_avahi-dev_append_libc-glibc = " gettext-dev"
> -
> -RRECOMMENDS_avahi-dev[nodeprrecs] = "1"
> -

Cool, I was wondering about the necessity of this stuff.

Thanks for cleaning up, we can also perhaps look into splitting 
gettext-native recipe into a sane set of parts, and use them in a 
carefully targeted way, rather than the current -minimal-native 
approach, which is hackish.


Alex

Re: [PATCH 7/9] avahi: remove explicit avahi-dev RDEPENDS

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 737 bytes --]

On 9 January 2018 at 09:01, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:

> On 01/08/2018 06:00 PM, Ross Burton wrote:
>
> -RRECOMMENDS_avahi-dev = "expat-dev libcap-dev libdaemon-dev dbus-dev
>> glib-2.0-dev update-rc.d-dev"
>> -RRECOMMENDS_avahi-dev_append_libc-glibc = " gettext-dev"
>> -
>> -RRECOMMENDS_avahi-dev[nodeprrecs] = "1"
>> -
>>
>
> Cool, I was wondering about the necessity of this stuff.
>
> Thanks for cleaning up, we can also perhaps look into splitting
> gettext-native recipe into a sane set of parts, and use them in a carefully
> targeted way, rather than the current -minimal-native approach, which is
> hackish.
>

ross/gettext is slowly heading in that direction.

Ross

[-- Attachment #2: Type: text/html, Size: 1261 bytes --]

[PATCH 8/9] libcroco: enable nativesdk builds

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-support/libcroco/libcroco_0.6.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/libcroco/libcroco_0.6.12.bb b/meta/recipes-support/libcroco/libcroco_0.6.12.bb
index b0af75919b9..465ed15916f 100644
--- a/meta/recipes-support/libcroco/libcroco_0.6.12.bb
+++ b/meta/recipes-support/libcroco/libcroco_0.6.12.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
 
 SECTION = "x11/utils"
 DEPENDS = "glib-2.0 libxml2 zlib"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
 EXTRA_OECONF += "--enable-Bsymbolic=auto"
 
 BINCONFIG = "${bindir}/croco-0.6-config"
-- 
2.11.0

[PATCH 9/9] gettext: rationalise optional dependencies

[Ross Burton]

gettext has optional dependencies on libxml2, glib, libcroco and libunistring.
If they're not available then gettext will use internal copies, but it can also
use system libraries.

For gettext-native continue to use the internal copies to get this building
sooner rather than later, but for target use the system shared libraries.

Also gettext 0.19.7 onwards swapped expat for libxm2, so remove the build
dependency on expat.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-core/gettext/gettext_0.19.8.1.bb | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
index 46ea68ff5b5..25ff601a6be 100644
--- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
@@ -8,7 +8,7 @@ SECTION = "libs"
 LICENSE = "GPLv3+ & LGPL-2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-DEPENDS = "gettext-native virtual/libiconv expat"
+DEPENDS = "gettext-native virtual/libiconv"
 DEPENDS_class-native = "gettext-minimal-native"
 PROVIDES = "virtual/libintl virtual/gettext"
 PROVIDES_class-native = "virtual/gettext-native"
@@ -33,18 +33,22 @@ EXTRA_OECONF += "--without-lispdir \
                  --disable-native-java \
                  --disable-openmp \
                  --disable-acl \
-                 --with-included-glib \
                  --without-emacs \
                  --without-cvs \
                  --without-git \
-                 --with-included-libxml \
-                 --with-included-libcroco \
-                 --with-included-libunistring \
                 "
 EXTRA_OECONF_append_class-target = " \
                  --with-bisonlocaledir=${datadir}/locale \
 "
 
+PACKAGECONFIG ??= "croco glib libxml libunistring"
+PACKAGECONFIG_class-native = ""
+
+PACKAGECONFIG[croco] = "--without-included-libcroco,--with-included-libcroco,libcroco"
+PACKAGECONFIG[glib] = "--without-included-glib,--with-included-glib,glib-2.0"
+PACKAGECONFIG[libxml] = "--without-included-libxml,--with-included-libxml,libxml2"
+PACKAGECONFIG[libunistring] = "--without-included-libunistring,--with-included-libunistring,libunistring"
+
 acpaths = '-I ${S}/gettext-runtime/m4 \
            -I ${S}/gettext-tools/m4'
 
-- 
2.11.0

Re: [PATCH 9/9] gettext: rationalise optional dependencies

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 4964 bytes --]

--without-included-glib seems to cause configure to find glib from the host:

ERROR: This autoconf log indicates errors, it looked at host include and/or
library paths while determining system capabilities.

gettext/0.19.8.1-r0/build/gettext-tools/config.log:cc1: warning: include
location "/usr/include/glib-2.0" is unsafe for cross-compilation
[-Wpoison-system-directories]

I'm testing it with added --with-libglib-2.0-prefix to see if it fixes the
issue. I've added the same to other added PACKAGECONFIGs:
-PACKAGECONFIG[croco] =
"--without-included-libcroco,--with-included-libcroco,libcroco"
-PACKAGECONFIG[glib] =
"--without-included-glib,--with-included-glib,glib-2.0"
-PACKAGECONFIG[libxml] =
"--without-included-libxml,--with-included-libxml,libxml2"
-PACKAGECONFIG[libunistring] =
"--without-included-libunistring,--with-included-libunistring,libunistring"
+PACKAGECONFIG[croco] = "--with-libcroco-0.6-prefix=${STAGING_LIBDIR}/..
--without-included-libcroco,--with-included-libcroco,libcroco"
+PACKAGECONFIG[glib] = "--with-libglib-2.0-prefix=${STAGING_LIBDIR}/..
--without-included-glib,--with-included-glib,glib-2.0"
+PACKAGECONFIG[libxml] = "--with-libxml2-prefix=${STAGING_LIBDIR}/..
--without-included-libxml,--with-included-libxml,libxml2"
+PACKAGECONFIG[libunistring] =
"--with-libunistring-prefix=${STAGING_LIBDIR}/..
--without-included-libunistring,--with-included-libunistring,libunistring"

Not sure if it's worth adding other prefixes for curses related
PACKAGECONFIG
PACKAGECONFIG[msgcat-curses] =
"--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses,"

  --with-libncurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
DIR/lib
  --without-libncurses-prefix     don't search for PACKLIBS in includedir
and libdir
  --with-libxcurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
DIR/lib
  --without-libxcurses-prefix     don't search for PACKLIBS in includedir
and libdir
  --with-libcurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
DIR/lib
  --without-libcurses-prefix     don't search for PACKLIBS in includedir
and libdir



On Mon, Jan 8, 2018 at 5:00 PM, Ross Burton <ross.burton@intel.com> wrote:

> gettext has optional dependencies on libxml2, glib, libcroco and
> libunistring.
> If they're not available then gettext will use internal copies, but it can
> also
> use system libraries.
>
> For gettext-native continue to use the internal copies to get this building
> sooner rather than later, but for target use the system shared libraries.
>
> Also gettext 0.19.7 onwards swapped expat for libxm2, so remove the build
> dependency on expat.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-core/gettext/gettext_0.19.8.1.bb | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
> b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
> index 46ea68ff5b5..25ff601a6be 100644
> --- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
> +++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
> @@ -8,7 +8,7 @@ SECTION = "libs"
>  LICENSE = "GPLv3+ & LGPL-2.1+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>
> -DEPENDS = "gettext-native virtual/libiconv expat"
> +DEPENDS = "gettext-native virtual/libiconv"
>  DEPENDS_class-native = "gettext-minimal-native"
>  PROVIDES = "virtual/libintl virtual/gettext"
>  PROVIDES_class-native = "virtual/gettext-native"
> @@ -33,18 +33,22 @@ EXTRA_OECONF += "--without-lispdir \
>                   --disable-native-java \
>                   --disable-openmp \
>                   --disable-acl \
> -                 --with-included-glib \
>                   --without-emacs \
>                   --without-cvs \
>                   --without-git \
> -                 --with-included-libxml \
> -                 --with-included-libcroco \
> -                 --with-included-libunistring \
>                  "
>  EXTRA_OECONF_append_class-target = " \
>                   --with-bisonlocaledir=${datadir}/locale \
>  "
>
> +PACKAGECONFIG ??= "croco glib libxml libunistring"
> +PACKAGECONFIG_class-native = ""
> +
> +PACKAGECONFIG[croco] = "--without-included-libcroco,-
> -with-included-libcroco,libcroco"
> +PACKAGECONFIG[glib] = "--without-included-glib,--
> with-included-glib,glib-2.0"
> +PACKAGECONFIG[libxml] = "--without-included-libxml,--
> with-included-libxml,libxml2"
> +PACKAGECONFIG[libunistring] = "--without-included-
> libunistring,--with-included-libunistring,libunistring"
> +
>  acpaths = '-I ${S}/gettext-runtime/m4 \
>             -I ${S}/gettext-tools/m4'
>
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 6820 bytes --]

[PATCH] gettext: fix PACKAGECONFIGs

[Martin Jansa]

* add --with-*-prefix variables to prevent configure trying to search in host paths
* fixes:
  ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
  gettext/0.19.8.1-r0/build/gettext-tools/config.log:cc1: warning: include location /usr/include/glib-2.0 is unsafe for cross-compilation [-Wpoison-system-directories]

* not sure if it's worth adding other prefixes for curses related PACKAGECONFIG
  PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses,"

  --with-libncurses-prefix[=DIR]  search for PACKLIBS in DIR/include and DIR/lib
  --without-libncurses-prefix     don't search for PACKLIBS in includedir and libdir
  --with-libxcurses-prefix[=DIR]  search for PACKLIBS in DIR/include and DIR/lib
  --without-libxcurses-prefix     don't search for PACKLIBS in includedir and libdir
  --with-libcurses-prefix[=DIR]  search for PACKLIBS in DIR/include and DIR/lib
  --without-libcurses-prefix     don't search for PACKLIBS in includedir and libdir

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-core/gettext/gettext_0.19.8.1.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
index 97083c0da2..8a8a34cca8 100644
--- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
@@ -43,10 +43,10 @@ PACKAGECONFIG ??= "croco glib libxml libunistring"
 PACKAGECONFIG_class-native = ""
 PACKAGECONFIG_class-nativesdk = ""
 
-PACKAGECONFIG[croco] = "--without-included-libcroco,--with-included-libcroco,libcroco"
-PACKAGECONFIG[glib] = "--without-included-glib,--with-included-glib,glib-2.0"
-PACKAGECONFIG[libxml] = "--without-included-libxml,--with-included-libxml,libxml2"
-PACKAGECONFIG[libunistring] = "--without-included-libunistring,--with-included-libunistring,libunistring"
+PACKAGECONFIG[croco] = "--with-libcroco-0.6-prefix=${STAGING_LIBDIR}/.. --without-included-libcroco,--with-included-libcroco,libcroco"
+PACKAGECONFIG[glib] = "--with-libglib-2.0-prefix=${STAGING_LIBDIR}/.. --without-included-glib,--with-included-glib,glib-2.0"
+PACKAGECONFIG[libxml] = "--with-libxml2-prefix=${STAGING_LIBDIR}/.. --without-included-libxml,--with-included-libxml,libxml2"
+PACKAGECONFIG[libunistring] = "--with-libunistring-prefix=${STAGING_LIBDIR}/.. --without-included-libunistring,--with-included-libunistring,libunistring"
 PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses,"
 
 acpaths = '-I ${S}/gettext-runtime/m4 \
-- 
2.15.1

Re: [PATCH] gettext: fix PACKAGECONFIGs

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 3906 bytes --]

This is causing QA errors:

ERROR: gettext-0.19.8.1-r0 do_package_qa: QA Issue: gettext:
/work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-split/gettext/usr/lib/gettext/hostname
contains probably-redundant RPATH /usr/lib/../lib
gettext:
/work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-split/gettext/usr/lib/gettext/urlget
contains probably-redundant RPATH /usr/lib/../lib
gettext:
/work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-split/gettext/usr/lib/gettext/cldr-plurals
contains probably-redundant RPATH /usr/lib/../lib
gettext:
/work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-split/gettext/usr/bin/recode-sr-latin
contains probably-redundant RPATH /usr/lib/../lib [useless-rpaths]

Ross

On 22 January 2018 at 10:52, Martin Jansa <martin.jansa@gmail.com> wrote:

> * add --with-*-prefix variables to prevent configure trying to search in
> host paths
> * fixes:
>   ERROR: This autoconf log indicates errors, it looked at host include
> and/or library paths while determining system capabilities.
>   gettext/0.19.8.1-r0/build/gettext-tools/config.log:cc1: warning:
> include location /usr/include/glib-2.0 is unsafe for cross-compilation
> [-Wpoison-system-directories]
>
> * not sure if it's worth adding other prefixes for curses related
> PACKAGECONFIG
>   PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${
> STAGING_LIBDIR}/..,--disable-curses,ncurses,"
>
>   --with-libncurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
> DIR/lib
>   --without-libncurses-prefix     don't search for PACKLIBS in includedir
> and libdir
>   --with-libxcurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
> DIR/lib
>   --without-libxcurses-prefix     don't search for PACKLIBS in includedir
> and libdir
>   --with-libcurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
> DIR/lib
>   --without-libcurses-prefix     don't search for PACKLIBS in includedir
> and libdir
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-core/gettext/gettext_0.19.8.1.bb | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
> b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
> index 97083c0da2..8a8a34cca8 100644
> --- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
> +++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
> @@ -43,10 +43,10 @@ PACKAGECONFIG ??= "croco glib libxml libunistring"
>  PACKAGECONFIG_class-native = ""
>  PACKAGECONFIG_class-nativesdk = ""
>
> -PACKAGECONFIG[croco] = "--without-included-libcroco,-
> -with-included-libcroco,libcroco"
> -PACKAGECONFIG[glib] = "--without-included-glib,--
> with-included-glib,glib-2.0"
> -PACKAGECONFIG[libxml] = "--without-included-libxml,--
> with-included-libxml,libxml2"
> -PACKAGECONFIG[libunistring] = "--without-included-
> libunistring,--with-included-libunistring,libunistring"
> +PACKAGECONFIG[croco] = "--with-libcroco-0.6-prefix=${STAGING_LIBDIR}/..
> --without-included-libcroco,--with-included-libcroco,libcroco"
> +PACKAGECONFIG[glib] = "--with-libglib-2.0-prefix=${STAGING_LIBDIR}/..
> --without-included-glib,--with-included-glib,glib-2.0"
> +PACKAGECONFIG[libxml] = "--with-libxml2-prefix=${STAGING_LIBDIR}/..
> --without-included-libxml,--with-included-libxml,libxml2"
> +PACKAGECONFIG[libunistring] = "--with-libunistring-prefix=${STAGING_LIBDIR}/..
> --without-included-libunistring,--with-included-libunistring,libunistring"
>  PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${
> STAGING_LIBDIR}/..,--disable-curses,ncurses,"
>
>  acpaths = '-I ${S}/gettext-runtime/m4 \
> --
> 2.15.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 5277 bytes --]

Re: [PATCH] gettext: fix PACKAGECONFIGs

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 4528 bytes --]

Hi Martin,

I've a patch at the top of poky-contrib:ross/mut which hopefully fixes
this.  It's a bit more invasive than I'd like but this is gettext and I'm
still at least partially sane, so that's a win as far as I'm concerned.

I've a build running now but touching gettext causes a rebuild of the world
so I'm going to bed whist it runs.  Would you be able to test it in your
environment too?

Cheers,
Ross

On 22 January 2018 at 19:46, Burton, Ross <ross.burton@intel.com> wrote:

> This is causing QA errors:
>
> ERROR: gettext-0.19.8.1-r0 do_package_qa: QA Issue: gettext:
> /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-
> split/gettext/usr/lib/gettext/hostname contains probably-redundant RPATH
> /usr/lib/../lib
> gettext: /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-
> split/gettext/usr/lib/gettext/urlget contains probably-redundant RPATH
> /usr/lib/../lib
> gettext: /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-
> split/gettext/usr/lib/gettext/cldr-plurals contains probably-redundant
> RPATH /usr/lib/../lib
> gettext: /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-
> split/gettext/usr/bin/recode-sr-latin contains probably-redundant RPATH
> /usr/lib/../lib [useless-rpaths]
>
> Ross
>
> On 22 January 2018 at 10:52, Martin Jansa <martin.jansa@gmail.com> wrote:
>
>> * add --with-*-prefix variables to prevent configure trying to search in
>> host paths
>> * fixes:
>>   ERROR: This autoconf log indicates errors, it looked at host include
>> and/or library paths while determining system capabilities.
>>   gettext/0.19.8.1-r0/build/gettext-tools/config.log:cc1: warning:
>> include location /usr/include/glib-2.0 is unsafe for cross-compilation
>> [-Wpoison-system-directories]
>>
>> * not sure if it's worth adding other prefixes for curses related
>> PACKAGECONFIG
>>   PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${ST
>> AGING_LIBDIR}/..,--disable-curses,ncurses,"
>>
>>   --with-libncurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
>> DIR/lib
>>   --without-libncurses-prefix     don't search for PACKLIBS in includedir
>> and libdir
>>   --with-libxcurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
>> DIR/lib
>>   --without-libxcurses-prefix     don't search for PACKLIBS in includedir
>> and libdir
>>   --with-libcurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
>> DIR/lib
>>   --without-libcurses-prefix     don't search for PACKLIBS in includedir
>> and libdir
>>
>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> ---
>>  meta/recipes-core/gettext/gettext_0.19.8.1.bb | 8 ++++----
>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>> b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>> index 97083c0da2..8a8a34cca8 100644
>> --- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>> +++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>> @@ -43,10 +43,10 @@ PACKAGECONFIG ??= "croco glib libxml libunistring"
>>  PACKAGECONFIG_class-native = ""
>>  PACKAGECONFIG_class-nativesdk = ""
>>
>> -PACKAGECONFIG[croco] = "--without-included-libcroco,-
>> -with-included-libcroco,libcroco"
>> -PACKAGECONFIG[glib] = "--without-included-glib,--wit
>> h-included-glib,glib-2.0"
>> -PACKAGECONFIG[libxml] = "--without-included-libxml,--w
>> ith-included-libxml,libxml2"
>> -PACKAGECONFIG[libunistring] = "--without-included-libunistri
>> ng,--with-included-libunistring,libunistring"
>> +PACKAGECONFIG[croco] = "--with-libcroco-0.6-prefix=${STAGING_LIBDIR}/..
>> --without-included-libcroco,--with-included-libcroco,libcroco"
>> +PACKAGECONFIG[glib] = "--with-libglib-2.0-prefix=${STAGING_LIBDIR}/..
>> --without-included-glib,--with-included-glib,glib-2.0"
>> +PACKAGECONFIG[libxml] = "--with-libxml2-prefix=${STAGING_LIBDIR}/..
>> --without-included-libxml,--with-included-libxml,libxml2"
>> +PACKAGECONFIG[libunistring] = "--with-libunistring-prefix=${STAGING_LIBDIR}/..
>> --without-included-libunistring,--with-included-libunistring
>> ,libunistring"
>>  PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${ST
>> AGING_LIBDIR}/..,--disable-curses,ncurses,"
>>
>>  acpaths = '-I ${S}/gettext-runtime/m4 \
>> --
>> 2.15.1
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>
>

[-- Attachment #2: Type: text/html, Size: 6402 bytes --]

Re: [PATCH] gettext: fix PACKAGECONFIGs

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 5690 bytes --]

The
--without-included-libunistring=
change there

-PACKAGECONFIG[libunistring] = "--without-included-
libunistring,--with-included-libunistring,libunistring"
+PACKAGECONFIG[libunistring] = "--without-included-
libunistring=${STAGING_LIBDIR}/..,--with-included-libunistring,libunistring"

looks really strange and indeed it fails:

| configure: error: invalid package name: included-libunistring=/OE/
BUILD/work/qemux86-oe-linux/gettext/0.19.8.1-r0/recipe-sysroot/usr/lib/..

After removing this part and keeping only the added .patch I got the same
error as before:
ERROR: gettext-0.19.8.1-r0 do_configure: This autoconf log indicates
errors, it looked at host include and/or library paths while determining
system capabilities.
Rerun configure task after fixing this.

0.19.8.1-r0/build/gettext-tools/config.log:cc1: warning: include location
"/usr/include/glib-2.0" is unsafe for cross-compilation
[-Wpoison-system-directories]



On Tue, Jan 23, 2018 at 1:58 AM, Burton, Ross <ross.burton@intel.com> wrote:

> Hi Martin,
>
> I've a patch at the top of poky-contrib:ross/mut which hopefully fixes
> this.  It's a bit more invasive than I'd like but this is gettext and I'm
> still at least partially sane, so that's a win as far as I'm concerned.
>
> I've a build running now but touching gettext causes a rebuild of the
> world so I'm going to bed whist it runs.  Would you be able to test it in
> your environment too?
>
> Cheers,
> Ross
>
> On 22 January 2018 at 19:46, Burton, Ross <ross.burton@intel.com> wrote:
>
>> This is causing QA errors:
>>
>> ERROR: gettext-0.19.8.1-r0 do_package_qa: QA Issue: gettext:
>> /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-spli
>> t/gettext/usr/lib/gettext/hostname contains probably-redundant RPATH
>> /usr/lib/../lib
>> gettext: /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-spli
>> t/gettext/usr/lib/gettext/urlget contains probably-redundant RPATH
>> /usr/lib/../lib
>> gettext: /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-spli
>> t/gettext/usr/lib/gettext/cldr-plurals contains probably-redundant RPATH
>> /usr/lib/../lib
>> gettext: /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-spli
>> t/gettext/usr/bin/recode-sr-latin contains probably-redundant RPATH
>> /usr/lib/../lib [useless-rpaths]
>>
>> Ross
>>
>> On 22 January 2018 at 10:52, Martin Jansa <martin.jansa@gmail.com> wrote:
>>
>>> * add --with-*-prefix variables to prevent configure trying to search in
>>> host paths
>>> * fixes:
>>>   ERROR: This autoconf log indicates errors, it looked at host include
>>> and/or library paths while determining system capabilities.
>>>   gettext/0.19.8.1-r0/build/gettext-tools/config.log:cc1: warning:
>>> include location /usr/include/glib-2.0 is unsafe for cross-compilation
>>> [-Wpoison-system-directories]
>>>
>>> * not sure if it's worth adding other prefixes for curses related
>>> PACKAGECONFIG
>>>   PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${ST
>>> AGING_LIBDIR}/..,--disable-curses,ncurses,"
>>>
>>>   --with-libncurses-prefix[=DIR]  search for PACKLIBS in DIR/include
>>> and DIR/lib
>>>   --without-libncurses-prefix     don't search for PACKLIBS in
>>> includedir and libdir
>>>   --with-libxcurses-prefix[=DIR]  search for PACKLIBS in DIR/include
>>> and DIR/lib
>>>   --without-libxcurses-prefix     don't search for PACKLIBS in
>>> includedir and libdir
>>>   --with-libcurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
>>> DIR/lib
>>>   --without-libcurses-prefix     don't search for PACKLIBS in includedir
>>> and libdir
>>>
>>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>>> ---
>>>  meta/recipes-core/gettext/gettext_0.19.8.1.bb | 8 ++++----
>>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>>> b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>>> index 97083c0da2..8a8a34cca8 100644
>>> --- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>>> +++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>>> @@ -43,10 +43,10 @@ PACKAGECONFIG ??= "croco glib libxml libunistring"
>>>  PACKAGECONFIG_class-native = ""
>>>  PACKAGECONFIG_class-nativesdk = ""
>>>
>>> -PACKAGECONFIG[croco] = "--without-included-libcroco,-
>>> -with-included-libcroco,libcroco"
>>> -PACKAGECONFIG[glib] = "--without-included-glib,--wit
>>> h-included-glib,glib-2.0"
>>> -PACKAGECONFIG[libxml] = "--without-included-libxml,--w
>>> ith-included-libxml,libxml2"
>>> -PACKAGECONFIG[libunistring] = "--without-included-libunistri
>>> ng,--with-included-libunistring,libunistring"
>>> +PACKAGECONFIG[croco] = "--with-libcroco-0.6-prefix=${STAGING_LIBDIR}/..
>>> --without-included-libcroco,--with-included-libcroco,libcroco"
>>> +PACKAGECONFIG[glib] = "--with-libglib-2.0-prefix=${STAGING_LIBDIR}/..
>>> --without-included-glib,--with-included-glib,glib-2.0"
>>> +PACKAGECONFIG[libxml] = "--with-libxml2-prefix=${STAGING_LIBDIR}/..
>>> --without-included-libxml,--with-included-libxml,libxml2"
>>> +PACKAGECONFIG[libunistring] = "--with-libunistring-prefix=${STAGING_LIBDIR}/..
>>> --without-included-libunistring,--with-included-libunistring
>>> ,libunistring"
>>>  PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${ST
>>> AGING_LIBDIR}/..,--disable-curses,ncurses,"
>>>
>>>  acpaths = '-I ${S}/gettext-runtime/m4 \
>>> --
>>> 2.15.1
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>>
>>
>>
>

[-- Attachment #2: Type: text/html, Size: 8162 bytes --]

Re: [PATCH] gettext: fix PACKAGECONFIGs

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 6008 bytes --]

Yeah, I managed to typo.  Latest ross/mut has a new version.

Ross

On 23 January 2018 at 22:29, Martin Jansa <martin.jansa@gmail.com> wrote:

> The
> --without-included-libunistring=
> change there
>
> -PACKAGECONFIG[libunistring] = "--without-included-libunistri
> ng,--with-included-libunistring,libunistring"
> +PACKAGECONFIG[libunistring] = "--without-included-libunistri
> ng=${STAGING_LIBDIR}/..,--with-included-libunistring,libunistring"
>
> looks really strange and indeed it fails:
>
> | configure: error: invalid package name: included-libunistring=/OE/BUIL
> D/work/qemux86-oe-linux/gettext/0.19.8.1-r0/recipe-sysroot/usr/lib/..
>
> After removing this part and keeping only the added .patch I got the same
> error as before:
> ERROR: gettext-0.19.8.1-r0 do_configure: This autoconf log indicates
> errors, it looked at host include and/or library paths while determining
> system capabilities.
> Rerun configure task after fixing this.
>
> 0.19.8.1-r0/build/gettext-tools/config.log:cc1: warning: include location
> "/usr/include/glib-2.0" is unsafe for cross-compilation
> [-Wpoison-system-directories]
>
>
>
> On Tue, Jan 23, 2018 at 1:58 AM, Burton, Ross <ross.burton@intel.com>
> wrote:
>
>> Hi Martin,
>>
>> I've a patch at the top of poky-contrib:ross/mut which hopefully fixes
>> this.  It's a bit more invasive than I'd like but this is gettext and I'm
>> still at least partially sane, so that's a win as far as I'm concerned.
>>
>> I've a build running now but touching gettext causes a rebuild of the
>> world so I'm going to bed whist it runs.  Would you be able to test it in
>> your environment too?
>>
>> Cheers,
>> Ross
>>
>> On 22 January 2018 at 19:46, Burton, Ross <ross.burton@intel.com> wrote:
>>
>>> This is causing QA errors:
>>>
>>> ERROR: gettext-0.19.8.1-r0 do_package_qa: QA Issue: gettext:
>>> /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-spli
>>> t/gettext/usr/lib/gettext/hostname contains probably-redundant RPATH
>>> /usr/lib/../lib
>>> gettext: /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-spli
>>> t/gettext/usr/lib/gettext/urlget contains probably-redundant RPATH
>>> /usr/lib/../lib
>>> gettext: /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-spli
>>> t/gettext/usr/lib/gettext/cldr-plurals contains probably-redundant
>>> RPATH /usr/lib/../lib
>>> gettext: /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-spli
>>> t/gettext/usr/bin/recode-sr-latin contains probably-redundant RPATH
>>> /usr/lib/../lib [useless-rpaths]
>>>
>>> Ross
>>>
>>> On 22 January 2018 at 10:52, Martin Jansa <martin.jansa@gmail.com>
>>> wrote:
>>>
>>>> * add --with-*-prefix variables to prevent configure trying to search
>>>> in host paths
>>>> * fixes:
>>>>   ERROR: This autoconf log indicates errors, it looked at host include
>>>> and/or library paths while determining system capabilities.
>>>>   gettext/0.19.8.1-r0/build/gettext-tools/config.log:cc1: warning:
>>>> include location /usr/include/glib-2.0 is unsafe for cross-compilation
>>>> [-Wpoison-system-directories]
>>>>
>>>> * not sure if it's worth adding other prefixes for curses related
>>>> PACKAGECONFIG
>>>>   PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${ST
>>>> AGING_LIBDIR}/..,--disable-curses,ncurses,"
>>>>
>>>>   --with-libncurses-prefix[=DIR]  search for PACKLIBS in DIR/include
>>>> and DIR/lib
>>>>   --without-libncurses-prefix     don't search for PACKLIBS in
>>>> includedir and libdir
>>>>   --with-libxcurses-prefix[=DIR]  search for PACKLIBS in DIR/include
>>>> and DIR/lib
>>>>   --without-libxcurses-prefix     don't search for PACKLIBS in
>>>> includedir and libdir
>>>>   --with-libcurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
>>>> DIR/lib
>>>>   --without-libcurses-prefix     don't search for PACKLIBS in
>>>> includedir and libdir
>>>>
>>>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>>>> ---
>>>>  meta/recipes-core/gettext/gettext_0.19.8.1.bb | 8 ++++----
>>>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>>>> b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>>>> index 97083c0da2..8a8a34cca8 100644
>>>> --- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>>>> +++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>>>> @@ -43,10 +43,10 @@ PACKAGECONFIG ??= "croco glib libxml libunistring"
>>>>  PACKAGECONFIG_class-native = ""
>>>>  PACKAGECONFIG_class-nativesdk = ""
>>>>
>>>> -PACKAGECONFIG[croco] = "--without-included-libcroco,-
>>>> -with-included-libcroco,libcroco"
>>>> -PACKAGECONFIG[glib] = "--without-included-glib,--wit
>>>> h-included-glib,glib-2.0"
>>>> -PACKAGECONFIG[libxml] = "--without-included-libxml,--w
>>>> ith-included-libxml,libxml2"
>>>> -PACKAGECONFIG[libunistring] = "--without-included-libunistri
>>>> ng,--with-included-libunistring,libunistring"
>>>> +PACKAGECONFIG[croco] = "--with-libcroco-0.6-prefix=${STAGING_LIBDIR}/..
>>>> --without-included-libcroco,--with-included-libcroco,libcroco"
>>>> +PACKAGECONFIG[glib] = "--with-libglib-2.0-prefix=${STAGING_LIBDIR}/..
>>>> --without-included-glib,--with-included-glib,glib-2.0"
>>>> +PACKAGECONFIG[libxml] = "--with-libxml2-prefix=${STAGING_LIBDIR}/..
>>>> --without-included-libxml,--with-included-libxml,libxml2"
>>>> +PACKAGECONFIG[libunistring] = "--with-libunistring-prefix=${STAGING_LIBDIR}/..
>>>> --without-included-libunistring,--with-included-libunistring
>>>> ,libunistring"
>>>>  PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${ST
>>>> AGING_LIBDIR}/..,--disable-curses,ncurses,"
>>>>
>>>>  acpaths = '-I ${S}/gettext-runtime/m4 \
>>>> --
>>>> 2.15.1
>>>>
>>>> --
>>>> _______________________________________________
>>>> Openembedded-core mailing list
>>>> Openembedded-core@lists.openembedded.org
>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>>>
>>>
>>>
>>
>

[-- Attachment #2: Type: text/html, Size: 8822 bytes --]

Re: [PATCH] gettext: fix PACKAGECONFIGs

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 6374 bytes --]

Thanks, this version built for me on that system where it was failing
before (I haven't tried to rebuild world, just gettext).

On Wed, Jan 24, 2018 at 12:09 AM, Burton, Ross <ross.burton@intel.com>
wrote:

> Yeah, I managed to typo.  Latest ross/mut has a new version.
>
> Ross
>
> On 23 January 2018 at 22:29, Martin Jansa <martin.jansa@gmail.com> wrote:
>
>> The
>> --without-included-libunistring=
>> change there
>>
>> -PACKAGECONFIG[libunistring] = "--without-included-libunistri
>> ng,--with-included-libunistring,libunistring"
>> +PACKAGECONFIG[libunistring] = "--without-included-libunistri
>> ng=${STAGING_LIBDIR}/..,--with-included-libunistring,libunistring"
>>
>> looks really strange and indeed it fails:
>>
>> | configure: error: invalid package name: included-libunistring=/OE/BUIL
>> D/work/qemux86-oe-linux/gettext/0.19.8.1-r0/recipe-sysroot/usr/lib/..
>>
>> After removing this part and keeping only the added .patch I got the same
>> error as before:
>> ERROR: gettext-0.19.8.1-r0 do_configure: This autoconf log indicates
>> errors, it looked at host include and/or library paths while determining
>> system capabilities.
>> Rerun configure task after fixing this.
>>
>> 0.19.8.1-r0/build/gettext-tools/config.log:cc1: warning: include
>> location "/usr/include/glib-2.0" is unsafe for cross-compilation
>> [-Wpoison-system-directories]
>>
>>
>>
>> On Tue, Jan 23, 2018 at 1:58 AM, Burton, Ross <ross.burton@intel.com>
>> wrote:
>>
>>> Hi Martin,
>>>
>>> I've a patch at the top of poky-contrib:ross/mut which hopefully fixes
>>> this.  It's a bit more invasive than I'd like but this is gettext and I'm
>>> still at least partially sane, so that's a win as far as I'm concerned.
>>>
>>> I've a build running now but touching gettext causes a rebuild of the
>>> world so I'm going to bed whist it runs.  Would you be able to test it in
>>> your environment too?
>>>
>>> Cheers,
>>> Ross
>>>
>>> On 22 January 2018 at 19:46, Burton, Ross <ross.burton@intel.com> wrote:
>>>
>>>> This is causing QA errors:
>>>>
>>>> ERROR: gettext-0.19.8.1-r0 do_package_qa: QA Issue: gettext:
>>>> /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-spli
>>>> t/gettext/usr/lib/gettext/hostname contains probably-redundant RPATH
>>>> /usr/lib/../lib
>>>> gettext: /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-spli
>>>> t/gettext/usr/lib/gettext/urlget contains probably-redundant RPATH
>>>> /usr/lib/../lib
>>>> gettext: /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-spli
>>>> t/gettext/usr/lib/gettext/cldr-plurals contains probably-redundant
>>>> RPATH /usr/lib/../lib
>>>> gettext: /work/corei7-64-poky-linux/gettext/0.19.8.1-r0/packages-spli
>>>> t/gettext/usr/bin/recode-sr-latin contains probably-redundant RPATH
>>>> /usr/lib/../lib [useless-rpaths]
>>>>
>>>> Ross
>>>>
>>>> On 22 January 2018 at 10:52, Martin Jansa <martin.jansa@gmail.com>
>>>> wrote:
>>>>
>>>>> * add --with-*-prefix variables to prevent configure trying to search
>>>>> in host paths
>>>>> * fixes:
>>>>>   ERROR: This autoconf log indicates errors, it looked at host include
>>>>> and/or library paths while determining system capabilities.
>>>>>   gettext/0.19.8.1-r0/build/gettext-tools/config.log:cc1: warning:
>>>>> include location /usr/include/glib-2.0 is unsafe for cross-compilation
>>>>> [-Wpoison-system-directories]
>>>>>
>>>>> * not sure if it's worth adding other prefixes for curses related
>>>>> PACKAGECONFIG
>>>>>   PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${ST
>>>>> AGING_LIBDIR}/..,--disable-curses,ncurses,"
>>>>>
>>>>>   --with-libncurses-prefix[=DIR]  search for PACKLIBS in DIR/include
>>>>> and DIR/lib
>>>>>   --without-libncurses-prefix     don't search for PACKLIBS in
>>>>> includedir and libdir
>>>>>   --with-libxcurses-prefix[=DIR]  search for PACKLIBS in DIR/include
>>>>> and DIR/lib
>>>>>   --without-libxcurses-prefix     don't search for PACKLIBS in
>>>>> includedir and libdir
>>>>>   --with-libcurses-prefix[=DIR]  search for PACKLIBS in DIR/include
>>>>> and DIR/lib
>>>>>   --without-libcurses-prefix     don't search for PACKLIBS in
>>>>> includedir and libdir
>>>>>
>>>>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>>>>> ---
>>>>>  meta/recipes-core/gettext/gettext_0.19.8.1.bb | 8 ++++----
>>>>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>>>>
>>>>> diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>>>>> b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>>>>> index 97083c0da2..8a8a34cca8 100644
>>>>> --- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>>>>> +++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>>>>> @@ -43,10 +43,10 @@ PACKAGECONFIG ??= "croco glib libxml libunistring"
>>>>>  PACKAGECONFIG_class-native = ""
>>>>>  PACKAGECONFIG_class-nativesdk = ""
>>>>>
>>>>> -PACKAGECONFIG[croco] = "--without-included-libcroco,-
>>>>> -with-included-libcroco,libcroco"
>>>>> -PACKAGECONFIG[glib] = "--without-included-glib,--wit
>>>>> h-included-glib,glib-2.0"
>>>>> -PACKAGECONFIG[libxml] = "--without-included-libxml,--w
>>>>> ith-included-libxml,libxml2"
>>>>> -PACKAGECONFIG[libunistring] = "--without-included-libunistri
>>>>> ng,--with-included-libunistring,libunistring"
>>>>> +PACKAGECONFIG[croco] = "--with-libcroco-0.6-prefix=${STAGING_LIBDIR}/..
>>>>> --without-included-libcroco,--with-included-libcroco,libcroco"
>>>>> +PACKAGECONFIG[glib] = "--with-libglib-2.0-prefix=${STAGING_LIBDIR}/..
>>>>> --without-included-glib,--with-included-glib,glib-2.0"
>>>>> +PACKAGECONFIG[libxml] = "--with-libxml2-prefix=${STAGING_LIBDIR}/..
>>>>> --without-included-libxml,--with-included-libxml,libxml2"
>>>>> +PACKAGECONFIG[libunistring] = "--with-libunistring-prefix=${STAGING_LIBDIR}/..
>>>>> --without-included-libunistring,--with-included-libunistring
>>>>> ,libunistring"
>>>>>  PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${ST
>>>>> AGING_LIBDIR}/..,--disable-curses,ncurses,"
>>>>>
>>>>>  acpaths = '-I ${S}/gettext-runtime/m4 \
>>>>> --
>>>>> 2.15.1
>>>>>
>>>>> --
>>>>> _______________________________________________
>>>>> Openembedded-core mailing list
>>>>> Openembedded-core@lists.openembedded.org
>>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>>>>
>>>>
>>>>
>>>
>>
>

[-- Attachment #2: Type: text/html, Size: 9593 bytes --]

Re: [PATCH 9/9] gettext: rationalise optional dependencies

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 5244 bytes --]

Eek, thanks.

Ross

On 21 January 2018 at 15:30, Martin Jansa <martin.jansa@gmail.com> wrote:

> --without-included-glib seems to cause configure to find glib from the
> host:
>
> ERROR: This autoconf log indicates errors, it looked at host include
> and/or library paths while determining system capabilities.
>
> gettext/0.19.8.1-r0/build/gettext-tools/config.log:cc1: warning: include
> location "/usr/include/glib-2.0" is unsafe for cross-compilation
> [-Wpoison-system-directories]
>
> I'm testing it with added --with-libglib-2.0-prefix to see if it fixes the
> issue. I've added the same to other added PACKAGECONFIGs:
> -PACKAGECONFIG[croco] = "--without-included-libcroco,-
> -with-included-libcroco,libcroco"
> -PACKAGECONFIG[glib] = "--without-included-glib,--
> with-included-glib,glib-2.0"
> -PACKAGECONFIG[libxml] = "--without-included-libxml,--
> with-included-libxml,libxml2"
> -PACKAGECONFIG[libunistring] = "--without-included-
> libunistring,--with-included-libunistring,libunistring"
> +PACKAGECONFIG[croco] = "--with-libcroco-0.6-prefix=${STAGING_LIBDIR}/..
> --without-included-libcroco,--with-included-libcroco,libcroco"
> +PACKAGECONFIG[glib] = "--with-libglib-2.0-prefix=${STAGING_LIBDIR}/..
> --without-included-glib,--with-included-glib,glib-2.0"
> +PACKAGECONFIG[libxml] = "--with-libxml2-prefix=${STAGING_LIBDIR}/..
> --without-included-libxml,--with-included-libxml,libxml2"
> +PACKAGECONFIG[libunistring] = "--with-libunistring-prefix=${STAGING_LIBDIR}/..
> --without-included-libunistring,--with-included-libunistring,libunistring"
>
> Not sure if it's worth adding other prefixes for curses related
> PACKAGECONFIG
> PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${
> STAGING_LIBDIR}/..,--disable-curses,ncurses,"
>
>   --with-libncurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
> DIR/lib
>   --without-libncurses-prefix     don't search for PACKLIBS in includedir
> and libdir
>   --with-libxcurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
> DIR/lib
>   --without-libxcurses-prefix     don't search for PACKLIBS in includedir
> and libdir
>   --with-libcurses-prefix[=DIR]  search for PACKLIBS in DIR/include and
> DIR/lib
>   --without-libcurses-prefix     don't search for PACKLIBS in includedir
> and libdir
>
>
>
> On Mon, Jan 8, 2018 at 5:00 PM, Ross Burton <ross.burton@intel.com> wrote:
>
>> gettext has optional dependencies on libxml2, glib, libcroco and
>> libunistring.
>> If they're not available then gettext will use internal copies, but it
>> can also
>> use system libraries.
>>
>> For gettext-native continue to use the internal copies to get this
>> building
>> sooner rather than later, but for target use the system shared libraries.
>>
>> Also gettext 0.19.7 onwards swapped expat for libxm2, so remove the build
>> dependency on expat.
>>
>> Signed-off-by: Ross Burton <ross.burton@intel.com>
>> ---
>>  meta/recipes-core/gettext/gettext_0.19.8.1.bb | 14 +++++++++-----
>>  1 file changed, 9 insertions(+), 5 deletions(-)
>>
>> diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>> b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>> index 46ea68ff5b5..25ff601a6be 100644
>> --- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>> +++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
>> @@ -8,7 +8,7 @@ SECTION = "libs"
>>  LICENSE = "GPLv3+ & LGPL-2.1+"
>>  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>>
>> -DEPENDS = "gettext-native virtual/libiconv expat"
>> +DEPENDS = "gettext-native virtual/libiconv"
>>  DEPENDS_class-native = "gettext-minimal-native"
>>  PROVIDES = "virtual/libintl virtual/gettext"
>>  PROVIDES_class-native = "virtual/gettext-native"
>> @@ -33,18 +33,22 @@ EXTRA_OECONF += "--without-lispdir \
>>                   --disable-native-java \
>>                   --disable-openmp \
>>                   --disable-acl \
>> -                 --with-included-glib \
>>                   --without-emacs \
>>                   --without-cvs \
>>                   --without-git \
>> -                 --with-included-libxml \
>> -                 --with-included-libcroco \
>> -                 --with-included-libunistring \
>>                  "
>>  EXTRA_OECONF_append_class-target = " \
>>                   --with-bisonlocaledir=${datadir}/locale \
>>  "
>>
>> +PACKAGECONFIG ??= "croco glib libxml libunistring"
>> +PACKAGECONFIG_class-native = ""
>> +
>> +PACKAGECONFIG[croco] = "--without-included-libcroco,-
>> -with-included-libcroco,libcroco"
>> +PACKAGECONFIG[glib] = "--without-included-glib,--wit
>> h-included-glib,glib-2.0"
>> +PACKAGECONFIG[libxml] = "--without-included-libxml,--w
>> ith-included-libxml,libxml2"
>> +PACKAGECONFIG[libunistring] = "--without-included-libunistri
>> ng,--with-included-libunistring,libunistring"
>> +
>>  acpaths = '-I ${S}/gettext-runtime/m4 \
>>             -I ${S}/gettext-tools/m4'
>>
>> --
>> 2.11.0
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>
>

[-- Attachment #2: Type: text/html, Size: 7512 bytes --]

✗ patchtest: failure for "psmisc: improve autopoint-enab..." and 8 more (rev2)

[Patchwork]

== Series Details ==

Series: "psmisc: improve autopoint-enab..." and 8 more (rev2)
Revision: 2
URL   : https://patchwork.openembedded.org/series/10435/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 5e5569c962)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe