diff options
author | Luis Saavedra <luis94855510@gmail.com> | 2013-03-11 06:43:14 (GMT) |
---|---|---|
committer | Luis Saavedra <luis94855510@gmail.com> | 2013-03-11 06:43:14 (GMT) |
commit | 820cbd4299305d119ed2764ac300668e9bb3a1f3 (patch) | |
tree | d1c28a5c8fd637e97cbcf23242e4298af60d5a17 /src | |
parent | dfb1b112d331bea23a1e5682b615a29433918019 (diff) | |
download | mxe-820cbd4299305d119ed2764ac300668e9bb3a1f3.zip mxe-820cbd4299305d119ed2764ac300668e9bb3a1f3.tar.gz mxe-820cbd4299305d119ed2764ac300668e9bb3a1f3.tar.bz2 |
configuring SHELL because libtools fails with dash in some systems
Diffstat (limited to 'src')
-rw-r--r-- | src/libmikmod-1-fixes.patch | 20 | ||||
-rw-r--r-- | src/libmikmod.mk | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/src/libmikmod-1-fixes.patch b/src/libmikmod-1-fixes.patch index 1041dd2..fd0d775 100644 --- a/src/libmikmod-1-fixes.patch +++ b/src/libmikmod-1-fixes.patch @@ -25,3 +25,23 @@ index 8698715..c788c8a 100644 -- 1.7.9.2 +diff --git a/libmikmod/Makefile.in b/libmikmod/Makefile.in +--- a/libmikmod/Makefile.in ++++ b/libmikmod/Makefile.in +@@ -23,13 +23,15 @@ + LIBOBJS=@LIBOBJS@ + LIBRARY_LIB=@LIBRARY_LIB@ + ++SHELL=@SHELL@ ++ + CC=@CC@ + INSTALL=@INSTALL@ + LIBTOOL=@LIBTOOL@ + MKINSTALLDIRS=${top_srcdir}/mkinstalldirs + + DEFS=@DEFS@ +-CFLAGS=@CFLAGS@ -Dunix ++CFLAGS=@CFLAGS@ + COMPILE=$(LIBTOOL) --silent --mode=compile $(CC) $(DEFS) $(CFLAGS) -I$(top_srcdir)/include -I$(top_builddir) -I$(top_builddir)/include -DMIKMOD_H=$(top_srcdir)/include/mikmod.h + + LIB = libmikmod.la diff --git a/src/libmikmod.mk b/src/libmikmod.mk index 482bac8..a8a7270 100644 --- a/src/libmikmod.mk +++ b/src/libmikmod.mk @@ -16,12 +16,12 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) -i 's,-Dunix,,' '$(1)/libmikmod/Makefile.in' $(SED) -i 's,`uname`,MinGW,g' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ + CONFIG_SHELL='$(SHELL)' \ CFLAGS='-msse2' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= |