diff options
| author | Marko Lindqvist <cazfi74@gmail.com> | 2013-10-25 10:39:23 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-26 16:08:39 +0100 |
| commit | 41e5d52bfa3585f37b0ad6db3b2fa37fd6386401 (patch) | |
| tree | bdf8181980dbd9d44350a1414f77dec65d6ad1e6 /meta/recipes-support/libfm/libfm-1.1.2.2 | |
| parent | b40ff314dfa5afcf280d75d34856e253e22de011 (diff) | |
| download | poky-41e5d52bfa3585f37b0ad6db3b2fa37fd6386401.tar.gz | |
libfm: upgrade to upstream version 1.1.2.2
(From OE-Core rev: 47f803a9cc6a7b43f10775172e6bc89632af322e)
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libfm/libfm-1.1.2.2')
| -rw-r--r-- | meta/recipes-support/libfm/libfm-1.1.2.2/fix-make-parallelism-issue.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-support/libfm/libfm-1.1.2.2/fix-make-parallelism-issue.patch b/meta/recipes-support/libfm/libfm-1.1.2.2/fix-make-parallelism-issue.patch new file mode 100644 index 0000000000..5d39d1954d --- /dev/null +++ b/meta/recipes-support/libfm/libfm-1.1.2.2/fix-make-parallelism-issue.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | Fix make parallelism issue | ||
| 2 | |||
| 3 | - remove pkginclude_HEADERS ( LIBFM_INCLUDES and LIBFM_GTK_INCLUDES | ||
| 4 | variables are empty) | ||
| 5 | - if we don't remove it then we will have a race condition between the code | ||
| 6 | that tries to symlink ${includedir}/libfm-1.0 to ${includedir}/libfm and the | ||
| 7 | am autogenerated code from the pkginclude_HEADERS definition which | ||
| 8 | tries to create pkgincludedir (${includedir}/libfm); | ||
| 9 | - if pkgincludedir is created before the symlink the symlink will be created | ||
| 10 | in the ${includedir}/libfm dir and it will have libfm-1.0 as name which is | ||
| 11 | wrong (we need the ${includedir}/libfm symlink for pcmanfm) | ||
| 12 | |||
| 13 | Upstream-Status: Pending | ||
| 14 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
| 15 | |||
| 16 | Index: libfm-1.1.0/src/Makefile.am | ||
| 17 | =================================================================== | ||
| 18 | --- libfm-1.1.0.orig/src/Makefile.am | ||
| 19 | +++ libfm-1.1.0/src/Makefile.am | ||
| 20 | @@ -211,11 +211,6 @@ libfmgtkinclude_HEADERS = \ | ||
| 21 | gtk/fm-gtk-marshal.h \ | ||
| 22 | $(NULL) | ||
| 23 | |||
| 24 | -pkginclude_HEADERS = \ | ||
| 25 | - $(LIBFM_INCLUDES) \ | ||
| 26 | - $(LIBFM_GTK_INCLUDES) \ | ||
| 27 | - $(NULL) | ||
| 28 | - | ||
| 29 | EXTRA_LTLIBRARIES = libfm-gtk.la libfm-gtk3.la | ||
| 30 | |||
| 31 | lib_LTLIBRARIES = libfm.la @LIBFM_GTK_LTLIBRARIES@ | ||
