mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-10 18:53:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

libfm: fix build with automake 1.12

Browse Source 
(From OE-Core rev: c4fea2a6cb0aa8ee5245a4bb4a9fe1f35fbe2a32)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Nitin A Kamble
2012-05-03 13:08:19 -07:00
committed by Richard Purdie
parent 55e24a4151
commit 204e2d64de
2 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
meta/recipes-support/libfm/libfm-0.1.17/libfm_fix_for_automake-1.12.patch Normal file
View File

@@ -0,0 +1,48 @@
Upstream-Status: Pending
This patch fixes following kind of issues with automake 1.12
| automake: warnings are treated as errors
| data/ui/Makefile.am:21: warning: '%'-style pattern rules are a GNU make extension
...
| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libfm-gtk.la': linking libtool libraries using a non-POSIX
| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
...
| src/Makefile.am:21: warning: compiling 'glib-compat.c' with per-target flags requires 'AM_PROG_CC_C_O' in 'configure.ac'
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
2012/05/03
Index: libfm-0.1.17/configure.ac
===================================================================
--- libfm-0.1.17.orig/configure.ac
+++ libfm-0.1.17/configure.ac
@@ -4,11 +4,17 @@
AC_PREREQ([2.63])
AC_INIT([libfm], [0.1.17], [http://pcmanfm.sorceforge.net/])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+
+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
+m4_pattern_allow([AM_PROG_AR])
+AM_PROG_AR
+
AC_CONFIG_MACRO_DIR(m4)
AC_CONFIG_HEADERS([config.h])
# Checks for programs.
AC_PROG_CC
+AM_PROG_CC_C_O
AM_PROG_LIBTOOL
# Checks for libraries.
Index: libfm-0.1.17/data/ui/Makefile.am
===================================================================
--- libfm-0.1.17.orig/data/ui/Makefile.am
+++ libfm-0.1.17/data/ui/Makefile.am
@@ -18,6 +18,6 @@ EXTRA_DIST = \
$(NULL)
# Purge GtkBuilder UI files
-%.ui: %.glade
+.glade.ui:
cp $< $@
$(top_builddir)/src/xml-purge $@

6
meta/recipes-support/libfm/libfm_0.1.17.bb
View File

@@ -10,9 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
SECTION = "x11/libs"
DEPENDS = "glib-2.0 pango gtk+ menu-cache intltool-native"
PR = "r3"
PR = "r4"
SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz"
SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \
file://libfm_fix_for_automake-1.12.patch \
"
SRC_URI[md5sum] = "a97e03d973e6ac727f28d0934d6c9ad5"
SRC_URI[sha256sum] = "1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b"