[oe-commits] Robert Yang : gd: fix the subdir-objects error

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 72b21ffad37e520da3e10fe91bf3246774da0e46
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=72b21ffad37e520da3e10fe91bf3246774da0e46

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Tue Apr 15 15:01:26 2014 +0800

gd: fix the subdir-objects error

Fix this error:
iautomake: warning: possible forward-incompatibility.
automake: At least a source file is in a subdirectory, but the 'subdir-objects'
automake: automake option hasn't been enabled.  For now, the corresponding output
automake: object file(s) will be placed in the top-level directory.  However,
automake: this behaviour will change in future Automake versions: they will
automake: unconditionally cause object files to be placed in the same subdirectory
automake: of the corresponding sources.
automake: You are advised to start using 'subdir-objects' option throughout your
automake: project, to avoid future incompatibilities.

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../gd/gd-2.1.0/fix-the-subdir-objects-error.patch | 39 ++++++++++++++++++++++
 meta-oe/recipes-support/gd/gd_2.1.0.bb             |  4 ++-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/gd/gd-2.1.0/fix-the-subdir-objects-error.patch b/meta-oe/recipes-support/gd/gd-2.1.0/fix-the-subdir-objects-error.patch
new file mode 100644
index 0000000..02b1670
--- /dev/null
+++ b/meta-oe/recipes-support/gd/gd-2.1.0/fix-the-subdir-objects-error.patch
@@ -0,0 +1,39 @@
+From b1ae702a48888e2c3b0ebe0772a88b45a37b84f5 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang at windriver.com>
+Date: Fri, 17 Jan 2014 01:58:05 -0500
+Subject: [PATCH] configure.ac: fix the subdir-objects error
+
+Fix this error:
+iautomake: warning: possible forward-incompatibility.
+automake: At least a source file is in a subdirectory, but the 'subdir-objects'
+automake: automake option hasn't been enabled.  For now, the corresponding output
+automake: object file(s) will be placed in the top-level directory.  However,
+automake: this behaviour will change in future Automake versions: they will
+automake: unconditionally cause object files to be placed in the same subdirectory
+automake: of the corresponding sources.
+automake: You are advised to start using 'subdir-objects' option throughout your
+automake: project, to avoid future incompatibilities.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f9f744..438e08b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,7 +45,7 @@ AC_SUBST(GDLIB_AGE)
+ FEATURES="GD_GIF GD_GIFANIM GD_OPENPOLYGON"
+ AC_SUBST(FEATURES)
+ 
+-AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz -Wall -Werror])
++AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-xz -Wall -Werror subdir-objects])
+ AC_CONFIG_HEADERS([src/config.h:src/config.hin])
+ 
+ dnl newer automake wants this, but we still want to work with older
+-- 
+1.7.10.4
+
diff --git a/meta-oe/recipes-support/gd/gd_2.1.0.bb b/meta-oe/recipes-support/gd/gd_2.1.0.bb
index 552ff90..a260cd6 100644
--- a/meta-oe/recipes-support/gd/gd_2.1.0.bb
+++ b/meta-oe/recipes-support/gd/gd_2.1.0.bb
@@ -12,7 +12,9 @@ LICENSE = "GD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669"
 DEPENDS = "freetype libpng jpeg zlib"
 
-SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV}.tar.bz2"
+SRC_URI = "https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${PV}.tar.bz2 \
+           file://fix-the-subdir-objects-error.patch \
+"
 SRC_URI[md5sum] = "5a1d5bab3a4a41d9f111bcceee4ad25b"
 SRC_URI[sha256sum] = "f3e1bc472bd81ee976a739436659fe752a14727a964c64530fde68531ddeee91"