diff options
| author | Tobias Gruetzmacher <tobias-git@23.gs> | 2014-05-02 11:47:52 (GMT) |
|---|---|---|
| committer | Tobias Gruetzmacher <tobias-git@23.gs> | 2014-05-02 13:15:47 (GMT) |
| commit | 79c52845c3df332649cb3c98e0aae0720a56fb61 (patch) | |
| tree | 233d60f0fa3f859caa5bcf262ca7cf5f81d52c1f | |
| parent | 6e88e0ef7d5a26093b9407c93a7857961b62a7ad (diff) | |
| download | mxe-79c52845c3df332649cb3c98e0aae0720a56fb61.zip mxe-79c52845c3df332649cb3c98e0aae0720a56fb61.tar.gz mxe-79c52845c3df332649cb3c98e0aae0720a56fb61.tar.bz2 | |
Fix build of lame with GCC 4.9.
| -rw-r--r-- | src/lame-1-fix-xmmintrin-errors.patch | 31 | ||||
| -rw-r--r-- | src/lame.mk | 4 |
2 files changed, 33 insertions, 2 deletions
diff --git a/src/lame-1-fix-xmmintrin-errors.patch b/src/lame-1-fix-xmmintrin-errors.patch new file mode 100644 index 0000000..7297e2b --- /dev/null +++ b/src/lame-1-fix-xmmintrin-errors.patch @@ -0,0 +1,31 @@ +This file is part of MXE. +See index.html for further information. + +Fix compilation of SSE2 sources with GCC 4.9. Since this requires an autoreconf +run, we manually disable the GTK 1.2 dependency, because we don't have the GTK +M4 files available. + +diff -Naur lame-3.99.5.orig/configure.in lame-3.99.5/configure.in +--- lame-3.99.5.orig/configure.in 2014-05-02 13:00:26.006106005 +0200 ++++ lame-3.99.5/configure.in 2014-05-02 13:14:01.690106046 +0200 +@@ -393,7 +393,8 @@ + + dnl configure use of features + +-AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no") ++HAVE_GTK="no" ++AC_SUBST(GTK_CFLAGS) + + dnl ElectricFence malloc debugging + AC_MSG_CHECKING(use of ElectricFence malloc debugging) +diff -Naur lame-3.99.5.orig/libmp3lame/vector/Makefile.am lame-3.99.5/libmp3lame/vector/Makefile.am +--- lame-3.99.5.orig/libmp3lame/vector/Makefile.am 2014-05-02 13:00:26.002106005 +0200 ++++ lame-3.99.5/libmp3lame/vector/Makefile.am 2014-05-02 13:08:03.854106010 +0200 +@@ -20,6 +20,7 @@ + + if WITH_XMM + liblamevectorroutines_la_SOURCES = $(xmm_sources) ++liblamevectorroutines_la_CFLAGS = -msse + endif + + noinst_HEADERS = lame_intrin.h diff --git a/src/lame.mk b/src/lame.mk index 027fad2..0488c9a 100644 --- a/src/lame.mk +++ b/src/lame.mk @@ -20,8 +20,8 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ + cd '$(1)' && autoreconf -i && ./configure \ $(MXE_CONFIGURE_OPTS) - $(MAKE) -C '$(1)' -j '$(JOBS)' MXE_CFLAGS= + $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef |