diff options
| -rw-r--r-- | meta/recipes-graphics/glew/files/glew_fix_for_automake-1.12.patch | 25 | ||||
| -rw-r--r-- | meta/recipes-graphics/glew/glew_1.7.0.bb | 3 |
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 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | This 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 | |||
| 9 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
| 10 | 2012/05/03 | ||
| 11 | |||
| 12 | Index: 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 | ||
| 8 | DEPENDS = "virtual/libx11 virtual/libgl libxext libxi libxmu" | 8 | DEPENDS = "virtual/libx11 virtual/libgl libxext libxi libxmu" |
| 9 | 9 | ||
| 10 | PR = "r0" | 10 | PR = "r1" |
| 11 | 11 | ||
| 12 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ | 12 | SRC_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 | ||
| 16 | SRC_URI[md5sum] = "fb7a8bb79187ac98a90b57f0f27a3e84" | 17 | SRC_URI[md5sum] = "fb7a8bb79187ac98a90b57f0f27a3e84" |
