[mingw-angleproject] Another gyp b0rkedness workaround

Erik van Pienbroek epienbro at fedoraproject.org
Thu Apr 4 18:52:48 UTC 2013


commit 2f2c5bb543ac2c3186e932c0eb7d0cbec3e7f5e9
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Apr 4 20:51:54 2013 +0200

    Another gyp b0rkedness workaround
    
    Added another workaround due to the fact that the gyp
    build system doesn't properly support cross-compilation
    Fixes FTBFS against latest gyp

 mingw-angleproject.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/mingw-angleproject.spec b/mingw-angleproject.spec
index 34a7abd..484643e 100644
--- a/mingw-angleproject.spec
+++ b/mingw-angleproject.spec
@@ -6,7 +6,7 @@
 Summary:        Almost Native Graphics Layer Engine
 Name:           mingw-angleproject
 Version:        0
-Release:        0.3.svn%{svn_revision}.%{svn_stamp}%{?dist}
+Release:        0.4.svn%{svn_revision}.%{svn_stamp}%{?dist}
 License:        BSD
 Group:          System Environment/Libraries
 URL:            http://code.google.com/p/angleproject/
@@ -169,9 +169,11 @@ for target in win32 win64 ; do
         sed -i s@'^LIBS :='@'LIBS := -ld3d9 -ldxguid -L. -lGLESv2'@ ../src/libEGL.target.mk
 
         if [ "$target" = "win32" ] ; then
+            export CC=%{mingw32_cxx}
             export CXX=%{mingw32_cxx}
             export AR=%{mingw32_ar}
         else
+            export CC=%{mingw64_cxx}
             export CXX=%{mingw64_cxx}
             export AR=%{mingw64_ar}
         fi
@@ -254,6 +256,11 @@ cp -Rv include/* $RPM_BUILD_ROOT%{mingw64_includedir}
 
 
 %changelog
+* Thu Apr  4 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 0-0.4.svn1561.20121214
+- Added another workaround due to the fact that the gyp
+  build system doesn't properly support cross-compilation
+  Fixes FTBFS against latest gyp
+
 * Fri Jan 25 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 0-0.3.svn1561.20121214
 - Added license
 - Resolved various rpmlint warnings


More information about the scm-commits mailing list