diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-support/libfm/libfm-1.1.2.2 | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
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 | ||||
-rw-r--r-- | meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch | 14 |
2 files changed, 45 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@ | ||
diff --git a/meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch b/meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch new file mode 100644 index 0000000000..58a2f09d66 --- /dev/null +++ b/meta/recipes-support/libfm/libfm-1.1.2.2/ignore_automake_warnings.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd libfm-1.1.2.2/configure.ac libfm-1.1.2.2/configure.ac | ||
5 | --- libfm-1.1.2.2/configure.ac 2013-08-22 23:16:09.000000000 +0300 | ||
6 | +++ libfm-1.1.2.2/configure.ac 2013-10-25 01:35:18.110323079 +0300 | ||
7 | @@ -3,7 +3,7 @@ | ||
8 | |||
9 | AC_PREREQ([2.63]) | ||
10 | AC_INIT([libfm], [1.1.2.2], [http://pcmanfm.sourceforge.net/]) | ||
11 | -AM_INIT_AUTOMAKE([-Wall -Werror foreign]) | ||
12 | +AM_INIT_AUTOMAKE([-Wall foreign]) | ||
13 | AC_CONFIG_MACRO_DIR(m4) | ||
14 | AC_CONFIG_HEADERS([config.h]) | ||