summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-05-03 09:27:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-25 11:17:59 +0100
commit2a952c568766cf6d7b63630b528445db31e2e8d6 (patch)
tree59423e0e5175a6103503e3bac0fb965081135bed
parent625d9745b920e7f7b5e5b4572e440406d983d673 (diff)
downloadpoky-2a952c568766cf6d7b63630b528445db31e2e8d6.tar.gz
glew: fix build with automake 1.12
(From OE-Core rev: df868f8c3c2b9c4c441747ee0b7429c0689ed246) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/glew/files/glew_fix_for_automake-1.12.patch25
-rw-r--r--meta/recipes-graphics/glew/glew_1.7.0.bb3
2 files changed, 27 insertions, 1 deletions
diff --git a/meta/recipes-graphics/glew/files/glew_fix_for_automake-1.12.patch b/meta/recipes-graphics/glew/files/glew_fix_for_automake-1.12.patch
new file mode 100644
index 0000000000..0707efba26
--- /dev/null
+++ b/meta/recipes-graphics/glew/files/glew_fix_for_automake-1.12.patch
@@ -0,0 +1,25 @@
1Upstream-Status: Pending
2
3This patch fixes following issue with automake 1.12
4
5| automake: warnings are treated as errors
6| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libGLEW.la': linking libtool libraries using a non-POSIX
7| /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'
8
9Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
102012/05/03
11
12Index: glew-1.7.0/configure.ac
13===================================================================
14--- glew-1.7.0.orig/configure.ac
15+++ glew-1.7.0/configure.ac
16@@ -14,6 +14,9 @@ LT_INIT
17 AC_PROG_CC
18 AC_PROG_INSTALL
19 AC_PROG_LN_S
20+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
21+m4_pattern_allow([AM_PROG_AR])
22+AM_PROG_AR
23
24 # Checks for libraries.
25
diff --git a/meta/recipes-graphics/glew/glew_1.7.0.bb b/meta/recipes-graphics/glew/glew_1.7.0.bb
index e65663d542..cdb778c51e 100644
--- a/meta/recipes-graphics/glew/glew_1.7.0.bb
+++ b/meta/recipes-graphics/glew/glew_1.7.0.bb
@@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2"
7 7
8DEPENDS = "virtual/libx11 virtual/libgl libxext libxi libxmu" 8DEPENDS = "virtual/libx11 virtual/libgl libxext libxi libxmu"
9 9
10PR = "r0" 10PR = "r1"
11 11
12SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ 12SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
13 file://autotools.patch \ 13 file://autotools.patch \
14 file://glew_fix_for_automake-1.12.patch \
14 " 15 "
15 16
16SRC_URI[md5sum] = "fb7a8bb79187ac98a90b57f0f27a3e84" 17SRC_URI[md5sum] = "fb7a8bb79187ac98a90b57f0f27a3e84"