diff options
| author |   Constantin Musca <constantinx.musca@intel.com> | 2012-12-28 13:24:14 +0200 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2013-01-04 22:12:05 -0800 |
| commit | 013d96a601bfb9cc8a2ad51f456e0201666d7bc3 (patch) | |
| tree | 3d86596c031589fa47a983f971a3708c7ba81ea0 /meta/recipes-support/libfm/libfm-1.1.0 | |
| parent | f2a530be5941ddf708720b920d0213d7d3928cd1 (diff) | |
| download | openembedded-core-contrib-013d96a601bfb9cc8a2ad51f456e0201666d7bc3.tar.gz | |
libfm: upgrade to 1.1.0
libfm_fix_for_automake-1.12.patch: removed
- problem not reprodicible anymore
configure_fix.patch: removed
- not used
fix-make-parallelism-issue.patch: added
- assures that the ${includedir}/libfm symlink
is created
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/libfm/libfm-1.1.0')
| -rw-r--r-- | meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch b/meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch new file mode 100644 index 0000000000..5d39d1954d --- /dev/null +++ b/meta/recipes-support/libfm/libfm-1.1.0/fix-make-parallelism-issue.patch @@ -0,0 +1,31 @@ +Fix make parallelism issue + +- remove pkginclude_HEADERS ( LIBFM_INCLUDES and LIBFM_GTK_INCLUDES +variables are empty) +- if we don't remove it then we will have a race condition between the code +that tries to symlink ${includedir}/libfm-1.0 to ${includedir}/libfm and the +am autogenerated code from the pkginclude_HEADERS definition which +tries to create pkgincludedir (${includedir}/libfm); +- if pkgincludedir is created before the symlink the symlink will be created +in the ${includedir}/libfm dir and it will have libfm-1.0 as name which is +wrong (we need the ${includedir}/libfm symlink for pcmanfm) + +Upstream-Status: Pending +Signed-off-by: Constantin Musca <constantinx.musca@intel.com> + +Index: libfm-1.1.0/src/Makefile.am +=================================================================== +--- libfm-1.1.0.orig/src/Makefile.am ++++ libfm-1.1.0/src/Makefile.am +@@ -211,11 +211,6 @@ libfmgtkinclude_HEADERS = \ + gtk/fm-gtk-marshal.h \ + $(NULL) + +-pkginclude_HEADERS = \ +- $(LIBFM_INCLUDES) \ +- $(LIBFM_GTK_INCLUDES) \ +- $(NULL) +- + EXTRA_LTLIBRARIES = libfm-gtk.la libfm-gtk3.la + + lib_LTLIBRARIES = libfm.la @LIBFM_GTK_LTLIBRARIES@ |