summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-08-14 12:40:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-16 11:14:32 +0100
commit060df944c27a30cd4c172995801436d1f5b13d9e (patch)
tree12c0913acd0208eb99116571bbcd996ed61dd07e /meta
parent2176388bfc27e0c6c97767ccb7bce2ebc4b16648 (diff)
downloadpoky-060df944c27a30cd4c172995801436d1f5b13d9e.tar.gz
libmatchbox: upgrade to 1.11
Remove check.m4 as libmatchbox uses the check.pc instead of a m4 file now. (From OE-Core rev: 4f51bf23346947cd47e7ac9e1290e799f3c20708) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/libmatchbox/files/check.m4133
-rw-r--r--meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb (renamed from meta/recipes-graphics/libmatchbox/libmatchbox_1.10.bb)15
2 files changed, 3 insertions, 145 deletions
diff --git a/meta/recipes-graphics/libmatchbox/files/check.m4 b/meta/recipes-graphics/libmatchbox/files/check.m4
deleted file mode 100644
index 97bfd9c478..0000000000
--- a/meta/recipes-graphics/libmatchbox/files/check.m4
+++ /dev/null
@@ -1,133 +0,0 @@
1dnl AM_PATH_CHECK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
2dnl Test for check, and define CHECK_CFLAGS and CHECK_LIBS
3dnl
4
5AC_DEFUN(AM_PATH_CHECK,
6[
7 AC_ARG_WITH(check,
8 [ --with-check=PATH prefix where check is installed [default=auto]])
9
10 min_check_version=ifelse([$1], ,0.8.2,$1)
11
12 AC_MSG_CHECKING(for check - version >= $min_check_version)
13
14 if test x$with_check = xno; then
15 AC_MSG_RESULT(disabled)
16 ifelse([$3], , AC_MSG_ERROR([disabling check is not supported]), [$3])
17 else
18 if test "x$with_check" != x; then
19 CHECK_CFLAGS="-I$with_check/include"
20 CHECK_LIBS="-L$with_check/lib -lcheck"
21 else
22 CHECK_CFLAGS=""
23 CHECK_LIBS="-lcheck"
24 fi
25
26 ac_save_CFLAGS="$CFLAGS"
27 ac_save_LIBS="$LIBS"
28
29 CFLAGS="$CFLAGS $CHECK_CFLAGS"
30 LIBS="$CHECK_LIBS $LIBS"
31
32 rm -f conf.check-test
33 AC_TRY_RUN([
34#include <stdio.h>
35#include <stdlib.h>
36
37#include <check.h>
38
39int main ()
40{
41 int major, minor, micro;
42 char *tmp_version;
43
44 system ("touch conf.check-test");
45
46 /* HP/UX 9 (%@#!) writes to sscanf strings */
47 tmp_version = strdup("$min_check_version");
48 if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
49 printf("%s, bad version string\n", "$min_check_version");
50 return 1;
51 }
52
53 if ((CHECK_MAJOR_VERSION != check_major_version) ||
54 (CHECK_MINOR_VERSION != check_minor_version) ||
55 (CHECK_MICRO_VERSION != check_micro_version))
56 {
57 printf("\n*** The check header file (version %d.%d.%d) does not match\n",
58 CHECK_MAJOR_VERSION, CHECK_MINOR_VERSION, CHECK_MICRO_VERSION);
59 printf("*** the check library (version %d.%d.%d).\n",
60 check_major_version, check_minor_version, check_micro_version);
61 return 1;
62 }
63
64 if ((check_major_version > major) ||
65 ((check_major_version == major) && (check_minor_version > minor)) ||
66 ((check_major_version == major) && (check_minor_version == minor) && (check_micro_version >= micro)))
67 {
68 return 0;
69 }
70 else
71 {
72 printf("\n*** An old version of check (%d.%d.%d) was found.\n",
73 check_major_version, check_minor_version, check_micro_version);
74 printf("*** You need a version of check being at least %d.%d.%d.\n", major, minor, micro);
75 printf("***\n");
76 printf("*** If you have already installed a sufficiently new version, this error\n");
77 printf("*** probably means that the wrong copy of the check library and header\n");
78 printf("*** file is being found. Rerun configure with the --with-check=PATH option\n");
79 printf("*** to specify the prefix where the correct version was installed.\n");
80 }
81
82 return 1;
83}
84],, no_check=yes, [echo $ac_n "cross compiling; assumed OK... $ac_c"])
85
86 CFLAGS="$ac_save_CFLAGS"
87 LIBS="$ac_save_LIBS"
88
89 if test "x$no_check" = x ; then
90 AC_MSG_RESULT(yes)
91 ifelse([$2], , :, [$2])
92 else
93 AC_MSG_RESULT(no)
94 if test -f conf.check-test ; then
95 :
96 else
97 echo "*** Could not run check test program, checking why..."
98 CFLAGS="$CFLAGS $CHECK_CFLAGS"
99 LIBS="$CHECK_LIBS $LIBS"
100 AC_TRY_LINK([
101#include <stdio.h>
102#include <stdlib.h>
103
104#include <check.h>
105], , [ echo "*** The test program compiled, but did not run. This usually means"
106 echo "*** that the run-time linker is not finding check. You'll need to set your"
107 echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
108 echo "*** to the installed location Also, make sure you have run ldconfig if that"
109 echo "*** is required on your system"
110 echo "***"
111 echo "*** If you have an old version installed, it is best to remove it, although"
112 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
113 [ echo "*** The test program failed to compile or link. See the file config.log for"
114 echo "*** the exact error that occured." ])
115
116 CFLAGS="$ac_save_CFLAGS"
117 LIBS="$ac_save_LIBS"
118 fi
119
120 CHECK_CFLAGS=""
121 CHECK_LIBS=""
122
123 rm -f conf.check-test
124 ifelse([$3], , AC_MSG_ERROR([check not found]), [$3])
125 fi
126
127 AC_SUBST(CHECK_CFLAGS)
128 AC_SUBST(CHECK_LIBS)
129
130 rm -f conf.check-test
131
132 fi
133])
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.10.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
index a1531b838e..244a495002 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.10.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
@@ -10,19 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
10 10
11DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification" 11DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification"
12 12
13SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ 13SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.bz2"
14 file://check.m4" 14SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7"
15SRC_URI[md5sum] = "042c5874631dfb95151aa793dc1434b8" 15SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53"
16SRC_URI[sha256sum] = "d14d4844840e3e1e4faa9f9e90060915d39b6033f6979464ab3ea3fe1c4f9293"
17
18PR = "r0"
19 16
20inherit autotools pkgconfig 17inherit autotools pkgconfig
21 18
22S = "${WORKDIR}/libmatchbox-${PV}"
23
24do_configure_prepend () {
25 cp ${WORKDIR}/check.m4 ${S}/
26}
27
28EXTRA_OECONF = "--enable-jpeg --enable-expat --enable-xsettings --enable-startup-notification" 19EXTRA_OECONF = "--enable-jpeg --enable-expat --enable-xsettings --enable-startup-notification"