mirror of
https://git.yoctoproject.org/poky
synced 2026-07-26 19:17:07 +00:00
Constantin Musca
f6f5382afa
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
(From OE-Core rev: 013d96a601bfb9cc8a2ad51f456e0201666d7bc3)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
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@
|