Patchwork [Consolidated,Pull,22/45] glew: fix build with automake 1.12

login
register
mail settings
Submitter Saul Wold
Date May 25, 2012, 6:42 a.m.
Message ID <e1009ec995c863ef12d4786d3fee1bbf4c96962e.1337927956.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/28767/
State New
Headers show

Comments

Saul Wold - May 25, 2012, 6:42 a.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../glew/files/glew_fix_for_automake-1.12.patch    |   25 ++++++++++++++++++++
 meta/recipes-graphics/glew/glew_1.7.0.bb           |    3 +-
 2 files changed, 27 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-graphics/glew/files/glew_fix_for_automake-1.12.patch

Patch

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 0000000..0707efb
--- /dev/null
+++ b/meta/recipes-graphics/glew/files/glew_fix_for_automake-1.12.patch
@@ -0,0 +1,25 @@ 
+Upstream-Status: Pending
+
+This patch fixes following issue with automake 1.12
+
+| automake: warnings are treated as errors
+| /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
+| /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'
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/05/03
+
+Index: glew-1.7.0/configure.ac
+===================================================================
+--- glew-1.7.0.orig/configure.ac
++++ glew-1.7.0/configure.ac
+@@ -14,6 +14,9 @@ LT_INIT
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
++m4_pattern_allow([AM_PROG_AR])
++AM_PROG_AR
+ 
+ # Checks for libraries.
+ 
diff --git a/meta/recipes-graphics/glew/glew_1.7.0.bb b/meta/recipes-graphics/glew/glew_1.7.0.bb
index e65663d..cdb778c 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"
 
 DEPENDS = "virtual/libx11 virtual/libgl libxext libxi libxmu"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
            file://autotools.patch \
+           file://glew_fix_for_automake-1.12.patch \
           "
 
 SRC_URI[md5sum] = "fb7a8bb79187ac98a90b57f0f27a3e84"