diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-07-09 04:25:00 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-17 10:43:49 +0100 |
| commit | fee7861dcaef40ab86888a12fc2550d03463f98a (patch) | |
| tree | 976865f6aa536620f8b4d58a71e1df49cac22c96 /meta | |
| parent | 547ab3e32770e318b6d21334e4ecf17af2eef3ca (diff) | |
| download | openembedded-core-fee7861dcaef40ab86888a12fc2550d03463f98a.tar.gz openembedded-core-fee7861dcaef40ab86888a12fc2550d03463f98a.tar.bz2 openembedded-core-fee7861dcaef40ab86888a12fc2550d03463f98a.zip | |
pcmanfm: fix build with automake 1.12.x
Added a patch:
pcmanfm_fix_for_automake_1.12.patch
More information in the patch header.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb | 5 |
2 files changed, 38 insertions, 2 deletions
diff --git a/meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch b/meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch new file mode 100644 index 0000000000..1ad0ff5d13 --- /dev/null +++ b/meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch @@ -0,0 +1,35 @@ +Upstream-Status: Pending + +Fix these errors: +| automake: warnings are treated as errors +| data/ui/Makefile.am:18: warning: '%'-style pattern rules are a GNU make extension +| src/Makefile.am:10: warning: compiling 'pcmanfm.c' with per-target flags requires 'AM_PROG_CC_C_O' in 'configure.ac' +| autoreconf: automake failed with exit status: 1 +| ERROR: autoreconf execution failed. +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@Intel.com> +2012/07/09 + +Index: pcmanfm-0.9.10/configure.ac +=================================================================== +--- pcmanfm-0.9.10.orig/configure.ac ++++ pcmanfm-0.9.10/configure.ac +@@ -13,6 +13,7 @@ AC_PROG_CC + AM_PROG_LIBTOOL + AM_PROG_CC_STDC + AC_HEADER_STDC ++AM_PROG_CC_C_O + + # Checks for header files. + AC_HEADER_STDC +Index: pcmanfm-0.9.10/data/ui/Makefile.am +=================================================================== +--- pcmanfm-0.9.10.orig/data/ui/Makefile.am ++++ pcmanfm-0.9.10/data/ui/Makefile.am +@@ -15,6 +15,6 @@ EXTRA_DIST = \ + $(NULL) + + # Purge GtkBuilder UI files +-%.ui: %.glade ++.glade.ui: + cp $< $@ + # $(top_builddir)/src/xml-purge $@ diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb index 545367a943..576b4baa43 100644 --- a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb +++ b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.10.bb @@ -11,7 +11,7 @@ SECTION = "x11" DEPENDS = "gtk+ startup-notification libfm" DEPENDS_append_poky = " libowl" -PR = "r0" +PR = "r1" COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|mips.*|powerpc.*|sh.*)-(linux|freebsd.*)' @@ -20,7 +20,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \ file://gnome-fs-regular.png \ file://gnome-mime-text-plain.png \ file://emblem-symbolic-link.png \ - file://cross-compile-fix.patch" + file://cross-compile-fix.patch \ + file://pcmanfm_fix_for_automake_1.12.patch" SRC_URI_append_poky = " file://owl-window-menu.patch" |