Skip to contentSkip to conversation

Pull request #17

PATCH In review Martin Jansa 2 participants 4 messages Jun 8, 2011

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

cover Pull request #17

The following changes since commit 92492f8596ae74044f0cbf1813c22ba6f18f742c:

systemd-compat-units: disable old style 'networking' script for the time being (2011-06-06 13:08:15 +0200)

are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/meta-oe
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/meta-oe

Martin Jansa (1):
check: import from OE rev d4f0211e2078d5033ae0dee74664de5520d8392d

Michael 'Mickey' Lauer (1):
vala[-native]: 0.12.0 -> 0.12.1

 meta-oe/recipes-devtools/vala/vala_0.12.0.bb       |    7 -------
 meta-oe/recipes-devtools/vala/vala_0.12.1.bb       |    7 +++++++
 meta-oe/recipes-support/check/check_0.9.5.bb       |   20 ++++++++++++++++++++
 ...graphs-in-macro-names-to-unbreak-autoconf.patch |   18 ++++++++++++++++++
 .../check/files/configure_fix.patch                |   12 ++++++++++++
 5 files changed, 57 insertions(+), 7 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/vala/vala_0.12.0.bb
 create mode 100644 meta-oe/recipes-devtools/vala/vala_0.12.1.bb
 create mode 100644 meta-oe/recipes-support/check/check_0.9.5.bb
 create mode 100644 meta-oe/recipes-support/check/files/check-m4-am-path-check-use-quadrigraphs-in-macro-names-to-unbreak-autoconf.patch
 create mode 100644 meta-oe/recipes-support/check/files/configure_fix.patch
Signature · 1 line
1.7.5.3
author
#1 lore raw

PATCH 1/2 vala[-native]: 0.12.0 -> 0.12.1

From: Michael 'Mickey' Lauer <[email protected]>

Signed-off-by Martin Jansa <[email protected]>
---
 meta-oe/recipes-devtools/vala/vala_0.12.0.bb |    7 -------
 meta-oe/recipes-devtools/vala/vala_0.12.1.bb |    7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/vala/vala_0.12.0.bb
 create mode 100644 meta-oe/recipes-devtools/vala/vala_0.12.1.bb
meta-oe/recipes-devtools/vala/vala_0.12.0.bb deleted +0 -7
deleted file mode 100644
index 9ca89db..0000000
@@ -1,7 +0,0 @@
-require vala.inc
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/vala/0.12/vala-0.12.0.tar.bz2"
-
-FILES_${PN} += "${datadir}/vala-0.12/vapi"
-
-SRC_URI[md5sum] = "b11fafaa705085342156312e356b6ff2"
-SRC_URI[sha256sum] = "9a398e16fba2c78c9bcadb05e489c9bc318e34901d43451ac5d2ce4bc46b1225"
meta-oe/recipes-devtools/vala/vala_0.12.1.bb new file +7 -0
new file mode 100644
index 0000000..1049ed6
@@ -0,0 +1,7 @@
+require vala.inc
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/vala/0.12/vala-${PV}.tar.bz2"
+
+FILES_${PN} += "${datadir}/vala-0.12/vapi"
+
+SRC_URI[md5sum] = "bf35262cc611de447147d01cbac33767"
+SRC_URI[sha256sum] = "d9a2be21bb8ab88eab838e7f3a4d0aaa2a1fddf35615dca32bef6a0051f58ea8"
Signature · 1 line
1.7.5.3
author
#2 lore raw

PATCH 2/2 check: import from OE rev d4f0211e2078d5033ae0dee74664de5520d8392d

Signed-off-by Martin Jansa <[email protected]>
---
 meta-oe/recipes-support/check/check_0.9.5.bb       |   20 ++++++++++++++++++++
 ...graphs-in-macro-names-to-unbreak-autoconf.patch |   18 ++++++++++++++++++
 .../check/files/configure_fix.patch                |   12 ++++++++++++
 3 files changed, 50 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/check/check_0.9.5.bb
 create mode 100644 meta-oe/recipes-support/check/files/check-m4-am-path-check-use-quadrigraphs-in-macro-names-to-unbreak-autoconf.patch
 create mode 100644 meta-oe/recipes-support/check/files/configure_fix.patch
meta-oe/recipes-support/check/check_0.9.5.bb new file +20 -0
new file mode 100644
index 0000000..132b563
@@ -0,0 +1,20 @@
+DESCRIPTION = "a unit test framework for C"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1"
+PRIORITY = "optional"
+SECTION = "devel"
+
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/check/check-${PV}.tar.gz \
+           file://configure_fix.patch \
+           file://check-m4-am-path-check-use-quadrigraphs-in-macro-names-to-unbreak-autoconf.patch \
+          "
+S = "${WORKDIR}/check-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF += "--enable-plain-docdir"
+
+SRC_URI[md5sum] = "30143c7974b547a12a7da47809a90951"
+SRC_URI[sha256sum] = "961b3c66869018d02226bbbc394e79362cd898962ce810bce8417b3c497f7ad6"
meta-oe/recipes-support/check/files/check-m4-am-path-check-use-quadrigraphs-in-macro-names-to-unbreak-autoconf.patch new file +18 -0
new file mode 100644
index 0000000..61bdf1d
@@ -0,0 +1,18 @@
+Imported from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=395466
+
+-Khem
+Index: check-0.9.5/check.m4
+===================================================================
+--- check-0.9.5.orig/check.m4
++++ check-0.9.5/check.m4
+@@ -4,8 +4,8 @@ dnl
+ 
+ AC_DEFUN([AM_PATH_CHECK],
+ [
+-  AC_MSG_WARN([[AM_PATH_CHECK() is deprecated]])
+-  AC_MSG_WARN([[use PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) instead]])
++  AC_MSG_WARN([A@&t@M_PATH_CHECK() is deprecated])
++  AC_MSG_WARN([[use P@&t@KG_CHECK_MODULES([CHECK], [check >= 0.9.4]) instead]])
+   AC_ARG_WITH([check],
+   [  --with-check=PATH       prefix where check is installed [default=auto]])
+
meta-oe/recipes-support/check/files/configure_fix.patch new file +12 -0
new file mode 100644
index 0000000..3e79319
@@ -0,0 +1,12 @@
+Index: check-0.9.5/configure.ac
+===================================================================
+--- check-0.9.5.orig/configure.ac	2008-10-29 04:09:50.000000000 +0000
++++ check-0.9.5/configure.ac	2008-10-29 04:10:06.000000000 +0000
+@@ -71,6 +71,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_LIBTOOL
++AM_PROG_CC_C_O
+ if test -n "$GCC"; then
+   CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings"
+ fi
Signature · 1 line
1.7.5.3
#3 lore raw
In reply to Martin Jansa

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 8 lines · Martin Jansa

The following changes since commit 92492f8596ae74044f0cbf1813c22ba6f18f742c:

systemd-compat-units: disable old style 'networking' script for the time being (2011-06-06 13:08:15 +0200)

are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/meta-oe
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/meta-oe

Quoted 5 lines

Martin Jansa (1):
check: import from OE rev d4f0211e2078d5033ae0dee74664de5520d8392d

Michael 'Mickey' Lauer (1):
vala[-native]: 0.12.0 -> 0.12.1

Thanks, merged.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFN7xceMkyGM64RGpERAo9YAKCVNVnlQBjIzCQjvBnhEGImDmlTjQCdFNfV kAnSBQmnUuN2P0or7NSZRbI=
=6ytZ
-----END PGP SIGNATURE-----