[PATCH] bison: split inttypes*.m4 into separate patch

[PATCH] bison: split inttypes*.m4 into separate patch

[Bernhard Reutner-Fischer]

..to avoid conflicts with bison-2.4.1

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 recipes/bison/bison_2.0.bb         |    4 ++-
 recipes/bison/bison_2.3.bb         |    4 ++-
 recipes/bison/files/inttypes.patch |   70 ++++++++++++++++++++++++++++++++++++
 recipes/bison/files/m4.patch       |   65 ---------------------------------
 4 files changed, 76 insertions(+), 67 deletions(-)
 create mode 100644 recipes/bison/files/inttypes.patch

diff --git a/recipes/bison/bison_2.0.bb b/recipes/bison/bison_2.0.bb
index edf549f..db3db31 100644
--- a/recipes/bison/bison_2.0.bb
+++ b/recipes/bison/bison_2.0.bb
@@ -5,6 +5,8 @@ SECTION = "devel"
 PRIORITY = "optional"
 
 SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
-	   file://m4.patch;patch=1"
+	   file://m4.patch;patch=1 \
+	   file://inttypes.patch;patch=1 \
+	  "
 
 inherit autotools
diff --git a/recipes/bison/bison_2.3.bb b/recipes/bison/bison_2.3.bb
index 729756b..66e5d58 100644
--- a/recipes/bison/bison_2.3.bb
+++ b/recipes/bison/bison_2.3.bb
@@ -7,7 +7,9 @@ PRIORITY = "optional"
 PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
-	   file://m4.patch;patch=1"
+	   file://m4.patch;patch=1 \
+	   file://inttypes.patch;patch=1 \
+	  "
 
 inherit autotools
 
diff --git a/recipes/bison/files/inttypes.patch b/recipes/bison/files/inttypes.patch
new file mode 100644
index 0000000..e583241
--- /dev/null
+++ b/recipes/bison/files/inttypes.patch
@@ -0,0 +1,70 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- /dev/null
++++ bison-1.875/m4/inttypes-pri.m4
+@@ -0,0 +1,32 @@
++# inttypes-pri.m4 serial 1 (gettext-0.11.4)
++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 Bruno Haible.
++
++# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
++# macros to non-string values.  This is the case on AIX 4.3.3.
++
++AC_DEFUN([gt_INTTYPES_PRI],
++[
++  AC_REQUIRE([gt_HEADER_INTTYPES_H])
++  if test $gt_cv_header_inttypes_h = yes; then
++    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
++      gt_cv_inttypes_pri_broken,
++      [
++        AC_TRY_COMPILE([#include <inttypes.h>
++#ifdef PRId32
++char *p = PRId32;
++#endif
++], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
++      ])
++  fi
++  if test "$gt_cv_inttypes_pri_broken" = yes; then
++    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
++      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
++  fi
++])
+--- /dev/null
++++ bison-1.875/m4/inttypes.m4
+@@ -0,0 +1,27 @@
++# inttypes.m4 serial 1 (gettext-0.11.4)
++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.
++
++# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
++# <sys/types.h>.
++
++AC_DEFUN([gt_HEADER_INTTYPES_H],
++[
++  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
++  [
++    AC_TRY_COMPILE(
++      [#include <sys/types.h>
++#include <inttypes.h>],
++      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
++  ])
++  if test $gt_cv_header_inttypes_h = yes; then
++    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
++      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
++  fi
++])
diff --git a/recipes/bison/files/m4.patch b/recipes/bison/files/m4.patch
index b62fe89..b060532 100644
--- a/recipes/bison/files/m4.patch
+++ b/recipes/bison/files/m4.patch
@@ -4,41 +4,6 @@
 #
 
 --- /dev/null
-+++ bison-1.875/m4/inttypes-pri.m4
-@@ -0,0 +1,32 @@
-+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-+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 Bruno Haible.
-+
-+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-+# macros to non-string values.  This is the case on AIX 4.3.3.
-+
-+AC_DEFUN([gt_INTTYPES_PRI],
-+[
-+  AC_REQUIRE([gt_HEADER_INTTYPES_H])
-+  if test $gt_cv_header_inttypes_h = yes; then
-+    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
-+      gt_cv_inttypes_pri_broken,
-+      [
-+        AC_TRY_COMPILE([#include <inttypes.h>
-+#ifdef PRId32
-+char *p = PRId32;
-+#endif
-+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
-+      ])
-+  fi
-+  if test "$gt_cv_inttypes_pri_broken" = yes; then
-+    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
-+      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
-+  fi
-+])
---- /dev/null
 +++ bison-1.875/m4/lcmessage.m4
 @@ -0,0 +1,32 @@
 +# lcmessage.m4 serial 3 (gettext-0.11.3)
@@ -529,36 +494,6 @@
 +  rm -f conf.glibtest
 +])
 --- /dev/null
