On Mon, Jan 06, 2014 at 11:29:36AM +0000, g...@git.openembedded.org wrote: > Module: openembedded-core.git > Branch: master > Commit: 6bcd2dafa379badab11bff9d7b607f7f5d72fc94 > URL: > http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6bcd2dafa379badab11bff9d7b607f7f5d72fc94 > > Author: Robert Yang <liezhi.y...@windriver.com> > Date: Fri Dec 27 01:05:14 2013 +0800 > > autogen-native: upgrade to 5.18.2 > > * Upgrade from 5.17.4 to 5.18.2 > * Rename files -> autogen > > Signed-off-by: Robert Yang <liezhi.y...@windriver.com> > Signed-off-by: Saul Wold <s...@linux.intel.com>
Fails in world builds: | gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I.. -I../autoopts -isystem/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include -pthread -I/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0 -I/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include -isystem/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include -O2 -pipe -c -o autogen-ag.o `test -f 'ag.c' || echo './'`ag.c | In file included from /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/array-handle.h:28:0, | from /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile.h:34, | from autogen.h:60, | from ag.c:7: | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:40:24: error: expected ')' before '__attribute__' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:40:24: error: expected ',' or ';' before ')' token | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:42:27: error: expected ')' before '__attribute__' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:42:27: error: expected ',' or ';' before ')' token | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:44:46: error: expected ')' before '__attribute__' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:44:46: error: expected ',' or ';' before ')' token | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:46:30: error: expected ')' before '__attribute__' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:46:30: error: expected ',' or ';' before ')' token | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:47:50: error: expected ')' before '__attribute__' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:47:50: error: expected ',' or ';' before ')' token | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:49:6: error: expected ')' before '__attribute__' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:49:6: error: expected ',' or ';' before ')' token | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:51:6: error: expected ')' before '__attribute__' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:51:6: error: expected ',' or ';' before ')' token | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:52:44: error: expected ')' before '__attribute__' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:52:44: error: expected ',' or ';' before ')' token | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:53:57: error: expected ')' before '__attribute__' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:53:57: error: expected ',' or ';' before ')' token | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:55:21: error: expected ')' before '__attribute__' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:55:21: error: expected ',' or ';' before ')' token | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:57:28: error: expected ')' before '__attribute__' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:57:28: error: expected ',' or ';' before ')' token | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:59:41: error: expected ')' before '__attribute__' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:59:41: error: expected ',' or ';' before ')' token | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:60:50: error: expected ')' before '__attribute__' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:60:50: error: expected ',' or ';' before ')' token | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:62:19: error: expected ')' before '__attribute__' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:62:19: error: expected ',' or ';' before ')' token | In file included from /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/root.h:28:0, | from /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/async.h:27, | from /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile.h:37, | from autogen.h:60, | from ag.c:7: | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/throw.h:82:1: warning: '__noreturn__' attribute ignored [-Wattributes] | In file included from /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile.h:89:0, | from autogen.h:60, | from ag.c:7: | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/read.h:63:3: error: expected ')' before '__attribute__' | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/guile/2.0/libguile/read.h:63:3: error: expected ',' or ';' before ')' token | make[3]: *** [autogen-ag.o] Error 1 | make[3]: Leaving directory `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/x86_64-linux/autogen-native/5.18.2-r0/autogen-5.18.2/agen5' | make[2]: *** [all-recursive] Error 1 | make[2]: Leaving directory `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/x86_64-linux/autogen-native/5.18.2-r0/autogen-5.18.2/agen5' | make[1]: *** [all-recursive] Error 1 | make[1]: Leaving directory `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/x86_64-linux/autogen-native/5.18.2-r0/autogen-5.18.2' | make: *** [all] Error 2 | ERROR: oe_runmake failed | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_compile (log file is located at /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/x86_64-linux/autogen-native/5.18.2-r0/temp/log.do_compile.14771) NOTE: recipe autogen-native-5.18.2-r0: task do_compile: Failed NOTE: Running task 13583 of 27387 (ID: 21887, /home/jenkins/oe/shr-core-branches/shr-core/meta-openembedded/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb, do_package) ERROR: Task 26007 (/home/jenkins/oe/shr-core-branches/shr-core/openembedded-core/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb, do_compile) failed with exit code '1' > > --- > > ...n-native_5.17.4.bb => autogen-native_5.18.2.bb} | 6 +-- > .../autogen/{files => autogen}/guile.patch | 48 > +++++++++++++--------- > .../increase-timeout-limit.patch | 0 > 3 files changed, 31 insertions(+), 23 deletions(-) > > diff --git a/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb > b/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb > similarity index 88% > rename from meta/recipes-devtools/autogen/autogen-native_5.17.4.bb > rename to meta/recipes-devtools/autogen/autogen-native_5.18.2.bb > index 28d82b0..c7950c3 100644 > --- a/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb > +++ b/meta/recipes-devtools/autogen/autogen-native_5.18.2.bb > @@ -6,14 +6,14 @@ DESCRIPTION = "AutoGen is a tool designed to simplify the > creation and\ > HOMEPAGE = "http://www.gnu.org/software/autogen/" > SECTION = "devel" > LICENSE = "GPLv3" > -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > > SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ > file://guile.patch \ > file://increase-timeout-limit.patch" > > -SRC_URI[md5sum] = "09f074cba57610bf4ef1147e01c8ae90" > -SRC_URI[sha256sum] = > "cd2585f4794d0e9d7f2cb0b9af4f2bd429946e718473edf1cf8c49f081ca71ed" > +SRC_URI[md5sum] = "117c4bc5613c57e1b97d760a5d1910a4" > +SRC_URI[sha256sum] = > "cc2702dec21ba5b01144865163f6d1a54268d2b72aafc5520ad0e0cb57104068" > > DEPENDS = "guile-native libtool-native libxml2-native" > > diff --git a/meta/recipes-devtools/autogen/files/guile.patch > b/meta/recipes-devtools/autogen/autogen/guile.patch > similarity index 89% > rename from meta/recipes-devtools/autogen/files/guile.patch > rename to meta/recipes-devtools/autogen/autogen/guile.patch > index 8a77dba..332e5aa 100644 > --- a/meta/recipes-devtools/autogen/files/guile.patch > +++ b/meta/recipes-devtools/autogen/autogen/guile.patch > @@ -1,14 +1,24 @@ > -Disable the autoconf macros that use dpkg (!) and guile-config to determine > what > -version and where guile is installed, and just use pkg-config directly > (guile-config is a deprecated wrapper around pkg-config). > - > - Signed-off-by: Ross Burton <ross.bur...@intel.com> > - Upstream-Status: Pending (should be submitted) > +remove dpkg and guile-config > + > +Disable the autoconf macros that use dpkg (!) and guile-config to > +determine what version and where guile is installed, and just use > +pkg-config directly (guile-config is a deprecated wrapper around > +pkg-config). > + > +Signed-off-by: Ross Burton <ross.bur...@intel.com> > + > +Uprade to 5.18.2 > +Signed-off-by: Robert Yang <liezhi.y...@windriver.com> > +Upstream-Status: Pending [should be submitted] > +--- > + config/ag_macros.m4 | 151 > +++------------------------------------------------- > + 1 file changed, 8 insertions(+), 143 deletions(-) > > diff --git a/config/ag_macros.m4 b/config/ag_macros.m4 > -index 9914a65..b6db97a 100644 > +index c05073e..a8e96da 100644 > --- a/config/ag_macros.m4 > +++ b/config/ag_macros.m4 > -@@ -175,123 +175,12 @@ return 0;], > +@@ -180,118 +180,13 @@ return 0;], > > > AC_DEFUN([AG_WITHLIB_GUILE],[ > @@ -26,7 +36,12 @@ index 9914a65..b6db97a 100644 > - ag_cv_with_libguile_cflags=no > - ag_cv_with_libguile_libs=no > - else > -- > ++ PKG_PROG_PKG_CONFIG > ++ PKG_CHECK_MODULES(LIBGUILE, [guile-2.0]) > ++ case "${LIBGUILE_LIBS}" in *-L* ) > ++ LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} | sed 's/.*[, ]-L[ > ]*//;s/[ ].*//'` > ++ ;; * ) LIBGUILE_PATH='' ;; esac > + > - AC_ARG_WITH([libguile-cflags], > - AS_HELP_STRING([--with-libguile-cflags], [libguile compile flags]), > - [ag_cv_with_libguile_cflags=${with_libguile_cflags}], > @@ -109,14 +124,10 @@ index 9914a65..b6db97a 100644 > - AC_MSG_RESULT([${ag_cv_with_libguile}]) > - AC_SUBST([LIBGUILE_CFLAGS]) > - AC_SUBST([LIBGUILE_LIBS]) > -- AC_SUBST([LIBGUILE_PATH]) > - if test "X${ag_cv_with_libguile}" != Xno > - then[ > - LIBGUILE_CFLAGS="${ag_cv_with_libguile_cflags}" > -- LIBGUILE_LIBS="${ag_cv_with_libguile_libs}" > -- case "${LIBGUILE_LIBS}" in *-L* ) > -- LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} | sed 's/.*[, ]-L[ > ]*//;s/[ ].*//'` > -- ;; * ) LIBGUILE_PATH='' ;; esac] > +- LIBGUILE_LIBS="${ag_cv_with_libguile_libs}"] > - CPPFLAGS="@S|@{ag_save_CPPFLAGS}" > - LIBS="@S|@{ag_save_LIBS}" > - else > @@ -124,20 +135,14 @@ index 9914a65..b6db97a 100644 > - LIBS="${ag_save_LIBS}" > - LIBGUILE_CFLAGS='' > - LIBGUILE_LIBS='' > -- LIBGUILE_PATH='' > - AC_MSG_ERROR([Cannot find libguile. libguile is required. Perhaps > you need to install guile-devel?]) > - fi > -+ PKG_PROG_PKG_CONFIG > -+ PKG_CHECK_MODULES(LIBGUILE, [guile-2.0]) > -+ case "${LIBGUILE_LIBS}" in *-L* ) > -+ LIBGUILE_PATH=`echo ,${LIBGUILE_LIBS} | sed 's/.*[, ]-L[ > ]*//;s/[ ].*//'` > -+ ;; * ) LIBGUILE_PATH='' ;; esac > AC_SUBST([AG_GUILE]) > - > ]) # end of AC_DEFUN of AG_WITHLIB_GUILE > > > -@@ -311,40 +200,10 @@ AC_DEFUN([AG_WITHCONF_GUILE_VER],[ > +@@ -311,40 +206,10 @@ AC_DEFUN([AG_WITHCONF_GUILE_VER],[ > > > AC_DEFUN([AG_TEST_GUILE_VERSION],[ > @@ -181,3 +186,6 @@ index 9914a65..b6db97a 100644 > AC_MSG_RESULT([${ag_cv_test_guile_version}]) > if test "X${ag_cv_test_guile_version}" != Xno > then > +-- > +1.8.3.1 > + > diff --git a/meta/recipes-devtools/autogen/files/increase-timeout-limit.patch > b/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch > similarity index 100% > rename from meta/recipes-devtools/autogen/files/increase-timeout-limit.patch > rename to meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch > > _______________________________________________ > Openembedded-commits mailing list > openembedded-comm...@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-commits -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
_______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core