* Prepare recipes for automake-1.13 (batch 1 / v2) @ 2013-01-06 23:49 Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 01/15] pkg-config: replace obsolete automake macros with working ones Marko Lindqvist 0 siblings, 1 reply; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core * Fixes and updates to Upstream-Status entries. [PATCH v2 01/15] pkg-config: replace obsolete automake macros with [PATCH v2 02/15] libtool: remove help2man dependency [PATCH v2 03/15] bison: remove help2man dependency [PATCH v2 04/15] file: replace obsolete automake macros with working [PATCH v2 05/15] popt: disable tests [PATCH v2 06/15] glib-2.0: replace obsolete automake macros with [PATCH v2 07/15] libx11: disable tests [PATCH v2 08/15] libpng: replace obsolete automake macros with [PATCH v2 09/15] libusb: replace obsolete automake macros with [PATCH v2 10/15] pixman: replace obsolete automake macros with [PATCH v2 11/15] libid3tag: replace obsolete automake macros with [PATCH v2 12/15] libgcrypt: replace obsolete automake macros with [PATCH v2 13/15] gnutls: replace obsolete automake macros with [PATCH v2 14/15] libtasn1: remove help2man dependency [PATCH v2 15/15] flac: replace obsolete automake macros with working - ML ^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH v2 01/15] pkg-config: replace obsolete automake macros with working ones 2013-01-06 23:49 Prepare recipes for automake-1.13 (batch 1 / v2) Marko Lindqvist @ 2013-01-06 23:49 ` Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 02/15] libtool: remove help2man dependency Marko Lindqvist 0 siblings, 1 reply; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core Add obsolete-automake-macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- .../pkgconfig-0.25/obsolete_automake_macros.patch | 35 ++++++++++++++++++++ meta/recipes-devtools/pkgconfig/pkgconfig.inc | 4 ++- meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb | 2 +- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch new file mode 100644 index 0000000..ce10a5e --- /dev/null +++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch @@ -0,0 +1,35 @@ +Upstream-Status: Fixed + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd pkg-config-0.25/configure.in pkg-config-0.25/configure.in +--- pkg-config-0.25/configure.in 2010-05-28 18:55:09.000000000 +0300 ++++ pkg-config-0.25/configure.in 2013-01-01 22:13:47.009573426 +0200 +@@ -4,7 +4,7 @@ + AM_INIT_AUTOMAKE(pkg-config, 0.25) + AM_MAINTAINER_MODE + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AM_PROG_LIBTOOL + +diff -Nurd pkg-config-0.25/glib-1.2.10/configure.in pkg-config-0.25/glib-1.2.10/configure.in +--- pkg-config-0.25/glib-1.2.10/configure.in 2009-12-06 22:43:59.000000000 +0200 ++++ pkg-config-0.25/glib-1.2.10/configure.in 2013-01-01 22:23:36.701560486 +0200 +@@ -63,7 +63,7 @@ + AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) + + # Specify a configuration file +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION) + AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION) +@@ -154,7 +154,6 @@ + + # Checks for programs. + AC_PROG_CC +-AM_PROG_CC_STDC + AC_PROG_INSTALL + + changequote(,)dnl diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc index c54e325..a2d4700 100644 --- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc +++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc @@ -15,7 +15,9 @@ DEPENDS_class-nativesdk = "" SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \ file://autofoo.patch \ file://glibconfig-sysdefs.h \ - file://disable-legacy.patch" + file://disable-legacy.patch \ + file://obsolete_automake_macros.patch \ +" S = "${WORKDIR}/pkg-config-${PV}/" diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb index d0a2b1f..a269973 100644 --- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb +++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb @@ -1,6 +1,6 @@ require pkgconfig.inc -PR = "r6" +PR = "r7" SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745" SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e" -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 02/15] libtool: remove help2man dependency 2013-01-06 23:49 ` [PATCH v2 01/15] pkg-config: replace obsolete automake macros with working ones Marko Lindqvist @ 2013-01-06 23:49 ` Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 03/15] bison: " Marko Lindqvist 0 siblings, 1 reply; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core Remove manpage creation. It wasn't working because of help2man missing when libtool is being built. This attempt to create manpages without help2man turns from no-op to hard error with automake-1.13. Removed prefix-manpage-fix.patch as only code it touched is being removed by new dont-depend-on-help2man.patch Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- meta/recipes-devtools/libtool/libtool-2.4.2.inc | 4 ++-- .../libtool/libtool/dont-depend-on-help2man.patch | 24 ++++++++++++++++++++ .../libtool/libtool/prefix-manpage-fix.patch | 21 ----------------- 3 files changed, 26 insertions(+), 23 deletions(-) create mode 100644 meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch delete mode 100644 meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc index 12a783a..bb4ddf0 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc +++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc @@ -8,11 +8,10 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" -INC_PR = "r5" +INC_PR = "r6" SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://trailingslash.patch \ - file://prefix-manpage-fix.patch \ file://rename-with-sysroot.patch \ file://use-sysroot-in-libpath.patch \ file://fix-final-rpath.patch \ @@ -20,6 +19,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://fix-rpath.patch \ file://respect-fstack-protector.patch \ file://norm-rpath.patch \ + file://dont-depend-on-help2man.patch \ " SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50" diff --git a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch new file mode 100644 index 0000000..67552b0 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch @@ -0,0 +1,24 @@ +Upstream-Status: Inappropriate + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd libtool-2.4.2/Makefile.am libtool-2.4.2/Makefile.am +--- libtool-2.4.2/Makefile.am 2011-10-17 13:17:04.000000000 +0300 ++++ libtool-2.4.2/Makefile.am 2013-01-01 22:03:36.865586811 +0200 +@@ -327,17 +327,6 @@ + cd $(srcdir)/doc && \ + $(MAKEINFO) --no-headers $(MAKEINFOFLAGS) -o notes.txt notes.texi + +-dist_man1_MANS = $(srcdir)/doc/libtool.1 $(srcdir)/doc/libtoolize.1 +-MAINTAINERCLEANFILES += $(dist_man1_MANS) +-update_mans = \ +- PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \ +- $(HELP2MAN) --output=$@ +-$(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh +- $(update_mans) --help-option=--help-all libtool +-$(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in +- $(update_mans) libtoolize +- +- + ## ------------- ## + ## Installation. ## + ## ------------- ## diff --git a/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch b/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch deleted file mode 100644 index 879778c..0000000 --- a/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -For cross environment, it not possible to run the generated executable. -nstead use the build version of libtool to generate the man pages. - -Date: 2010/07/09 -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> - -Index: libtool-2.4.2/Makefile.am -=================================================================== ---- libtool-2.4.2.orig/Makefile.am -+++ libtool-2.4.2/Makefile.am -@@ -333,7 +333,7 @@ update_mans = \ - PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \ - $(HELP2MAN) --output=$@ - $(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh -- $(update_mans) --help-option=--help-all libtool -+ $(update_mans) --help-option=--help-all ${build_alias}-libtool - $(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in - $(update_mans) libtoolize - -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 03/15] bison: remove help2man dependency 2013-01-06 23:49 ` [PATCH v2 02/15] libtool: remove help2man dependency Marko Lindqvist @ 2013-01-06 23:49 ` Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 04/15] file: replace obsolete automake macros with working ones Marko Lindqvist 0 siblings, 1 reply; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core Remove manpage creation. It wasn't working because of help2man missing when bison is being built. This attempt to create manpages without help2man turns from no-op to hard error with automake-1.13. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- .../bison/bison/dont-depend-on-help2man.patch | 32 ++++++++++++++++++++ meta/recipes-devtools/bison/bison_2.7.bb | 7 +++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch diff --git a/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch b/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch new file mode 100644 index 0000000..21b44bf --- /dev/null +++ b/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch @@ -0,0 +1,32 @@ +Upstream-Status: Inappropriate + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd bison-2.7/doc/Makefile.am bison-2.7/doc/Makefile.am +--- bison-2.7/doc/Makefile.am 2012-12-09 17:51:03.000000000 +0200 ++++ bison-2.7/doc/Makefile.am 2013-01-02 06:49:50.804894071 +0200 +@@ -52,15 +52,11 @@ + ## Man Pages. ## + ## ----------- ## + +-dist_man_MANS = $(srcdir)/bison.1 +- +-EXTRA_DIST += $(dist_man_MANS:.1=.x) common.x +-MAINTAINERCLEANFILES += $(dist_man_MANS) ++EXTRA_DIST += bison.x common.x + + # Depend on configure to get version number changes. + common_dep = $(top_srcdir)/configure $(srcdir)/common.x + srcsrcdir = $(top_srcdir)/bin +-$(srcdir)/bison.1: $(common_dep) $(top_srcdir)/src/getargs.c + + # Differences to ignore when comparing the man page (the date). + remove_time_stamp = \ +@@ -94,8 +90,6 @@ + fi + $(AM_V_at)rm -f $@*.t + +-nodist_man_MANS = yacc.1 +- + ## ------------------------------ ## + ## Graphviz examples generation. ## + ## ------------------------------ ## diff --git a/meta/recipes-devtools/bison/bison_2.7.bb b/meta/recipes-devtools/bison/bison_2.7.bb index 9fb3884..ee2effb 100644 --- a/meta/recipes-devtools/bison/bison_2.7.bb +++ b/meta/recipes-devtools/bison/bison_2.7.bb @@ -9,9 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "devel" DEPENDS = "bison-native flex-native" +PR = "r1" + BASE_SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \ - file://m4.patch \ - " + file://m4.patch \ + file://dont-depend-on-help2man.patch \ + " SRC_URI = "${BASE_SRC_URI} \ file://fix_cross_manpage_building.patch \ -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 04/15] file: replace obsolete automake macros with working ones 2013-01-06 23:49 ` [PATCH v2 03/15] bison: " Marko Lindqvist @ 2013-01-06 23:49 ` Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 05/15] popt: disable tests Marko Lindqvist 2013-01-07 11:59 ` [PATCH v2 04/15] file: " Richard Purdie 0 siblings, 2 replies; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core Add obsolete-automake-macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- .../file/file/obsolete_automake_macros.patch | 15 +++++++++++++++ meta/recipes-devtools/file/file_5.11.bb | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/file/file/obsolete_automake_macros.patch diff --git a/meta/recipes-devtools/file/file/obsolete_automake_macros.patch b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch new file mode 100644 index 0000000..8b0d34c --- /dev/null +++ b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch @@ -0,0 +1,15 @@ +Upstream-Status: Fixed in file-5.12 + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd file-5.11/configure.ac file-5.11/configure.ac +--- file-5.11/configure.ac 2012-02-21 21:16:29.000000000 +0200 ++++ file-5.11/configure.ac 2013-01-02 07:18:23.004856505 +0200 +@@ -3,7 +3,7 @@ + AM_INIT_AUTOMAKE() + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_CONFIG_MACRO_DIR([m4]) + + AC_MSG_CHECKING(for builtin ELF support) diff --git a/meta/recipes-devtools/file/file_5.11.bb b/meta/recipes-devtools/file/file_5.11.bb index be6a863..52ae460 100644 --- a/meta/recipes-devtools/file/file_5.11.bb +++ b/meta/recipes-devtools/file/file_5.11.bb @@ -10,10 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03 DEPENDS = "zlib file-native" DEPENDS_class-native = "zlib-native" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ file://fix_version_check.patch \ + file://obsolete_automake_macros.patch \ file://dump \ file://filesystems" -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 05/15] popt: disable tests 2013-01-06 23:49 ` [PATCH v2 04/15] file: replace obsolete automake macros with working ones Marko Lindqvist @ 2013-01-06 23:49 ` Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 06/15] glib-2.0: replace obsolete automake macros with working ones Marko Lindqvist 2013-01-07 11:59 ` [PATCH v2 04/15] file: " Richard Purdie 1 sibling, 1 reply; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core Use of $(top_srcdir) in TESTS is an error causing automake-1.13 to abort. Disable the tests completely. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- meta/recipes-support/popt/popt/disable_tests.patch | 21 ++++++++++++++++++++ meta/recipes-support/popt/popt_1.16.bb | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/popt/popt/disable_tests.patch diff --git a/meta/recipes-support/popt/popt/disable_tests.patch b/meta/recipes-support/popt/popt/disable_tests.patch new file mode 100644 index 0000000..dedd061 --- /dev/null +++ b/meta/recipes-support/popt/popt/disable_tests.patch @@ -0,0 +1,21 @@ +Use of $(top_srcdir) in TESTS is an error which causes +automake-1.13 to abort. Just remove tests. + +Upstream-Status: Inappropriate + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd popt-1.16/Makefile.am popt-1.16/Makefile.am +--- popt-1.16/Makefile.am 2010-05-04 23:55:54.000000000 +0300 ++++ popt-1.16/Makefile.am 2013-01-02 13:34:29.540361391 +0200 +@@ -34,11 +34,6 @@ + + noinst_SCRIPTS = testit.sh + +-TESTS_ENVIRONMENT = \ +-test1="$(top_builddir)/test1" +- +-TESTS = $(top_srcdir)/testit.sh +- + include_HEADERS = popt.h + + usrlibdir = $(libdir) diff --git a/meta/recipes-support/popt/popt_1.16.bb b/meta/recipes-support/popt/popt_1.16.bb index 91b0d60..aa4e379 100644 --- a/meta/recipes-support/popt/popt_1.16.bb +++ b/meta/recipes-support/popt/popt_1.16.bb @@ -4,11 +4,12 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d" -PR = "r2" +PR = "r3" SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz \ file://pkgconfig_fix.patch \ file://popt_fix_for_automake-1.12.patch \ + file://disable_tests.patch \ " SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33" -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 06/15] glib-2.0: replace obsolete automake macros with working ones 2013-01-06 23:49 ` [PATCH v2 05/15] popt: disable tests Marko Lindqvist @ 2013-01-06 23:49 ` Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 07/15] libx11: disable tests Marko Lindqvist 0 siblings, 1 reply; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core Add obsolete-automake-macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- .../glib-2.0/glib-2.0/obsolete_automake_macros.patch | 13 +++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch diff --git a/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch b/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch new file mode 100644 index 0000000..e3b35bf --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch @@ -0,0 +1,13 @@ +Upstream-Status: Accepted (https://bugzilla.gnome.org/show_bug.cgi?id=691011) + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd glib-2.34.3/configure.ac glib-2.34.3/configure.ac +--- glib-2.34.3/configure.ac 2012-11-26 19:10:04.000000000 +0200 ++++ glib-2.34.3/configure.ac 2013-01-02 15:49:27.832183712 +0200 +@@ -291,7 +291,6 @@ + AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""]) + AC_LANG_RESTORE + +-AM_PROG_CC_STDC + AM_PROG_CC_C_O + AC_PROG_INSTALL diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb index 9854585..e1d44e2 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb @@ -1,6 +1,6 @@ require glib.inc -PR = "r0" +PR = "r1" PE = "1" DEPENDS += "libffi python-argparse-native zlib" @@ -12,6 +12,7 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1] SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://configure-libtool.patch \ file://glib-2.0_fix_for_x32.patch \ + file://obsolete_automake_macros.patch \ file://Makefile-ptest.patch \ file://run-ptest \ " -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 07/15] libx11: disable tests 2013-01-06 23:49 ` [PATCH v2 06/15] glib-2.0: replace obsolete automake macros with working ones Marko Lindqvist @ 2013-01-06 23:49 ` Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 08/15] libpng: replace obsolete automake macros with working ones Marko Lindqvist 0 siblings, 1 reply; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core Use of $(srcdir) in TESTS is an error causing automake-1.13 to abort. Disable the tests completely. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- .../xorg-lib/libx11/disable_tests.patch | 17 +++++++++++++++++ meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 6 ++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch diff --git a/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch new file mode 100644 index 0000000..8f5e531 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch @@ -0,0 +1,17 @@ +Upstream-Status: Inappropriate + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am +--- libX11-1.5.0/nls/Makefile.am 2012-06-02 09:37:18.000000000 +0300 ++++ libX11-1.5.0/nls/Makefile.am 2013-01-02 16:10:24.960156131 +0200 +@@ -36,11 +36,6 @@ + < locale.dir.l1 > locale.dir.l2 + cat locale.dir.l2 locale.dir.l1 > locale.dir + +-if HAVE_PERL +-TESTS_ENVIRONMENT = $(PERL) +-TESTS = $(srcdir)/compose-check.pl +-endif HAVE_PERL +- + + # Per-locale data files diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb index 94e2051..7f18824 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb @@ -1,11 +1,13 @@ require libx11.inc inherit gettext -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" BBCLASSEXTEND = "native nativesdk" -SRC_URI += "file://keysymdef_include.patch" +SRC_URI += "file://keysymdef_include.patch \ + file://disable_tests.patch \ + " SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 08/15] libpng: replace obsolete automake macros with working ones 2013-01-06 23:49 ` [PATCH v2 07/15] libx11: disable tests Marko Lindqvist @ 2013-01-06 23:49 ` Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 09/15] libusb: " Marko Lindqvist 0 siblings, 1 reply; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core Add obsolete-automake-macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- .../libpng/libpng-1.5.13/obsolete_automake_macros.patch | 15 +++++++++++++++ meta/recipes-multimedia/libpng/libpng_1.5.13.bb | 6 ++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-multimedia/libpng/libpng-1.5.13/obsolete_automake_macros.patch diff --git a/meta/recipes-multimedia/libpng/libpng-1.5.13/obsolete_automake_macros.patch b/meta/recipes-multimedia/libpng/libpng-1.5.13/obsolete_automake_macros.patch new file mode 100644 index 0000000..8d58e8d --- /dev/null +++ b/meta/recipes-multimedia/libpng/libpng-1.5.13/obsolete_automake_macros.patch @@ -0,0 +1,15 @@ +Upstream-status: Accepted + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd libpng-1.5.13/configure.ac libpng-1.5.13/configure.ac +--- libpng-1.5.13/configure.ac 2012-09-27 14:21:22.000000000 +0300 ++++ libpng-1.5.13/configure.ac 2013-01-02 16:50:27.876103410 +0200 +@@ -31,7 +31,7 @@ + dnl End of version number stuff + + AC_CONFIG_SRCDIR([pngget.c]) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + # Checks for programs. + AC_LANG([C]) diff --git a/meta/recipes-multimedia/libpng/libpng_1.5.13.bb b/meta/recipes-multimedia/libpng/libpng_1.5.13.bb index 04bb932..b9f64f6 100644 --- a/meta/recipes-multimedia/libpng/libpng_1.5.13.bb +++ b/meta/recipes-multimedia/libpng/libpng_1.5.13.bb @@ -6,10 +6,12 @@ LICENSE = "Libpng" LIC_FILES_CHKSUM = "file://LICENSE;md5=00b5b35853278d508806c2e5860e82cb \ file://png.h;beginline=207;endline=321;md5=50e583fb60bb36f37ab5023b2a3715d1" DEPENDS = "zlib" -PR = "r1" +PR = "r2" LIBV = "15" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ + file://obsolete_automake_macros.patch \ + " SRC_URI[md5sum] = "0b607a685da977f1bfc96e1c47055183" SRC_URI[sha256sum] = "b843f9cb01d10ae22acd9aaf58aceaa4a6aeb9cf78943b41588004b271257aee" -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 09/15] libusb: replace obsolete automake macros with working ones 2013-01-06 23:49 ` [PATCH v2 08/15] libpng: replace obsolete automake macros with working ones Marko Lindqvist @ 2013-01-06 23:49 ` Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 10/15] pixman: " Marko Lindqvist 0 siblings, 1 reply; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core Add obsolete-automake-macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- .../libusb-compat-0.1.4/obsolete_automake_macros.patch | 15 +++++++++++++++ meta/recipes-support/libusb/libusb-compat_0.1.4.bb | 3 ++- .../libusb/libusb1-1.0.9/obsolete_automake_macros.patch | 15 +++++++++++++++ meta/recipes-support/libusb/libusb1_1.0.9.bb | 6 ++++-- 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch create mode 100644 meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch diff --git a/meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch b/meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch new file mode 100644 index 0000000..bb07f81 --- /dev/null +++ b/meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch @@ -0,0 +1,15 @@ +Upstream-status: Submitted (https://libusb.org/ticket/161) + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd libusb-compat-0.1.4/configure.ac libusb-compat-0.1.4/configure.ac +--- libusb-compat-0.1.4/configure.ac 2012-04-24 08:45:46.000000000 +0300 ++++ libusb-compat-0.1.4/configure.ac 2013-01-02 16:41:30.440115202 +0200 +@@ -1,7 +1,7 @@ + AC_INIT([libusb-compat], [0.1.4]) + AM_INIT_AUTOMAKE + AC_CONFIG_SRCDIR([libusb/core.c]) +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR([m4]) + + AC_PREREQ([2.50]) diff --git a/meta/recipes-support/libusb/libusb-compat_0.1.4.bb b/meta/recipes-support/libusb/libusb-compat_0.1.4.bb index 24df017..d743072 100644 --- a/meta/recipes-support/libusb/libusb-compat_0.1.4.bb +++ b/meta/recipes-support/libusb/libusb-compat_0.1.4.bb @@ -16,9 +16,10 @@ PROVIDES = "libusb virtual/libusb0" BBCLASSEXTEND = "native nativesdk" PE = "1" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ + file://obsolete_automake_macros.patch \ " # file://0.1.0-beta1-gcc3.4-fix.patch" diff --git a/meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch b/meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch new file mode 100644 index 0000000..02a447c --- /dev/null +++ b/meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch @@ -0,0 +1,15 @@ +Upstream-Status: Submitted (https://libusb.org/ticket/159) + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd libusb-1.0.9/configure.ac libusb-1.0.9/configure.ac +--- libusb-1.0.9/configure.ac 2012-04-20 09:44:27.000000000 +0300 ++++ libusb-1.0.9/configure.ac 2013-01-02 16:36:44.152121483 +0200 +@@ -31,7 +31,7 @@ + + AC_CONFIG_SRCDIR([libusb/core.c]) + AC_CONFIG_MACRO_DIR([m4]) +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + + AC_PREREQ([2.50]) diff --git a/meta/recipes-support/libusb/libusb1_1.0.9.bb b/meta/recipes-support/libusb/libusb1_1.0.9.bb index e002374..012ac27 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.9.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.9.bb @@ -8,9 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" BBCLASSEXTEND = "native nativesdk" -PR = "r0" +PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ + file://obsolete_automake_macros.patch \ + " SRC_URI[md5sum] = "7f5a02375ad960d4e33a6dae7d63cfcb" SRC_URI[sha256sum] = "e920eedc2d06b09606611c99ec7304413c6784cba6e33928e78243d323195f9b" -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 10/15] pixman: replace obsolete automake macros with working ones 2013-01-06 23:49 ` [PATCH v2 09/15] libusb: " Marko Lindqvist @ 2013-01-06 23:49 ` Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 11/15] libid3tag: " Marko Lindqvist 0 siblings, 1 reply; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core Add obsolete-automake-macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- .../xorg-lib/pixman/obsolete_automake_macros.patch | 14 ++++++++++++++ meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/xorg-lib/pixman/obsolete_automake_macros.patch diff --git a/meta/recipes-graphics/xorg-lib/pixman/obsolete_automake_macros.patch b/meta/recipes-graphics/xorg-lib/pixman/obsolete_automake_macros.patch new file mode 100644 index 0000000..7a4237c --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/pixman/obsolete_automake_macros.patch @@ -0,0 +1,14 @@ +Upstream-Status: Accepted + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd pixman-0.28.2/configure.ac pixman-0.28.2/configure.ac +--- pixman-0.28.2/configure.ac 2012-12-10 13:46:36.000000000 +0200 ++++ pixman-0.28.2/configure.ac 2013-01-03 06:31:07.574848073 +0200 +@@ -64,7 +64,7 @@ + # Suppress verbose compile lines + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_CANONICAL_HOST diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb b/meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb index 4ec0490..59c2691 100644 --- a/meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb +++ b/meta/recipes-graphics/xorg-lib/pixman_0.28.2.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \ DEPENDS += "zlib libpng" BBCLASSEXTEND = "native nativesdk" -PR = "r0" +PR = "r1" PE = "1" @@ -31,6 +31,7 @@ EXTRA_OECONF_class-native = "--disable-gtk" SRC_URI += "\ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ file://Generic-C-implementation-of-pixman_blt-with-overlapp.patch \ + file://obsolete_automake_macros.patch \ " SRC_URI[md5sum] = "f6e3294c4edb7b6bca8459e604286348" -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 11/15] libid3tag: replace obsolete automake macros with working ones 2013-01-06 23:49 ` [PATCH v2 10/15] pixman: " Marko Lindqvist @ 2013-01-06 23:49 ` Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 12/15] libgcrypt: " Marko Lindqvist 0 siblings, 1 reply; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core Add obsolete-automake-macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- .../libid3tag/libid3tag/obsolete_automake_macros.patch | 14 ++++++++++++++ meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch b/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch new file mode 100644 index 0000000..2ecd478 --- /dev/null +++ b/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch @@ -0,0 +1,14 @@ +Upstream-Status: Submitted (https://sourceforge.net/tracker/?func=detail&aid=3599280&group_id=12349&atid=112349) + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd libid3tag-0.15.1b/configure.ac libid3tag-0.15.1b/configure.ac +--- libid3tag-0.15.1b/configure.ac 2004-01-24 01:22:46.000000000 +0200 ++++ libid3tag-0.15.1b/configure.ac 2013-01-03 06:41:02.734835014 +0200 +@@ -28,7 +28,7 @@ + + AM_INIT_AUTOMAKE + +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + + dnl System type. diff --git a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb index dbcf2da..d81f58b 100644 --- a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb +++ b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb @@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://version.h;beginline=1;endline=8;md5=86ac68b67f054b7afde9e149bbc3fe63" SECTION = "libs" DEPENDS = "zlib gperf-native" -PR = "r6" +PR = "r7" SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz \ - file://addpkgconfig.patch" + file://addpkgconfig.patch \ + file://obsolete_automake_macros.patch \ +" SRC_URI[md5sum] = "e5808ad997ba32c498803822078748c3" SRC_URI[sha256sum] = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151" -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 12/15] libgcrypt: replace obsolete automake macros with working ones 2013-01-06 23:49 ` [PATCH v2 11/15] libid3tag: " Marko Lindqvist @ 2013-01-06 23:49 ` Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 13/15] gnutls: " Marko Lindqvist 0 siblings, 1 reply; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core Add obsolete-automake-macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- .../libgcrypt-1.5.0/obsolete_automake_macros.patch | 15 +++++++++++++++ meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch diff --git a/meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch b/meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch new file mode 100644 index 0000000..31b63e4 --- /dev/null +++ b/meta/recipes-support/libgcrypt/libgcrypt-1.5.0/obsolete_automake_macros.patch @@ -0,0 +1,15 @@ +Upstream-Status: Submitted (https://bugs.g10code.com/gnupg/issue1459) + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd libgcrypt-1.5.0/configure.ac libgcrypt-1.5.0/configure.ac +--- libgcrypt-1.5.0/configure.ac 2011-06-29 11:53:22.000000000 +0300 ++++ libgcrypt-1.5.0/configure.ac 2013-01-03 07:12:26.854793677 +0200 +@@ -59,7 +59,7 @@ + + AC_CONFIG_SRCDIR([src/libgcrypt.vers]) + AM_INIT_AUTOMAKE([]) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_LIBOBJ_DIR([compat]) + AC_CANONICAL_HOST diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb index e552f79..058c2d5 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.5.0.bb @@ -1,6 +1,8 @@ require libgcrypt.inc -PR = "r1" +PR = "r2" + +SRC_URI += "file://obsolete_automake_macros.patch" SRC_URI[md5sum] = "78f8f8bec4580f75b25816f7896d0389" SRC_URI[sha256sum] = "cc98b1f64c9ae3b0185099cef4ac6c436a849095edf87f34157f0bb10e187990" -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 13/15] gnutls: replace obsolete automake macros with working ones 2013-01-06 23:49 ` [PATCH v2 12/15] libgcrypt: " Marko Lindqvist @ 2013-01-06 23:49 ` Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 14/15] libtasn1: remove help2man dependency Marko Lindqvist 0 siblings, 1 reply; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core Add obsolete-automake-macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- .../gnutls/gnutls/obsolete_automake_macros.patch | 39 ++++++++++++++++++++ meta/recipes-support/gnutls/gnutls_2.12.21.bb | 3 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch diff --git a/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch b/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch new file mode 100644 index 0000000..be01303 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch @@ -0,0 +1,39 @@ +Upstream-Status: Submitted (https://savannah.gnu.org/support/index.php?108219) + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd gnutls-2.12.21/configure.ac gnutls-2.12.21/configure.ac +--- gnutls-2.12.21/configure.ac 2013-01-03 07:52:42.182740682 +0200 ++++ gnutls-2.12.21/configure.ac 2013-01-03 07:53:41.662739378 +0200 +@@ -29,7 +29,7 @@ + AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Wno-override]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12 +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_MSG_RESULT([*** + *** Checking for compilation programs... +diff -Nurd gnutls-2.12.21/lib/configure.ac gnutls-2.12.21/lib/configure.ac +--- gnutls-2.12.21/lib/configure.ac 2013-01-03 07:52:42.182740682 +0200 ++++ gnutls-2.12.21/lib/configure.ac 2013-01-03 08:07:38.150721027 +0200 +@@ -29,7 +29,7 @@ + AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12 +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_PROG_CC + lgl_EARLY +diff -Nurd gnutls-2.12.21/libextra/configure.ac gnutls-2.12.21/libextra/configure.ac +--- gnutls-2.12.21/libextra/configure.ac 2013-01-03 07:52:42.182740682 +0200 ++++ gnutls-2.12.21/libextra/configure.ac 2013-01-03 08:10:56.654716669 +0200 +@@ -29,7 +29,7 @@ + AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12 +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_PROG_CC + xgl_EARLY diff --git a/meta/recipes-support/gnutls/gnutls_2.12.21.bb b/meta/recipes-support/gnutls/gnutls_2.12.21.bb index 6b2ef3a..7b4426b 100644 --- a/meta/recipes-support/gnutls/gnutls_2.12.21.bb +++ b/meta/recipes-support/gnutls/gnutls_2.12.21.bb @@ -1,12 +1,13 @@ require gnutls.inc -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" SRC_URI += "file://gnutls-openssl.patch \ file://correct_rpl_gettimeofday_signature.patch \ file://configure-fix.patch \ file://gnutls_fix_for_automake_1.12.1.patch \ file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \ + file://obsolete_automake_macros.patch \ ${@['', 'file://fix-gettext-version.patch'][bb.data.inherits_class('native', d) or (not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1))]} \ file://remove-gets.patch \ " -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 14/15] libtasn1: remove help2man dependency 2013-01-06 23:49 ` [PATCH v2 13/15] gnutls: " Marko Lindqvist @ 2013-01-06 23:49 ` Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 15/15] flac: replace obsolete automake macros with working ones Marko Lindqvist 0 siblings, 1 reply; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core Remove manpage creation. It wasn't working because of help2man missing when libtasn1 is being built. This attempt to create manpages without help2man turns from no-op to hard error with automake-1.13. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- .../gnutls/libtasn1/dont-depend-on-help2man.patch | 14 ++++++++++++++ meta/recipes-support/gnutls/libtasn1_2.14.bb | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch diff --git a/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch b/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch new file mode 100644 index 0000000..2ac89f3 --- /dev/null +++ b/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch @@ -0,0 +1,14 @@ +Upstream-Status: Inappropriate + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd libtasn1-2.14/doc/Makefile.am libtasn1-2.14/doc/Makefile.am +--- libtasn1-2.14/doc/Makefile.am 2012-09-24 15:08:42.000000000 +0300 ++++ libtasn1-2.14/doc/Makefile.am 2013-01-03 07:35:26.702763403 +0200 +@@ -31,7 +31,7 @@ + AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) \ + --no-split --number-sections --css-include=texinfo.css + +-dist_man_MANS = $(gdoc_MANS) asn1Parser.1 asn1Coding.1 asn1Decoding.1 ++dist_man_MANS = $(gdoc_MANS) + + HELP2MAN_OPTS = --info-page libtasn1 diff --git a/meta/recipes-support/gnutls/libtasn1_2.14.bb b/meta/recipes-support/gnutls/libtasn1_2.14.bb index 3f49bfa..68d5ddf 100644 --- a/meta/recipes-support/gnutls/libtasn1_2.14.bb +++ b/meta/recipes-support/gnutls/libtasn1_2.14.bb @@ -8,10 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ file://README;endline=8;md5=c3803a3e8ca5ab5eb1e5912faa405351" -PR = "r0" +PR = "r1" SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ file://libtasn1_fix_for_automake_1.12.patch \ + file://dont-depend-on-help2man.patch \ " SRC_URI[md5sum] = "a08c5936f9672da9b05691785499bcc3" -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH v2 15/15] flac: replace obsolete automake macros with working ones 2013-01-06 23:49 ` [PATCH v2 14/15] libtasn1: remove help2man dependency Marko Lindqvist @ 2013-01-06 23:49 ` Marko Lindqvist 0 siblings, 0 replies; 23+ messages in thread From: Marko Lindqvist @ 2013-01-06 23:49 UTC (permalink / raw) To: openembedded-core Add obsolete-automake-macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- .../flac/flac-1.2.1/obsolete_automake_macros.patch | 14 ++++++++++++++ meta/recipes-multimedia/flac/flac_1.2.1.bb | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch b/meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch new file mode 100644 index 0000000..6eea418 --- /dev/null +++ b/meta/recipes-multimedia/flac/flac-1.2.1/obsolete_automake_macros.patch @@ -0,0 +1,14 @@ +Upstream-Status: Fixed (https://sourceforge.net/p/flac/support-requests/146/) + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd flac-1.2.1/configure.in flac-1.2.1/configure.in +--- flac-1.2.1/configure.in 2007-09-13 18:48:42.000000000 +0300 ++++ flac-1.2.1/configure.in 2013-01-03 08:20:07.454704587 +0200 +@@ -44,7 +44,7 @@ + AC_CHECK_SIZEOF(void*,0) + + #@@@ new name is AC_CONFIG_HEADERS +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_C_BIGENDIAN diff --git a/meta/recipes-multimedia/flac/flac_1.2.1.bb b/meta/recipes-multimedia/flac/flac_1.2.1.bb index 903de6d..7fd7a03 100644 --- a/meta/recipes-multimedia/flac/flac_1.2.1.bb +++ b/meta/recipes-multimedia/flac/flac_1.2.1.bb @@ -14,14 +14,16 @@ LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=ad1419ecc56e060eccf8184a87c4285f \ file://include/FLAC/all.h;beginline=64;endline=69;md5=64474f2b22e9e77b28d8b8b25c983a48" DEPENDS = "libogg" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \ file://disable-xmms-plugin.patch \ file://flac-gcc43-fixes.patch \ file://xmms.m4 \ file://0001-No-AltiVec-on-SPE.patch \ - file://asm-pic.patch" + file://asm-pic.patch \ + file://obsolete_automake_macros.patch \ +" SRC_URI[md5sum] = "153c8b15a54da428d1f0fadc756c22c7" SRC_URI[sha256sum] = "9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf" -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH v2 04/15] file: replace obsolete automake macros with working ones 2013-01-06 23:49 ` [PATCH v2 04/15] file: replace obsolete automake macros with working ones Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 05/15] popt: disable tests Marko Lindqvist @ 2013-01-07 11:59 ` Richard Purdie 2013-01-07 12:11 ` Marko Lindqvist 1 sibling, 1 reply; 23+ messages in thread From: Richard Purdie @ 2013-01-07 11:59 UTC (permalink / raw) To: Marko Lindqvist; +Cc: openembedded-core On Mon, 2013-01-07 at 01:49 +0200, Marko Lindqvist wrote: > Add obsolete-automake-macros.patch that replaces automake macros > no longer supported by automake-1.13 with modern constructs. > > Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> > --- > .../file/file/obsolete_automake_macros.patch | 15 +++++++++++++++ > meta/recipes-devtools/file/file_5.11.bb | 3 ++- > 2 files changed, 17 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-devtools/file/file/obsolete_automake_macros.patch > > diff --git a/meta/recipes-devtools/file/file/obsolete_automake_macros.patch b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch > new file mode 100644 > index 0000000..8b0d34c > --- /dev/null > +++ b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch > @@ -0,0 +1,15 @@ > +Upstream-Status: Fixed in file-5.12 Can we use a standard syntax for this, something like: Upstream-Status: Backport (fixed in file-5.12) (as mentioned in https://wiki.yoctoproject.org/wiki/Contribution_Guidelines#Patch_Header_Recommendations) for the same reasons as I just mentioned to Marcin - so we can tell from scripts what status patches have and it helps reviewers in future know this can be dropped. The aim is to push patches upstream and standard syntax means we can get real numbers for how many patches we're carrying. I appreciate you can read and tell from the above what it means but I really want to try and use a consistent syntax. Cheers, Richard ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 04/15] file: replace obsolete automake macros with working ones 2013-01-07 11:59 ` [PATCH v2 04/15] file: " Richard Purdie @ 2013-01-07 12:11 ` Marko Lindqvist 2013-01-07 12:16 ` Burton, Ross 0 siblings, 1 reply; 23+ messages in thread From: Marko Lindqvist @ 2013-01-07 12:11 UTC (permalink / raw) To: Richard Purdie; +Cc: openembedded-core On 7 January 2013 13:59, Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > On Mon, 2013-01-07 at 01:49 +0200, Marko Lindqvist wrote: >> Add obsolete-automake-macros.patch that replaces automake macros >> no longer supported by automake-1.13 with modern constructs. >> >> Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> >> --- >> .../file/file/obsolete_automake_macros.patch | 15 +++++++++++++++ >> meta/recipes-devtools/file/file_5.11.bb | 3 ++- >> 2 files changed, 17 insertions(+), 1 deletion(-) >> create mode 100644 meta/recipes-devtools/file/file/obsolete_automake_macros.patch >> >> diff --git a/meta/recipes-devtools/file/file/obsolete_automake_macros.patch b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch >> new file mode 100644 >> index 0000000..8b0d34c >> --- /dev/null >> +++ b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch >> @@ -0,0 +1,15 @@ >> +Upstream-Status: Fixed in file-5.12 > > Can we use a standard syntax for this, something like: > > Upstream-Status: Backport (fixed in file-5.12) > > (as mentioned in > https://wiki.yoctoproject.org/wiki/Contribution_Guidelines#Patch_Header_Recommendations) What's the correct status for fixes that are not really backports, but have happened independently in oe and upstream? - If practically identical, still mark as "Backport"? - If different solution, "Inappropriate [not needed]"? - ML ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 04/15] file: replace obsolete automake macros with working ones 2013-01-07 12:11 ` Marko Lindqvist @ 2013-01-07 12:16 ` Burton, Ross 2013-01-07 12:18 ` Otavio Salvador 0 siblings, 1 reply; 23+ messages in thread From: Burton, Ross @ 2013-01-07 12:16 UTC (permalink / raw) To: Marko Lindqvist; +Cc: openembedded-core On 7 January 2013 12:11, Marko Lindqvist <cazfi74@gmail.com> wrote: > What's the correct status for fixes that are not really backports, > but have happened independently in oe and upstream? > - If practically identical, still mark as "Backport"? > - If different solution, "Inappropriate [not needed]"? If you did it and then later discovered it's happened upstream independently, it's essentially a backport. Ross ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 04/15] file: replace obsolete automake macros with working ones 2013-01-07 12:16 ` Burton, Ross @ 2013-01-07 12:18 ` Otavio Salvador 2013-01-07 13:46 ` Richard Purdie 0 siblings, 1 reply; 23+ messages in thread From: Otavio Salvador @ 2013-01-07 12:18 UTC (permalink / raw) To: Burton, Ross; +Cc: Patches and discussions about the oe-core layer On Mon, Jan 7, 2013 at 10:16 AM, Burton, Ross <ross.burton@intel.com> wrote: > On 7 January 2013 12:11, Marko Lindqvist <cazfi74@gmail.com> wrote: >> What's the correct status for fixes that are not really backports, >> but have happened independently in oe and upstream? >> - If practically identical, still mark as "Backport"? >> - If different solution, "Inappropriate [not needed]"? > > If you did it and then later discovered it's happened upstream > independently, it's essentially a backport. Maybe it'd be better to not patch at all and update to the newer recipe version? -- Otavio Salvador O.S. Systems E-mail: otavio@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 04/15] file: replace obsolete automake macros with working ones 2013-01-07 12:18 ` Otavio Salvador @ 2013-01-07 13:46 ` Richard Purdie 2013-01-07 15:58 ` Otavio Salvador 0 siblings, 1 reply; 23+ messages in thread From: Richard Purdie @ 2013-01-07 13:46 UTC (permalink / raw) To: Otavio Salvador; +Cc: the oe-core layer, Patches On Mon, 2013-01-07 at 10:18 -0200, Otavio Salvador wrote: > On Mon, Jan 7, 2013 at 10:16 AM, Burton, Ross <ross.burton@intel.com> wrote: > > On 7 January 2013 12:11, Marko Lindqvist <cazfi74@gmail.com> wrote: > >> What's the correct status for fixes that are not really backports, > >> but have happened independently in oe and upstream? > >> - If practically identical, still mark as "Backport"? > >> - If different solution, "Inappropriate [not needed]"? > > > > If you did it and then later discovered it's happened upstream > > independently, it's essentially a backport. The best thing is to consider how we use the information. I'd happily accept "Backport" in this case as meaning "the upstream latest version has equivalent functionality". You can note the status after the word to give specifics if needed. > Maybe it'd be better to not patch at all and update to the newer > recipe version? I don't think that is a reasonable policy in all cases. I'm not going to block automake on all upstreams making new releases for example. Cheers, Richard ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 04/15] file: replace obsolete automake macros with working ones 2013-01-07 13:46 ` Richard Purdie @ 2013-01-07 15:58 ` Otavio Salvador 2013-01-07 16:26 ` Marko Lindqvist 0 siblings, 1 reply; 23+ messages in thread From: Otavio Salvador @ 2013-01-07 15:58 UTC (permalink / raw) To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer On Mon, Jan 7, 2013 at 11:46 AM, Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > On Mon, 2013-01-07 at 10:18 -0200, Otavio Salvador wrote: >> On Mon, Jan 7, 2013 at 10:16 AM, Burton, Ross <ross.burton@intel.com> wrote: >> > On 7 January 2013 12:11, Marko Lindqvist <cazfi74@gmail.com> wrote: >> >> What's the correct status for fixes that are not really backports, >> >> but have happened independently in oe and upstream? >> >> - If practically identical, still mark as "Backport"? >> >> - If different solution, "Inappropriate [not needed]"? >> > >> > If you did it and then later discovered it's happened upstream >> > independently, it's essentially a backport. > > The best thing is to consider how we use the information. I'd happily > accept "Backport" in this case as meaning "the upstream latest version > has equivalent functionality". You can note the status after the word to > give specifics if needed. > >> Maybe it'd be better to not patch at all and update to the newer >> recipe version? > > I don't think that is a reasonable policy in all cases. I'm not going to > block automake on all upstreams making new releases for example. Sure but if there're a new release with the fix it is better to upgrade than backport the fix (with exceptions, of course). My point is: it is good to verify if there're a new release and use it if possible. Otherwise backport the fix. -- Otavio Salvador O.S. Systems E-mail: otavio@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH v2 04/15] file: replace obsolete automake macros with working ones 2013-01-07 15:58 ` Otavio Salvador @ 2013-01-07 16:26 ` Marko Lindqvist 0 siblings, 0 replies; 23+ messages in thread From: Marko Lindqvist @ 2013-01-07 16:26 UTC (permalink / raw) To: Otavio Salvador; +Cc: Patches and discussions about the oe-core layer On 7 January 2013 17:58, Otavio Salvador <otavio@ossystems.com.br> wrote: > On Mon, Jan 7, 2013 at 11:46 AM, Richard Purdie > <richard.purdie@linuxfoundation.org> wrote: >> On Mon, 2013-01-07 at 10:18 -0200, Otavio Salvador wrote: >>> On Mon, Jan 7, 2013 at 10:16 AM, Burton, Ross <ross.burton@intel.com> wrote: >>> > On 7 January 2013 12:11, Marko Lindqvist <cazfi74@gmail.com> wrote: >>> >> What's the correct status for fixes that are not really backports, >>> >> but have happened independently in oe and upstream? >>> >> - If practically identical, still mark as "Backport"? >>> >> - If different solution, "Inappropriate [not needed]"? >>> > >>> > If you did it and then later discovered it's happened upstream >>> > independently, it's essentially a backport. >> >> The best thing is to consider how we use the information. I'd happily >> accept "Backport" in this case as meaning "the upstream latest version >> has equivalent functionality". You can note the status after the word to >> give specifics if needed. >> >>> Maybe it'd be better to not patch at all and update to the newer >>> recipe version? >> >> I don't think that is a reasonable policy in all cases. I'm not going to >> block automake on all upstreams making new releases for example. > > Sure but if there're a new release with the fix it is better to > upgrade than backport the fix (with exceptions, of course). > > My point is: it is good to verify if there're a new release and use it > if possible. Otherwise backport the fix. That's what I'm being doing. Even if new upstream release doesn't have fix for the particular problem, I try to update to it first. Rationale being that if update is going to happen at some point anyway, it's less work to do it without need to update the bugfix to apply to new version. That is: total work of "update + fix" vs "fix + update + port the fix". - ML ^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2013-01-07 16:41 UTC | newest] Thread overview: 23+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-01-06 23:49 Prepare recipes for automake-1.13 (batch 1 / v2) Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 01/15] pkg-config: replace obsolete automake macros with working ones Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 02/15] libtool: remove help2man dependency Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 03/15] bison: " Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 04/15] file: replace obsolete automake macros with working ones Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 05/15] popt: disable tests Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 06/15] glib-2.0: replace obsolete automake macros with working ones Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 07/15] libx11: disable tests Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 08/15] libpng: replace obsolete automake macros with working ones Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 09/15] libusb: " Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 10/15] pixman: " Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 11/15] libid3tag: " Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 12/15] libgcrypt: " Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 13/15] gnutls: " Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 14/15] libtasn1: remove help2man dependency Marko Lindqvist 2013-01-06 23:49 ` [PATCH v2 15/15] flac: replace obsolete automake macros with working ones Marko Lindqvist 2013-01-07 11:59 ` [PATCH v2 04/15] file: " Richard Purdie 2013-01-07 12:11 ` Marko Lindqvist 2013-01-07 12:16 ` Burton, Ross 2013-01-07 12:18 ` Otavio Salvador 2013-01-07 13:46 ` Richard Purdie 2013-01-07 15:58 ` Otavio Salvador 2013-01-07 16:26 ` Marko Lindqvist
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox