* [PATCH 0/3] Fix patches including po.m4
@ 2013-09-23 18:31 Saul Wold
2013-09-23 18:31 ` [PATCH 1/3] texi2html: remove po.m4 patch Saul Wold
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Saul Wold @ 2013-09-23 18:31 UTC (permalink / raw)
To: openembedded-core
This series fixes a patching issue I saw recently, it seems to occur
when you have an already configured ${S}, which causes the po.m4 to
be removed. Since the autotools.bbclass removed the bad version of po.m4
let's just remove the patches for them here also
Saul Wold (3):
texi2html: remove po.m4 patch
wget: remove po.m4 patch
gnutls: remove po.m4 patch
.../texi2html/texi2html-5.0/fix_gettext_version.patch | 13 -------------
meta/recipes-extended/wget/wget-1.14/fix_makefile.patch | 13 -------------
.../recipes-support/gnutls/gnutls/fix-gettext-version.patch | 13 -------------
3 files changed, 39 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/3] texi2html: remove po.m4 patch
2013-09-23 18:31 [PATCH 0/3] Fix patches including po.m4 Saul Wold
@ 2013-09-23 18:31 ` Saul Wold
2013-09-23 18:31 ` [PATCH 2/3] wget: " Saul Wold
2013-09-23 18:31 ` [PATCH 3/3] gnutls: " Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2013-09-23 18:31 UTC (permalink / raw)
To: openembedded-core
With the seperation of the sourcedir (S) and builddir (B), the po.m4 file is
removed from S during autotools aclocal-copy creation and there no need to
patch it since the aclocal-copy version is correct (has gettext version 0.18
specificed
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../texi2html/texi2html-5.0/fix_gettext_version.patch | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch b/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch
index 35c119b..d1c9fe5 100644
--- a/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch
+++ b/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch
@@ -29,16 +29,3 @@ Index: texi2html-5.0/po_messages/Makefile.in.in
PACKAGE = @PACKAGE@
VERSION = @VERSION@
-Index: texi2html-5.0/m4/po.m4
-===================================================================
---- texi2html-5.0.orig/m4/po.m4
-+++ texi2html-5.0/m4/po.m4
-@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
-
- dnl Release version of the gettext macros. This is used to ensure that
- dnl the gettext macros and po/Makefile.in.in are in sync.
-- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
-+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
-
- dnl Perform the following tests also if --disable-nls has been given,
- dnl because they are needed for "make dist" to work.
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] wget: remove po.m4 patch
2013-09-23 18:31 [PATCH 0/3] Fix patches including po.m4 Saul Wold
2013-09-23 18:31 ` [PATCH 1/3] texi2html: remove po.m4 patch Saul Wold
@ 2013-09-23 18:31 ` Saul Wold
2013-09-23 18:31 ` [PATCH 3/3] gnutls: " Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2013-09-23 18:31 UTC (permalink / raw)
To: openembedded-core
With the seperation of the sourcedir (S) and builddir (B), the po.m4 file is
removed from S during autotools aclocal-copy creation and there no need to
patch it since the aclocal-copy version is correct (has gettext version 0.18
specificed
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/wget/wget-1.14/fix_makefile.patch | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/meta/recipes-extended/wget/wget-1.14/fix_makefile.patch b/meta/recipes-extended/wget/wget-1.14/fix_makefile.patch
index b76a017..8ad7c62 100644
--- a/meta/recipes-extended/wget/wget-1.14/fix_makefile.patch
+++ b/meta/recipes-extended/wget/wget-1.14/fix_makefile.patch
@@ -31,16 +31,3 @@ Index: wget-1.12/configure.ac
AC_PROG_RANLIB
-Index: wget-1.12/m4/po.m4
-===================================================================
---- wget-1.12.orig/m4/po.m4 2009-09-04 09:31:54.000000000 -0700
-+++ wget-1.12/m4/po.m4 2011-10-19 20:33:53.426812176 -0700
-@@ -30,7 +30,7 @@
-
- dnl Release version of the gettext macros. This is used to ensure that
- dnl the gettext macros and po/Makefile.in.in are in sync.
-- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
-+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
-
- dnl Perform the following tests also if --disable-nls has been given,
- dnl because they are needed for "make dist" to work.
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] gnutls: remove po.m4 patch
2013-09-23 18:31 [PATCH 0/3] Fix patches including po.m4 Saul Wold
2013-09-23 18:31 ` [PATCH 1/3] texi2html: remove po.m4 patch Saul Wold
2013-09-23 18:31 ` [PATCH 2/3] wget: " Saul Wold
@ 2013-09-23 18:31 ` Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2013-09-23 18:31 UTC (permalink / raw)
To: openembedded-core
With the seperation of the sourcedir (S) and builddir (B), the po.m4 file is
removed from S during autotools aclocal-copy creation and there no need to
patch it since the aclocal-copy version is correct (has gettext version 0.18
specificed
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../recipes-support/gnutls/gnutls/fix-gettext-version.patch | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/meta/recipes-support/gnutls/gnutls/fix-gettext-version.patch b/meta/recipes-support/gnutls/gnutls/fix-gettext-version.patch
index 4c9137a..23db7e3 100644
--- a/meta/recipes-support/gnutls/gnutls/fix-gettext-version.patch
+++ b/meta/recipes-support/gnutls/gnutls/fix-gettext-version.patch
@@ -18,19 +18,6 @@ Index: gnutls-2.12.14/lib/po/Makefile.in.in
PACKAGE = @PACKAGE@
VERSION = @VERSION@
-Index: gnutls-2.12.14/lib/m4/po.m4
-===================================================================
---- gnutls-2.12.14.orig/lib/m4/po.m4
-+++ gnutls-2.12.14/lib/m4/po.m4
-@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
-
- dnl Release version of the gettext macros. This is used to ensure that
- dnl the gettext macros and po/Makefile.in.in are in sync.
-- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
-+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
-
- dnl Perform the following tests also if --disable-nls has been given,
- dnl because they are needed for "make dist" to work.
Index: gnutls-2.12.14/lib/configure.ac
===================================================================
--- gnutls-2.12.14.orig/lib/configure.ac
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-09-23 18:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-23 18:31 [PATCH 0/3] Fix patches including po.m4 Saul Wold
2013-09-23 18:31 ` [PATCH 1/3] texi2html: remove po.m4 patch Saul Wold
2013-09-23 18:31 ` [PATCH 2/3] wget: " Saul Wold
2013-09-23 18:31 ` [PATCH 3/3] gnutls: " Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox