diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-07-28 15:03:51 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-08-20 09:57:41 +0200 |
| commit | f11e9d2a3bffcd4b8e5db47b683eafed62176989 (patch) | |
| tree | a929b2ba44762deb167a6a59941db47972129cc0 /meta-efl | |
| parent | a87b248abc48f79b01265f98795c30741722c730 (diff) | |
| download | meta-openembedded-f11e9d2a3bffcd4b8e5db47b683eafed62176989.tar.gz | |
edbus: drop patch applied upstream r74447
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-efl')
| -rw-r--r-- | meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch | 51 | ||||
| -rw-r--r-- | meta-efl/recipes-efl/efl/edbus_svn.bb | 1 |
2 files changed, 0 insertions, 52 deletions
diff --git a/meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch b/meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch deleted file mode 100644 index db1b15ddeb..0000000000 --- a/meta-efl/recipes-efl/efl/edbus/0001-edbus-configure.ac-fixup-performance_test.patch +++ /dev/null | |||
| @@ -1,51 +0,0 @@ | |||
| 1 | From 133d67d43fc21674f525da9ecd530f2b73fbdeea Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 3 | Date: Thu, 26 Jul 2012 10:35:35 +0200 | ||
| 4 | Subject: [PATCH] edbus: configure.ac fixup performance_test | ||
| 5 | |||
| 6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 7 | --- | ||
| 8 | configure.ac | 6 ++++-- | ||
| 9 | 1 files changed, 4 insertions(+), 2 deletions(-) | ||
| 10 | |||
| 11 | diff --git a/configure.ac b/configure.ac | ||
| 12 | index d798484..d0fc4ee 100644 | ||
| 13 | --- a/configure.ac | ||
| 14 | +++ b/configure.ac | ||
| 15 | @@ -69,6 +69,7 @@ want_ehal="yes" | ||
| 16 | want_enotify="yes" | ||
| 17 | want_eofono="yes" | ||
| 18 | want_eukit="yes" | ||
| 19 | +want_performance_test="yes" | ||
| 20 | |||
| 21 | case "$host_os" in | ||
| 22 | mingw*) | ||
| 23 | @@ -78,6 +79,7 @@ case "$host_os" in | ||
| 24 | want_enotify="no" | ||
| 25 | want_eofono="no" | ||
| 26 | want_eukit="no" | ||
| 27 | + want_performance_test="no" | ||
| 28 | ;; | ||
| 29 | esac | ||
| 30 | |||
| 31 | @@ -127,7 +129,7 @@ AC_ARG_ENABLE([eukit], | ||
| 32 | AC_ARG_ENABLE([performance_test], | ||
| 33 | [AC_HELP_STRING([--disable-performance_test], [Disable performance build])], | ||
| 34 | [enable_performance_test=$enableval], | ||
| 35 | - [enable_performance_test="${want_eukit}"]) | ||
| 36 | + [enable_performance_test="${want_performance_test}"]) | ||
| 37 | |||
| 38 | |||
| 39 | ### Checks for programs | ||
| 40 | @@ -277,7 +279,7 @@ fi | ||
| 41 | |||
| 42 | if test "x${have_edbus_performance_test}" = "xyes" ; then | ||
| 43 | PKG_CHECK_MODULES([EDBUS_PERFORMANCE_TEST], | ||
| 44 | - [ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62 ecore-evas >= 1.2.0 elementary], | ||
| 45 | + [ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62 ecore-evas >= 1.6.99 elementary >= 1.6.99], | ||
| 46 | [have_edbus_performance_test="yes"], | ||
| 47 | [have_edbus_performance_test="no"]) | ||
| 48 | fi | ||
| 49 | -- | ||
| 50 | 1.7.8.6 | ||
| 51 | |||
diff --git a/meta-efl/recipes-efl/efl/edbus_svn.bb b/meta-efl/recipes-efl/efl/edbus_svn.bb index c22fcaf9bf..d40deb2634 100644 --- a/meta-efl/recipes-efl/efl/edbus_svn.bb +++ b/meta-efl/recipes-efl/efl/edbus_svn.bb | |||
| @@ -8,6 +8,5 @@ DEFAULT_PREFERENCE = "-1" | |||
| 8 | EXTRA_OECONF += "--disable-performance_test" | 8 | EXTRA_OECONF += "--disable-performance_test" |
| 9 | SRC_URI = "\ | 9 | SRC_URI = "\ |
| 10 | ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ | 10 | ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ |
| 11 | file://0001-edbus-configure.ac-fixup-performance_test.patch \ | ||
| 12 | " | 11 | " |
| 13 | S = "${WORKDIR}/${SRCNAME}" | 12 | S = "${WORKDIR}/${SRCNAME}" |
