Message ID | 1350833261-8401-15-git-send-email-diorcet.yann@gmail.com |
---|---|
State | Accepted |
Delegated to: | Esben Haabendal |
Headers | show |
Yann Diorcet <diorcet.yann@gmail.com> writes: > From: Yann Diorcet <yann.diorcet@belledonne-communications.com> > > Remove dist-lzma from AM_INIT_AUTOMAKE: may fails on darwin libtool > --- > recipes/libtool/libtool-2.2.10/lzma_removed.patch | 15 +++++++++++++++ > recipes/libtool/libtool_2.2.10.oe | 2 +- > 2 files changed, 16 insertions(+), 1 deletion(-) > create mode 100644 recipes/libtool/libtool-2.2.10/lzma_removed.patch > > diff --git a/recipes/libtool/libtool-2.2.10/lzma_removed.patch b/recipes/libtool/libtool-2.2.10/lzma_removed.patch > new file mode 100644 > index 0000000..52ffa6d > --- /dev/null > +++ b/recipes/libtool/libtool-2.2.10/lzma_removed.patch > @@ -0,0 +1,15 @@ > +diff -urN libtool-2.2.10/configure.ac libtool-2.2.10.mod/configure.ac > +--- libtool-2.2.10/configure.ac 2010-06-09 15:00:04.000000000 +0200 > ++++ libtool-2.2.10.mod/configure.ac 2012-10-10 01:35:44.000000000 +0200 > +@@ -122,7 +122,7 @@ > + > + dnl These are bootstrap requirements! Once built, libtool may work with > + dnl much older releases of autoconf and automake. See release notes. > +-AM_INIT_AUTOMAKE([1.10.1 gnu subdir-objects dist-lzma]) > ++AM_INIT_AUTOMAKE([1.10.1 gnu subdir-objects]) > + > + dnl We use m4sh to generate libtool's portable shell scripts > + AC_SUBST([M4SH], ['$(AUTOM4TE) --language=m4sh']) > +Binary files libtool-2.2.10/libltdl/._argz.c and libtool-2.2.10.mod/libltdl/._argz.c differ > +Binary files libtool-2.2.10/libltdl/._argz_.h and libtool-2.2.10.mod/libltdl/._argz_.h differ > +Binary files libtool-2.2.10/tests/cdemo/._foo.c and libtool-2.2.10.mod/tests/cdemo/._foo.c differ > diff --git a/recipes/libtool/libtool_2.2.10.oe b/recipes/libtool/libtool_2.2.10.oe > index 15b811b..743ec51 100644 > --- a/recipes/libtool/libtool_2.2.10.oe > +++ b/recipes/libtool/libtool_2.2.10.oe > @@ -6,7 +6,7 @@ require libtool-2.2.inc > libtool_cross_compile = "" > libtool_cross_compile:cross = "file://cross_compile.patch" > libtool_cross_compile:sdk-cross = "file://cross_compile.patch" > -SRC_URI += "${libtool_cross_compile}" > +SRC_URI += "file://lzma_removed.patch ${libtool_cross_compile}" > > addtask bootstrap before configure after fetch unpack patch stage > do_bootstrap[dirs] = "${S}" Merged to master, thanks. /Esben
diff --git a/recipes/libtool/libtool-2.2.10/lzma_removed.patch b/recipes/libtool/libtool-2.2.10/lzma_removed.patch new file mode 100644 index 0000000..52ffa6d --- /dev/null +++ b/recipes/libtool/libtool-2.2.10/lzma_removed.patch @@ -0,0 +1,15 @@ +diff -urN libtool-2.2.10/configure.ac libtool-2.2.10.mod/configure.ac +--- libtool-2.2.10/configure.ac 2010-06-09 15:00:04.000000000 +0200 ++++ libtool-2.2.10.mod/configure.ac 2012-10-10 01:35:44.000000000 +0200 +@@ -122,7 +122,7 @@ + + dnl These are bootstrap requirements! Once built, libtool may work with + dnl much older releases of autoconf and automake. See release notes. +-AM_INIT_AUTOMAKE([1.10.1 gnu subdir-objects dist-lzma]) ++AM_INIT_AUTOMAKE([1.10.1 gnu subdir-objects]) + + dnl We use m4sh to generate libtool's portable shell scripts + AC_SUBST([M4SH], ['$(AUTOM4TE) --language=m4sh']) +Binary files libtool-2.2.10/libltdl/._argz.c and libtool-2.2.10.mod/libltdl/._argz.c differ +Binary files libtool-2.2.10/libltdl/._argz_.h and libtool-2.2.10.mod/libltdl/._argz_.h differ +Binary files libtool-2.2.10/tests/cdemo/._foo.c and libtool-2.2.10.mod/tests/cdemo/._foo.c differ diff --git a/recipes/libtool/libtool_2.2.10.oe b/recipes/libtool/libtool_2.2.10.oe index 15b811b..743ec51 100644 --- a/recipes/libtool/libtool_2.2.10.oe +++ b/recipes/libtool/libtool_2.2.10.oe @@ -6,7 +6,7 @@ require libtool-2.2.inc libtool_cross_compile = "" libtool_cross_compile:cross = "file://cross_compile.patch" libtool_cross_compile:sdk-cross = "file://cross_compile.patch" -SRC_URI += "${libtool_cross_compile}" +SRC_URI += "file://lzma_removed.patch ${libtool_cross_compile}" addtask bootstrap before configure after fetch unpack patch stage do_bootstrap[dirs] = "${S}"
From: Yann Diorcet <yann.diorcet@belledonne-communications.com> Remove dist-lzma from AM_INIT_AUTOMAKE: may fails on darwin libtool --- recipes/libtool/libtool-2.2.10/lzma_removed.patch | 15 +++++++++++++++ recipes/libtool/libtool_2.2.10.oe | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 recipes/libtool/libtool-2.2.10/lzma_removed.patch