-+++ bison-1.875/m4/inttypes.m4
-@@ -0,0 +1,27 @@
-+# inttypes.m4 serial 1 (gettext-0.11.4)
-+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.
-+
-+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-+# <sys/types.h>.
-+
-+AC_DEFUN([gt_HEADER_INTTYPES_H],
-+[
-+  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
-+  [
-+    AC_TRY_COMPILE(
-+      [#include <sys/types.h>
-+#include <inttypes.h>],
-+      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
-+  ])
-+  if test $gt_cv_header_inttypes_h = yes; then
-+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
-+      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
-+  fi
-+])
---- /dev/null
 +++ bison-1.875/m4/isc-posix.m4
 @@ -0,0 +1,26 @@
 +# isc-posix.m4 serial 2 (gettext-0.11.2)
-- 
1.6.6

Re: [PATCH] bison: split inttypes*.m4 into separate patch

[Bernhard Reutner-Fischer]

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

On Sun, Feb 21, 2010 at 04:33:10PM +0100, Bernhard Reutner-Fischer wrote:
>..to avoid conflicts with bison-2.4.1

ping? Should i send the respective 2.4.1 bump too?
Attaching them, S-O-B is the same and i don't claim anything, please consider..
TIA,
>Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
>---
> recipes/bison/bison_2.0.bb         |    4 ++-
> recipes/bison/bison_2.3.bb         |    4 ++-
> recipes/bison/files/inttypes.patch |   70 ++++++++++++++++++++++++++++++++++++
> recipes/bison/files/m4.patch       |   65 ---------------------------------
> 4 files changed, 76 insertions(+), 67 deletions(-)
> create mode 100644 recipes/bison/files/inttypes.patch
>
>diff --git a/recipes/bison/bison_2.0.bb b/recipes/bison/bison_2.0.bb
>index edf549f..db3db31 100644
>--- a/recipes/bison/bison_2.0.bb
>+++ b/recipes/bison/bison_2.0.bb
>@@ -5,6 +5,8 @@ SECTION = "devel"
> PRIORITY = "optional"
> 
> SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
>-	   file://m4.patch;patch=1"
>+	   file://m4.patch;patch=1 \
>+	   file://inttypes.patch;patch=1 \
>+	  "
> 
> inherit autotools
>diff --git a/recipes/bison/bison_2.3.bb b/recipes/bison/bison_2.3.bb
>index 729756b..66e5d58 100644
>--- a/recipes/bison/bison_2.3.bb
>+++ b/recipes/bison/bison_2.3.bb
>@@ -7,7 +7,9 @@ PRIORITY = "optional"
> PR = "r1"
> 
> SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
>-	   file://m4.patch;patch=1"
>+	   file://m4.patch;patch=1 \
>+	   file://inttypes.patch;patch=1 \
>+	  "
> 
> inherit autotools
> 
>diff --git a/recipes/bison/files/inttypes.patch b/recipes/bison/files/inttypes.patch
>new file mode 100644
>index 0000000..e583241
>--- /dev/null
>+++ b/recipes/bison/files/inttypes.patch
>@@ -0,0 +1,70 @@
>+
>+#
>+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
>+#
>+
>+--- /dev/null
>++++ bison-1.875/m4/inttypes-pri.m4
>+@@ -0,0 +1,32 @@
>++# inttypes-pri.m4 serial 1 (gettext-0.11.4)
>++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 Bruno Haible.
>++
>++# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
>++# macros to non-string values.  This is the case on AIX 4.3.3.
>++
>++AC_DEFUN([gt_INTTYPES_PRI],
>++[
>++  AC_REQUIRE([gt_HEADER_INTTYPES_H])
>++  if test $gt_cv_header_inttypes_h = yes; then
>++    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
>++      gt_cv_inttypes_pri_broken,
>++      [
>++        AC_TRY_COMPILE([#include <inttypes.h>
>++#ifdef PRId32
>++char *p = PRId32;
>++#endif
>++], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
>++      ])
>++  fi
>++  if test "$gt_cv_inttypes_pri_broken" = yes; then
>++    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
>++      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
>++  fi
>++])
>+--- /dev/null
>++++ bison-1.875/m4/inttypes.m4
>+@@ -0,0 +1,27 @@
>++# inttypes.m4 serial 1 (gettext-0.11.4)
>++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.
>++
>++# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
>++# <sys/types.h>.
>++
>++AC_DEFUN([gt_HEADER_INTTYPES_H],
>++[
>++  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
>++  [
>++    AC_TRY_COMPILE(
>++      [#include <sys/types.h>
>++#include <inttypes.h>],
>++      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
>++  ])
>++  if test $gt_cv_header_inttypes_h = yes; then
>++    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
>++      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
>++  fi
>++])
>diff --git a/recipes/bison/files/m4.patch b/recipes/bison/files/m4.patch
>index b62fe89..b060532 100644
>--- a/recipes/bison/files/m4.patch
>+++ b/recipes/bison/files/m4.patch
>@@ -4,41 +4,6 @@
> #
> 
> --- /dev/null
>-+++ bison-1.875/m4/inttypes-pri.m4
>-@@ -0,0 +1,32 @@
>-+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
>-+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 Bruno Haible.
>-+
>-+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
>-+# macros to non-string values.  This is the case on AIX 4.3.3.
>-+
>-+AC_DEFUN([gt_INTTYPES_PRI],
>-+[
>-+  AC_REQUIRE([gt_HEADER_INTTYPES_H])
>-+  if test $gt_cv_header_inttypes_h = yes; then
>-+    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
>-+      gt_cv_inttypes_pri_broken,
>-+      [
>-+        AC_TRY_COMPILE([#include <inttypes.h>
>-+#ifdef PRId32
>-+char *p = PRId32;
>-+#endif
>-+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
>-+      ])
>-+  fi
>-+  if test "$gt_cv_inttypes_pri_broken" = yes; then
>-+    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
>-+      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
>-+  fi
>-+])
>---- /dev/null
> +++ bison-1.875/m4/lcmessage.m4
> @@ -0,0 +1,32 @@
> +# lcmessage.m4 serial 3 (gettext-0.11.3)
>@@ -529,36 +494,6 @@
> +  rm -f conf.glibtest
> +])
> --- /dev/null
>-+++ bison-1.875/m4/inttypes.m4
>-@@ -0,0 +1,27 @@
>-+# inttypes.m4 serial 1 (gettext-0.11.4)
>-+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.
>-+
>-+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
>-+# <sys/types.h>.
>-+
>-+AC_DEFUN([gt_HEADER_INTTYPES_H],
>-+[
>-+  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
>-+  [
>-+    AC_TRY_COMPILE(
>-+      [#include <sys/types.h>
>-+#include <inttypes.h>],
>-+      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
>-+  ])
>-+  if test $gt_cv_header_inttypes_h = yes; then
>-+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
>-+      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
>-+  fi
>-+])
>---- /dev/null
> +++ bison-1.875/m4/isc-posix.m4
> @@ -0,0 +1,26 @@
> +# isc-posix.m4 serial 2 (gettext-0.11.2)
>-- 
>1.6.6
>

[-- Attachment #2: bison_2.4.1.bb --]
[-- Type: text/plain, Size: 483 bytes --]

DESCRIPTION = "GNU Project parser generator (yacc replacement)."
HOMEPAGE = "http://www.gnu.org/software/bison/"
LICENSE = "GPL"
SECTION = "devel"
PRIORITY = "optional"
DEFAULT_PREFERENCE = "-666"

SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.bz2;name=bison \
	   file://m4.patch;patch=1 \
	  "
SRC_URI[bison.md5sum] = "84e80a2a192c1a4c02d43fbf2bcc4ca4"
SRC_URI[bison.sha256sum] = "2354469782149e36c644ae7c3e5105895424ed21cda5c05b591cb3dc17068e6b"

inherit autotools

[-- Attachment #3: bison-native_2.4.1.bb --]
[-- Type: text/plain, Size: 725 bytes --]

require bison_${PV}.bb
SECTION = "devel"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/bison-${PV}"
S = "${WORKDIR}/bison-${PV}"
PR="r0"
DEFAULT_PREFERENCE = "-666"

inherit native autotools

do_stage() {
	rm -f ${STAGING_BINDIR}/yacc
	rm -f ${STAGING_BINDIR}/bison
	install -m 0755 src/bison ${STAGING_BINDIR}/
	cat >${STAGING_BINDIR}/yacc <<EOF
#!/bin/sh
exec ${STAGING_BINDIR}/bison -y "\$@"
EOF
	chmod a+rx ${STAGING_BINDIR}/yacc
	install -d ${STAGING_DATADIR}/bison/m4sugar
	install -m 0755 data/c.m4 data/c++.m4 data/glr.c data/glr.cc data/lalr1.cc data/location.cc data/yacc.c ${STAGING_DATADIR}/bison/

	install -m 0755 data/m4sugar/m4sugar.m4 ${STAGING_DATADIR}/bison/m4sugar/
}

Re: [PATCH] bison: split inttypes*.m4 into separate patch

[Marcin Juszkiewicz]

Dnia piątek, 5 marca 2010 o 22:01:11 Bernhard Reutner-Fischer napisał(a):

> Should i send the respective 2.4.1 bump too?

Please adapt it to current recipe of bison and I will push it.

Regards, 
-- 
JID:      hrw@jabber.org
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz