mirror of https://git.wownero.com/dsc/mxe.git
bugfix in several build rules: use "$(SED)" instead of "sed"
This commit is contained in:
parent
49a3b91ee4
commit
fc91f75020
|
@ -16,7 +16,7 @@ define $(PKG)_UPDATE
|
|||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
sed 's,DllMain,static _disabled_DllMain,' -i '$(1)/atk/atkobject.c'
|
||||
$(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/atk/atkobject.c'
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--disable-shared \
|
||||
|
|
|
@ -16,7 +16,7 @@ define $(PKG)_UPDATE
|
|||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
sed 's,^\(Libs:.*\),\1 @CAIRO_NONPKGCONFIG_LIBS@,' -i '$(1)/src/cairo.pc.in'
|
||||
$(SED) 's,^\(Libs:.*\),\1 @CAIRO_NONPKGCONFIG_LIBS@,' -i '$(1)/src/cairo.pc.in'
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--disable-shared \
|
||||
|
|
|
@ -20,7 +20,7 @@ define $(PKG)_BUILD
|
|||
$(SED) 's,^install-data-local:.*,install-data-local:,' -i '$(1)/src/Makefile.in'
|
||||
# wine confuses the cross-compiling detection, so set it explicitly
|
||||
$(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
|
||||
sed 's,^\(Libs:.*\),\1 @EXPAT_LIBS@ @FREETYPE_LIBS@,' -i '$(1)/fontconfig.pc.in'
|
||||
$(SED) 's,^\(Libs:.*\),\1 @EXPAT_LIBS@ @FREETYPE_LIBS@,' -i '$(1)/fontconfig.pc.in'
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--disable-shared \
|
||||
|
|
|
@ -30,7 +30,7 @@ define $(PKG)_BUILD
|
|||
$(MAKE) -C '$(1)/$(glib_SUBDIR)/glib' -j '$(JOBS)'
|
||||
$(MAKE) -C '$(1)/$(glib_SUBDIR)/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec
|
||||
# cross build
|
||||
sed 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' -i '$(1)/glib-2.0.pc.in'
|
||||
$(SED) 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' -i '$(1)/glib-2.0.pc.in'
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--disable-shared \
|
||||
|
|
26
src/gtk.mk
26
src/gtk.mk
|
@ -16,19 +16,19 @@ define $(PKG)_UPDATE
|
|||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
sed 's,DllMain,static _disabled_DllMain,' -i '$(1)/gdk/win32/gdkmain-win32.c'
|
||||
sed 's,DllMain,static _disabled_DllMain,' -i '$(1)/gdk-pixbuf/gdk-pixbuf-io.c'
|
||||
sed 's,DllMain,static _disabled_DllMain,' -i '$(1)/gtk/gtkmain.c'
|
||||
sed 's,__declspec(dllimport),,' -i '$(1)/gdk/gdktypes.h'
|
||||
sed 's,^\(Libs:.*\)@GTK_EXTRA_LIBS@,\1@GTK_DEP_LIBS@,' -i '$(1)/gtk+-2.0.pc.in'
|
||||
sed 's,^\(gtkbuiltincache\.h:\),_disabled_\1,' -i '$(1)/gtk/Makefile.in'
|
||||
sed 's,^\(install-data-local:.*\) install-libtool-import-lib,\1,' -i '$(1)/modules/other/gail/libgail-util/Makefile.in'
|
||||
sed 's,\(BUILT_SOURCES.*=.*\)test-inline-pixbufs.h,\1,' -i '$(1)/demos/Makefile.in'
|
||||
sed 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' -i '$(1)/configure'
|
||||
sed 's,enable_static=no,enable_static=yes,' -i '$(1)/configure'
|
||||
sed 's,enable_shared=yes,enable_shared=no,' -i '$(1)/configure'
|
||||
sed 's,\(STATIC_LIB_DEPS="[^"]*\) \$$LIBJPEG,\1 $$LIBJASPER $$LIBJPEG,' -i '$(1)/configure'
|
||||
sed 's/-Wl,-luuid/-luuid/' -i '$(1)/configure'
|
||||
$(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/gdk/win32/gdkmain-win32.c'
|
||||
$(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/gdk-pixbuf/gdk-pixbuf-io.c'
|
||||
$(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/gtk/gtkmain.c'
|
||||
$(SED) 's,__declspec(dllimport),,' -i '$(1)/gdk/gdktypes.h'
|
||||
$(SED) 's,^\(Libs:.*\)@GTK_EXTRA_LIBS@,\1@GTK_DEP_LIBS@,' -i '$(1)/gtk+-2.0.pc.in'
|
||||
$(SED) 's,^\(gtkbuiltincache\.h:\),_disabled_\1,' -i '$(1)/gtk/Makefile.in'
|
||||
$(SED) 's,^\(install-data-local:.*\) install-libtool-import-lib,\1,' -i '$(1)/modules/other/gail/libgail-util/Makefile.in'
|
||||
$(SED) 's,\(BUILT_SOURCES.*=.*\)test-inline-pixbufs.h,\1,' -i '$(1)/demos/Makefile.in'
|
||||
$(SED) 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' -i '$(1)/configure'
|
||||
$(SED) 's,enable_static=no,enable_static=yes,' -i '$(1)/configure'
|
||||
$(SED) 's,enable_shared=yes,enable_shared=no,' -i '$(1)/configure'
|
||||
$(SED) 's,\(STATIC_LIB_DEPS="[^"]*\) \$$LIBJPEG,\1 $$LIBJASPER $$LIBJPEG,' -i '$(1)/configure'
|
||||
$(SED) 's/-Wl,-luuid/-luuid/' -i '$(1)/configure'
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--disable-shared \
|
||||
|
|
10
src/pango.mk
10
src/pango.mk
|
@ -16,11 +16,11 @@ define $(PKG)_UPDATE
|
|||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
sed 's,DllMain,static _disabled_DllMain,' -i '$(1)/pango/pango-utils.c'
|
||||
sed 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' -i '$(1)/configure'
|
||||
sed 's,enable_static=no,enable_static=yes,' -i '$(1)/configure'
|
||||
sed 's,enable_shared=yes,enable_shared=no,' -i '$(1)/configure'
|
||||
sed 's,^install-data-local:.*,install-data-local:,' -i '$(1)/modules/Makefile.in'
|
||||
$(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/pango/pango-utils.c'
|
||||
$(SED) 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' -i '$(1)/configure'
|
||||
$(SED) 's,enable_static=no,enable_static=yes,' -i '$(1)/configure'
|
||||
$(SED) 's,enable_shared=yes,enable_shared=no,' -i '$(1)/configure'
|
||||
$(SED) 's,^install-data-local:.*,install-data-local:,' -i '$(1)/modules/Makefile.in'
|
||||
cd '$(1)' && ./configure \
|
||||
--host='$(TARGET)' \
|
||||
--disable-shared \
|
||||
|
|
Loading…
Reference in New Issue