diff options
Diffstat (limited to 'src')
58 files changed, 159 insertions, 159 deletions
@@ -21,7 +21,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/atk/atkobject.c' + $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/atk/atkobject.c' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/boost.mk b/src/boost.mk index 317c398..ca105ea 100644 --- a/src/boost.mk +++ b/src/boost.mk @@ -22,7 +22,7 @@ endef define $(PKG)_BUILD echo 'using gcc : : $(TARGET)-g++ : ;' > '$(1)/user-config.jam' # make the build script generate .a library files instead of .lib - $(SED) 's,<target-os>windows : lib ;,<target-os>windows : a ;,' -i '$(1)/tools/build/v2/tools/types/lib.jam' + $(SED) -i 's,<target-os>windows : lib ;,<target-os>windows : a ;,' '$(1)/tools/build/v2/tools/types/lib.jam' # compile boost jam cd '$(1)/tools/jam/src' && ./build.sh cd '$(1)' && tools/jam/src/bin.*/bjam \ diff --git a/src/bzip2.mk b/src/bzip2.mk index 1346083..4f3e4eb 100644 --- a/src/bzip2.mk +++ b/src/bzip2.mk @@ -20,7 +20,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,sys\\stat\.h,sys/stat.h,g' -i '$(1)/bzip2.c' + $(SED) -i 's,sys\\stat\.h,sys/stat.h,g' '$(1)/bzip2.c' $(MAKE) -C '$(1)' -j '$(JOBS)' libbz2.a \ PREFIX='$(PREFIX)/$(TARGET)' \ CC='$(TARGET)-gcc' \ diff --git a/src/cairo.mk b/src/cairo.mk index c22d2dd..56dbff4 100644 --- a/src/cairo.mk +++ b/src/cairo.mk @@ -20,8 +20,8 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,libpng12,libpng,g' -i '$(1)/configure' - $(SED) 's,^\(Libs:.*\),\1 @CAIRO_NONPKGCONFIG_LIBS@,' -i '$(1)/src/cairo.pc.in' + $(SED) -i 's,libpng12,libpng,g' '$(1)/configure' + $(SED) -i 's,^\(Libs:.*\),\1 @CAIRO_NONPKGCONFIG_LIBS@,' '$(1)/src/cairo.pc.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/curl.mk b/src/curl.mk index d26f0f0..3932b52 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -19,10 +19,10 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) '/^#endif/ i#define CURL_STATICLIB' -i '$(1)/include/curl/curlbuild.h.in' - $(SED) 's,GNUTLS_ENABLED = 1,GNUTLS_ENABLED=1,' -i '$(1)/configure' + $(SED) -i '/^#endif/ i#define CURL_STATICLIB' '$(1)/include/curl/curlbuild.h.in' + $(SED) -i 's,GNUTLS_ENABLED = 1,GNUTLS_ENABLED=1,' '$(1)/configure' # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/devil.mk b/src/devil.mk index 1380ec1..bba24f3 100644 --- a/src/devil.mk +++ b/src/devil.mk @@ -20,9 +20,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,__declspec(dllimport),,' -i '$(1)/include/IL/il.h' + $(SED) -i 's,__declspec(dllimport),,' '$(1)/include/IL/il.h' # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/exiv2.mk b/src/exiv2.mk index 0dc0526..4ff5b48 100644 --- a/src/exiv2.mk +++ b/src/exiv2.mk @@ -21,9 +21,9 @@ endef define $(PKG)_BUILD # workaround for the missing snprintf() in the <cstdio> of GCC-4.4.0 - $(SED) 's,#include <cstdio>,#include <stdio.h>,' -i '$(1)/xmpsdk/src/XMPMeta.cpp' + $(SED) -i 's,#include <cstdio>,#include <stdio.h>,' '$(1)/xmpsdk/src/XMPMeta.cpp' # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/fltk.mk b/src/fltk.mk index 3dbe81c..51c15be 100644 --- a/src/fltk.mk +++ b/src/fltk.mk @@ -19,15 +19,15 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,\$$uname,MINGW,g' -i '$(1)/configure' + $(SED) -i 's,\$$uname,MINGW,g' '$(1)/configure' # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-threads \ LIBS='-lws2_32' - $(SED) 's,-fno-exceptions,,' -i '$(1)/makeinclude' + $(SED) -i 's,-fno-exceptions,,' '$(1)/makeinclude' $(MAKE) -C '$(1)' -j '$(JOBS)' install DIRS=src LIBCOMMAND='$(TARGET)-ar cr' endef diff --git a/src/fontconfig.mk b/src/fontconfig.mk index 169f7b7..2df4a8b 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -21,10 +21,10 @@ endef define $(PKG)_BUILD # ensure there is no (buggy) attempt to install the *.dll.a file # (remove this line of you want to link dynamically) - $(SED) 's,^install-data-local:.*,install-data-local:,' -i '$(1)/src/Makefile.in' + $(SED) -i 's,^install-data-local:.*,install-data-local:,' '$(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) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' + $(SED) -i 's,^\(Libs:.*\),\1 @EXPAT_LIBS@ @FREETYPE_LIBS@,' '$(1)/fontconfig.pc.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/freeglut.mk b/src/freeglut.mk index 62937fe..7a8a2f1 100644 --- a/src/freeglut.mk +++ b/src/freeglut.mk @@ -21,10 +21,10 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,Windows\.h,windows.h,' -i '$(1)/src/freeglut_internal.h' - $(SED) 's,WindowsX\.h,windowsx.h,' -i '$(1)/src/freeglut_internal.h' - $(SED) 's,MMSystem\.h,mmsystem.h,' -i '$(1)/src/freeglut_internal.h' - $(SED) 's,Windows\.h,windows.h,' -i '$(1)/include/GL/freeglut_std.h' + $(SED) -i 's,Windows\.h,windows.h,' '$(1)/src/freeglut_internal.h' + $(SED) -i 's,WindowsX\.h,windowsx.h,' '$(1)/src/freeglut_internal.h' + $(SED) -i 's,MMSystem\.h,mmsystem.h,' '$(1)/src/freeglut_internal.h' + $(SED) -i 's,Windows\.h,windows.h,' '$(1)/include/GL/freeglut_std.h' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/freetds.mk b/src/freetds.mk index eafad27..3e23a77 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -22,10 +22,10 @@ endef define $(PKG)_BUILD # package uses winsock2.h, so it should link to ws2_32 instead of wsock32 - $(SED) 's,wsock32,ws2_32,g' -i '$(1)'/configure + $(SED) -i 's,wsock32,ws2_32,g' '$(1)'/configure # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' # beware --with-gnutls broken detection cd '$(1)' && ./configure \ @@ -41,7 +41,7 @@ define $(PKG)_BUILD # apply TDM-GCC patches cd '$(1)' && \ for p in '$(1)'/gcc-tdm/*.patch; do \ - $(SED) 's,\r$$,,' -i "$$p" || exit 1; \ + $(SED) -i 's,\r$$,,' "$$p" || exit 1; \ patch -p1 -u < "$$p" || exit 1; \ done # unpack support libraries @@ -60,8 +60,8 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)/build' -j 1 install # unpack and build pthreads (needed by libgomp) cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-pthreads) - $(SED) '35i\#define PTW32_STATIC_LIB' -i '$(1)/$(gcc-pthreads_SUBDIR)/pthread.h' - $(SED) 's,#include "config.h",,' -i '$(1)/$(gcc-pthreads_SUBDIR)/pthread.h' + $(SED) -i '35i\#define PTW32_STATIC_LIB' '$(1)/$(gcc-pthreads_SUBDIR)/pthread.h' + $(SED) -i 's,#include "config.h",,' '$(1)/$(gcc-pthreads_SUBDIR)/pthread.h' $(MAKE) -C '$(1)/$(gcc-pthreads_SUBDIR)' -j 1 GC-static CROSS='$(TARGET)-' $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' $(INSTALL) -m664 '$(1)/$(gcc-pthreads_SUBDIR)/libpthreadGC2.a' '$(PREFIX)/$(TARGET)/lib/libpthread.a' @@ -70,7 +70,7 @@ define $(PKG)_BUILD $(INSTALL) -m664 '$(1)/$(gcc-pthreads_SUBDIR)/sched.h' '$(PREFIX)/$(TARGET)/include/' $(INSTALL) -m664 '$(1)/$(gcc-pthreads_SUBDIR)/semaphore.h' '$(PREFIX)/$(TARGET)/include/' # build libgomp - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/libgomp/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/libgomp/configure' mkdir '$(1)/build/$(TARGET)/libgomp' cd '$(1)/build/$(TARGET)/libgomp' && '$(1)/libgomp/configure' \ $(gcc_CONFIGURE_OPTIONS) \ @@ -23,8 +23,8 @@ define $(PKG)_BUILD touch '$(1)/aclocal.m4' touch '$(1)/config.hin' touch '$(1)/Makefile.in' - $(SED) 's,-I@includedir@,-I@includedir@ -DNONDLL,' -i '$(1)/config/gdlib-config.in' - $(SED) 's,-lX11 ,,g' -i '$(1)/configure' + $(SED) -i 's,-I@includedir@,-I@includedir@ -DNONDLL,' '$(1)/config/gdlib-config.in' + $(SED) -i 's,-lX11 ,,g' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/geos.mk b/src/geos.mk index 51ed48e..5350612 100644 --- a/src/geos.mk +++ b/src/geos.mk @@ -20,11 +20,11 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,-lgeos,-lgeos -lstdc++,' -i '$(1)/tools/geos-config.in' - $(SED) 's,-L\$${libdir}$$,-L$${libdir} -lgeos -lstdc++,' -i '$(1)/tools/geos-config.in' - $(SED) 's,\$$WARNFLAGS -ansi,\$$WARNFLAGS,' -i '$(1)/configure.in' + $(SED) -i 's,-lgeos,-lgeos -lstdc++,' '$(1)/tools/geos-config.in' + $(SED) -i 's,-L\$${libdir}$$,-L$${libdir} -lgeos -lstdc++,' '$(1)/tools/geos-config.in' + $(SED) -i 's,\$$WARNFLAGS -ansi,\$$WARNFLAGS,' '$(1)/configure.in' touch '$(1)/aclocal.m4' - $(SED) 's,\$$WARNFLAGS -ansi,\$$WARNFLAGS,' -i '$(1)/configure' + $(SED) -i 's,\$$WARNFLAGS -ansi,\$$WARNFLAGS,' '$(1)/configure' touch '$(1)/Makefile.in' touch '$(1)/source/headers/config.h.in' touch '$(1)/source/headers/geos/platform.h.in' diff --git a/src/glib.mk b/src/glib.mk index fdb8fa6..7ab4c4b 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -32,9 +32,9 @@ define $(PKG)_BUILD $(MAKE) -C '$(1).native/$(libiconv_SUBDIR)' -j '$(JOBS)' # native build for glib-genmarshal, without pkg-config, gettext and zlib - $(SED) 's,gt_cv_have_gettext=yes,gt_cv_have_gettext=no,' -i '$(1).native/configure' - $(SED) '/You must.*have gettext/,/exit 1;/ s,.*exit 1;.*,},' -i '$(1).native/configure' - $(SED) 's,found_zlib=no,found_zlib=yes,' -i '$(1).native/configure' + $(SED) -i 's,gt_cv_have_gettext=yes,gt_cv_have_gettext=no,' '$(1).native/configure' + $(SED) -i '/You must.*have gettext/,/exit 1;/ s,.*exit 1;.*,},' '$(1).native/configure' + $(SED) -i 's,found_zlib=no,found_zlib=yes,' '$(1).native/configure' cd '$(1).native' && ./configure \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ @@ -46,7 +46,7 @@ define $(PKG)_BUILD --with-libiconv=gnu \ CPPFLAGS='-I$(1).native/$(libiconv_SUBDIR)/include' \ LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs' - $(SED) 's,#define G_ATOMIC.*,,' -i '$(1).native/config.h' + $(SED) -i 's,#define G_ATOMIC.*,,' '$(1).native/config.h' $(MAKE) -C '$(1).native/glib' -j '$(JOBS)' $(MAKE) -C '$(1).native/gthread' -j '$(JOBS)' $(MAKE) -C '$(1).native/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec @@ -55,9 +55,9 @@ define $(PKG)_BUILD cd '$(1)' && aclocal cd '$(1)' && $(LIBTOOLIZE) --force cd '$(1)' && autoconf - $(SED) 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' -i '$(1)/glib-2.0.pc.in' + $(SED) -i 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' '$(1)/glib-2.0.pc.in' # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/gnutls.mk b/src/gnutls.mk index 2aa51b1..7c82147 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -22,7 +22,7 @@ endef define $(PKG)_BUILD echo '/* DEACTIVATED */' > '$(1)/gl/gai_strerror.c' - $(SED) 's, sed , $(SED) ,g' -i '$(1)/gl/tests/Makefile.in' + $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ @@ -21,21 +21,21 @@ 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="[^"]*\) \$$LIBJASPER,\1 $$LIBJASPER $$LIBJPEG,' -i '$(1)/configure' - $(SED) 's/-Wl,-luuid/-luuid/' -i '$(1)/configure' + $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/gdk/win32/gdkmain-win32.c' + $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/gdk-pixbuf/gdk-pixbuf-io.c' + $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/gtk/gtkmain.c' + $(SED) -i 's,__declspec(dllimport),,' '$(1)/gdk/gdktypes.h' + $(SED) -i 's,^\(Libs:.*\)@GTK_EXTRA_LIBS@,\1@GTK_DEP_LIBS@,' '$(1)/gtk+-2.0.pc.in' + $(SED) -i 's,^\(gtkbuiltincache\.h:\),_disabled_\1,' '$(1)/gtk/Makefile.in' + $(SED) -i 's,^\(install-data-local:.*\) install-libtool-import-lib,\1,' '$(1)/modules/other/gail/libgail-util/Makefile.in' + $(SED) -i 's,\(BUILT_SOURCES.*=.*\)test-inline-pixbufs.h,\1,' '$(1)/demos/Makefile.in' + $(SED) -i 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' '$(1)/configure' + $(SED) -i 's,enable_static=no,enable_static=yes,' '$(1)/configure' + $(SED) -i 's,enable_shared=yes,enable_shared=no,' '$(1)/configure' + $(SED) -i 's,\(STATIC_LIB_DEPS="[^"]*\) \$$LIBJASPER,\1 $$LIBJASPER $$LIBJPEG,' '$(1)/configure' + $(SED) -i 's/-Wl,-luuid/-luuid/' '$(1)/configure' # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/ilmbase.mk b/src/ilmbase.mk index c5fa757..b7b1df1 100644 --- a/src/ilmbase.mk +++ b/src/ilmbase.mk @@ -21,11 +21,11 @@ endef define $(PKG)_BUILD # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' # build the win32 thread sources instead of the posix thread sources - $(SED) 's,IlmThreadPosix\.,IlmThreadWin32\.,' -i '$(1)/IlmThread/Makefile.in' - $(SED) 's,IlmThreadSemaphorePosix\.,IlmThreadSemaphoreWin32\.,' -i '$(1)/IlmThread/Makefile.in' - $(SED) 's,IlmThreadMutexPosix\.,IlmThreadMutexWin32\.,' -i '$(1)/IlmThread/Makefile.in' + $(SED) -i 's,IlmThreadPosix\.,IlmThreadWin32\.,' '$(1)/IlmThread/Makefile.in' + $(SED) -i 's,IlmThreadSemaphorePosix\.,IlmThreadSemaphoreWin32\.,' '$(1)/IlmThread/Makefile.in' + $(SED) -i 's,IlmThreadMutexPosix\.,IlmThreadMutexWin32\.,' '$(1)/IlmThread/Makefile.in' echo '/* disabled */' > '$(1)/IlmThread/IlmThreadSemaphorePosixCompat.cpp' # Because of the previous changes, '--disable-threading' will not disable # threading. It will just disable the unwanted check for pthread. diff --git a/src/jpeg.mk b/src/jpeg.mk index 1d0429f..40f3a9b 100644 --- a/src/jpeg.mk +++ b/src/jpeg.mk @@ -20,7 +20,7 @@ endef define $(PKG)_BUILD # avoid redefinition of INT32 - $(SED) 's,typedef long INT32;,#include <basetsd.h>,' -i '$(1)/jmorecfg.h' + $(SED) -i 's,typedef long INT32;,#include <basetsd.h>,' '$(1)/jmorecfg.h' cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ diff --git a/src/lcms.mk b/src/lcms.mk index 8944db1..0935d3d 100644 --- a/src/lcms.mk +++ b/src/lcms.mk @@ -21,7 +21,7 @@ endef define $(PKG)_BUILD # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ diff --git a/src/libdnet.mk b/src/libdnet.mk index d5bc019..ef54b8b 100644 --- a/src/libdnet.mk +++ b/src/libdnet.mk @@ -19,15 +19,15 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,CYGWIN=no,CYGWIN=yes,g' -i '$(1)/configure' - $(SED) 's,cat /proc/sys/kernel/ostype,,g' -i '$(1)/configure' - $(SED) 's,test -d /usr/include/mingw,true,' -i '$(1)/configure' - $(SED) 's,Iphlpapi,iphlpapi,g' -i '$(1)/configure' - $(SED) 's,packet32\.h,Packet32.h,g' -i '$(1)/configure' - $(SED) 's,packet\.lib,libpacket.a,' -i '$(1)/configure' - $(SED) 's,-lpacket,-lpacket -lws2_32,g' -i '$(1)/configure' - $(SED) 's,/usr/include,$(PREFIX)/$(TARGET)/include,g' -i '$(1)/configure' - $(SED) 's,#include <Ntddndis.h>,#include <ddk/ntddndis.h>,' -i '$(1)/src/eth-win32.c' + $(SED) -i 's,CYGWIN=no,CYGWIN=yes,g' '$(1)/configure' + $(SED) -i 's,cat /proc/sys/kernel/ostype,,g' '$(1)/configure' + $(SED) -i 's,test -d /usr/include/mingw,true,' '$(1)/configure' + $(SED) -i 's,Iphlpapi,iphlpapi,g' '$(1)/configure' + $(SED) -i 's,packet32\.h,Packet32.h,g' '$(1)/configure' + $(SED) -i 's,packet\.lib,libpacket.a,' '$(1)/configure' + $(SED) -i 's,-lpacket,-lpacket -lws2_32,g' '$(1)/configure' + $(SED) -i 's,/usr/include,$(PREFIX)/$(TARGET)/include,g' '$(1)/configure' + $(SED) -i 's,#include <Ntddndis.h>,#include <ddk/ntddndis.h>,' '$(1)/src/eth-win32.c' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk index 7a62453..a47747c 100644 --- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -20,7 +20,7 @@ endef define $(PKG)_BUILD # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/libgeotiff.mk b/src/libgeotiff.mk index dfa5809..460bfe6 100644 --- a/src/libgeotiff.mk +++ b/src/libgeotiff.mk @@ -20,7 +20,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,/usr/local,@prefix@,' -i '$(1)/bin/Makefile.in' + $(SED) -i 's,/usr/local,@prefix@,' '$(1)/bin/Makefile.in' touch '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ diff --git a/src/libgpg_error.mk b/src/libgpg_error.mk index 5bb4701..a709183 100644 --- a/src/libgpg_error.mk +++ b/src/libgpg_error.mk @@ -20,7 +20,7 @@ endef define $(PKG)_BUILD # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/libgsasl.mk b/src/libgsasl.mk index ee5078e..ea5c87c 100644 --- a/src/libgsasl.mk +++ b/src/libgsasl.mk @@ -21,7 +21,7 @@ endef define $(PKG)_BUILD # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && touch src/libgsasl-7.def && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/libgsf.mk b/src/libgsf.mk index 1e0dcb4..93d66dc 100644 --- a/src/libgsf.mk +++ b/src/libgsf.mk @@ -20,7 +20,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,^\(Requires:.*\),\1 gio-2.0,' -i '$(1)'/libgsf-1.pc.in + $(SED) -i 's,^\(Requires:.*\),\1 gio-2.0,' '$(1)'/libgsf-1.pc.in echo 'Libs.private: -lz -lbz2' >> '$(1)'/libgsf-1.pc.in cd '$(1)' && autoconf cd '$(1)' && ./configure \ diff --git a/src/libiconv.mk b/src/libiconv.mk index 03f36ed..2b5eec4 100644 --- a/src/libiconv.mk +++ b/src/libiconv.mk @@ -20,7 +20,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's, sed , $(SED) ,g' -i '$(1)/windows/windres-options' + $(SED) -i 's, sed , $(SED) ,g' '$(1)/windows/windres-options' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ diff --git a/src/libidn.mk b/src/libidn.mk index 96cf03a..eba5ece 100644 --- a/src/libidn.mk +++ b/src/libidn.mk @@ -21,7 +21,7 @@ endef define $(PKG)_BUILD # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/libmad.mk b/src/libmad.mk index 04571f7..2e12314 100644 --- a/src/libmad.mk +++ b/src/libmad.mk @@ -19,7 +19,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) '/-fforce-mem/d' -i '$(1)'/configure + $(SED) -i '/-fforce-mem/d' '$(1)'/configure cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/libmikmod.mk b/src/libmikmod.mk index 325e93a..5ef68f4 100644 --- a/src/libmikmod.mk +++ b/src/libmikmod.mk @@ -19,8 +19,8 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,-Dunix,,' -i '$(1)/libmikmod/Makefile.in' - $(SED) 's,`uname`,MinGW,g' -i '$(1)/configure' + $(SED) -i 's,-Dunix,,' '$(1)/libmikmod/Makefile.in' + $(SED) -i 's,`uname`,MinGW,g' '$(1)/configure' cd '$(1)' && \ CC='$(TARGET)-gcc' \ NM='$(TARGET)-nm' \ diff --git a/src/libntlm.mk b/src/libntlm.mk index 642973d..4138fa1 100644 --- a/src/libntlm.mk +++ b/src/libntlm.mk @@ -21,7 +21,7 @@ endef define $(PKG)_BUILD # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/libpano13.mk b/src/libpano13.mk index 020320f..5fa63a1 100644 --- a/src/libpano13.mk +++ b/src/libpano13.mk @@ -20,10 +20,10 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,WINDOWSX\.H,windowsx.h,' -i '$(1)/sys_win.h' - $(SED) 's,\$${WINDRES-windres},$(TARGET)-windres,' -i '$(1)/build/win32/compile-resource' - $(SED) 's,m4 -DBUILDNUMBER=\$$buildnumber,$(SED) "s/BUILDNUMBER/\$$buildnumber/g",' -i '$(1)/build/win32/compile-resource' - $(SED) 's,mv.*libpano13\.dll.*,,' -i '$(1)/Makefile.in' + $(SED) -i 's,WINDOWSX\.H,windowsx.h,' '$(1)/sys_win.h' + $(SED) -i 's,\$${WINDRES-windres},$(TARGET)-windres,' '$(1)/build/win32/compile-resource' + $(SED) -i 's,m4 -DBUILDNUMBER=\$$buildnumber,$(SED) "s/BUILDNUMBER/\$$buildnumber/g",' '$(1)/build/win32/compile-resource' + $(SED) -i 's,mv.*libpano13\.dll.*,,' '$(1)/Makefile.in' cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ diff --git a/src/librsvg.mk b/src/librsvg.mk index 0dc552c..5166835 100644 --- a/src/librsvg.mk +++ b/src/librsvg.mk @@ -20,8 +20,8 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' -i '$(1)'/Makefile.in - $(SED) 's,^\(Requires:.*\),\1 libgsf-1 pangocairo,' -i '$(1)'/librsvg-2.0.pc.in + $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' '$(1)'/Makefile.in + $(SED) -i 's,^\(Requires:.*\),\1 libgsf-1 pangocairo,' '$(1)'/librsvg-2.0.pc.in cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/libsamplerate.mk b/src/libsamplerate.mk index 6d432d0..332c6ac 100644 --- a/src/libsamplerate.mk +++ b/src/libsamplerate.mk @@ -22,7 +22,7 @@ endef define $(PKG)_BUILD # wine confuses the cross-compiling detection, so set it explicitly - #$(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + #$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/libusb.mk b/src/libusb.mk index ffbd5aa..08ad294 100644 --- a/src/libusb.mk +++ b/src/libusb.mk @@ -20,7 +20,7 @@ endef define $(PKG)_BUILD # convert DOS line endings - $(SED) 's,\r$$,,' -i '$(1)/Makefile' + $(SED) -i 's,\r$$,,' '$(1)/Makefile' # don't actually build the library (DLL file), # just create the DLL import stubs diff --git a/src/libxml2.mk b/src/libxml2.mk index f15a66a..820f8a5 100644 --- a/src/libxml2.mk +++ b/src/libxml2.mk @@ -20,7 +20,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,`uname`,MinGW,g' -i '$(1)/xml2-config.in' + $(SED) -i 's,`uname`,MinGW,g' '$(1)/xml2-config.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/nsis.mk b/src/nsis.mk index c5a6320..8511ef2 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -20,7 +20,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,this->SetIcon(wxICON(nsisicon));,,' -i '$(1)/Contrib/NSIS Menu/nsismenu/nsismenu.cpp' + $(SED) -i 's,this->SetIcon(wxICON(nsisicon));,,' '$(1)/Contrib/NSIS Menu/nsismenu/nsismenu.cpp' cd '$(1)' && scons \ PREFIX='$(PREFIX)' \ `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \ @@ -20,7 +20,7 @@ endef define $(PKG)_BUILD # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/openexr.mk b/src/openexr.mk index 916efea..44c2075 100644 --- a/src/openexr.mk +++ b/src/openexr.mk @@ -30,7 +30,7 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)/$(ilmbase_SUBDIR)' -j '$(JOBS)' install \ bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/openssl.mk b/src/openssl.mk index 2bbdbf1..479057c 100644 --- a/src/openssl.mk +++ b/src/openssl.mk @@ -23,13 +23,13 @@ endef define $(PKG)_BUILD # workarounds according to # http://wagner.pp.ru/~vitus/articles/openssl-mingw.html - $(SED) 's,^$$IsMK1MF=1.*,,' -i '$(1)'/Configure - $(SED) 's,static type _hide_##name,type _hide_##name,' -i '$(1)'/e_os2.h + $(SED) -i 's,^$$IsMK1MF=1.*,,' '$(1)'/Configure + $(SED) -i 's,static type _hide_##name,type _hide_##name,' '$(1)'/e_os2.h # use winsock2 instead of winsock - $(SED) 's,wsock32,ws2_32,g' -i '$(1)'/Configure + $(SED) -i 's,wsock32,ws2_32,g' '$(1)'/Configure find '$(1)' -type f -exec \ - $(SED) 's,winsock\.h,winsock2.h,g' -i {} \; + $(SED) -i 's,winsock\.h,winsock2.h,g' {} \; cd '$(1)' && CC='$(TARGET)-gcc' ./Configure \ mingw \ diff --git a/src/pango.mk b/src/pango.mk index 2240d7a..11475a7 100644 --- a/src/pango.mk +++ b/src/pango.mk @@ -20,13 +20,13 @@ 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) -i 's,DllMain,static _disabled_DllMain,' '$(1)/pango/pango-utils.c' + $(SED) -i 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' '$(1)/configure' + $(SED) -i 's,enable_static=no,enable_static=yes,' '$(1)/configure' + $(SED) -i 's,enable_shared=yes,enable_shared=no,' '$(1)/configure' + $(SED) -i 's,^install-data-local:.*,install-data-local:,' '$(1)/modules/Makefile.in' # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/pcre.mk b/src/pcre.mk index de7d9b7..e71d3d8 100644 --- a/src/pcre.mk +++ b/src/pcre.mk @@ -19,10 +19,10 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,__declspec(dllimport),,' -i '$(1)/pcre.h.in' - $(SED) 's,__declspec(dllimport),,' -i '$(1)/pcreposix.h' + $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcre.h.in' + $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcreposix.h' # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/pdcurses.mk b/src/pdcurses.mk index def7c27..b801330 100644 --- a/src/pdcurses.mk +++ b/src/pdcurses.mk @@ -19,7 +19,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,copy,cp,' -i '$(1)/win32/mingwin32.mak' + $(SED) -i 's,copy,cp,' '$(1)/win32/mingwin32.mak' $(MAKE) -C '$(1)' -j '$(JOBS)' libs -f '$(1)/win32/mingwin32.mak' \ CC='$(TARGET)-gcc' \ LIBEXE='$(TARGET)-ar' \ diff --git a/src/pdflib_lite.mk b/src/pdflib_lite.mk index 27318e3..14db3cf 100644 --- a/src/pdflib_lite.mk +++ b/src/pdflib_lite.mk @@ -19,7 +19,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,ac_sys_system=`uname -s`,ac_sys_system=MinGW,' -i '$(1)/configure' + $(SED) -i 's,ac_sys_system=`uname -s`,ac_sys_system=MinGW,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ @@ -34,7 +34,7 @@ define $(PKG)_BUILD --enable-cxx \ --enable-large-files \ CFLAGS='-D_IOB_ENTRIES=20' - $(SED) 's,-DPDF_PLATFORM=[^ ]* ,,' -i '$(1)/config/mkcommon.inc' + $(SED) -i 's,-DPDF_PLATFORM=[^ ]* ,,' '$(1)/config/mkcommon.inc' $(MAKE) -C '$(1)/libs' -j '$(JOBS)' $(MAKE) -C '$(1)/libs' -j 1 install endef diff --git a/src/postgresql.mk b/src/postgresql.mk index 908aabd..3bfeb24 100644 --- a/src/postgresql.mk +++ b/src/postgresql.mk @@ -23,12 +23,12 @@ endef define $(PKG)_BUILD # The static OpenSSL libraries are in unix (not win32) naming style. - $(SED) 's,SSLEAY32,SSL,' -i '$(1)'/configure - $(SED) 's,ssleay32,ssl,' -i '$(1)'/configure - $(SED) 's,EAY32,CRYPTO,' -i '$(1)'/configure - $(SED) 's,eay32,crypto,' -i '$(1)'/configure - $(SED) 's,ssleay32,ssl,' -i '$(1)'/src/interfaces/libpq/Makefile - $(SED) 's,eay32,crypto,' -i '$(1)'/src/interfaces/libpq/Makefile + $(SED) -i 's,SSLEAY32,SSL,' '$(1)'/configure + $(SED) -i 's,ssleay32,ssl,' '$(1)'/configure + $(SED) -i 's,EAY32,CRYPTO,' '$(1)'/configure + $(SED) -i 's,eay32,crypto,' '$(1)'/configure + $(SED) -i 's,ssleay32,ssl,' '$(1)'/src/interfaces/libpq/Makefile + $(SED) -i 's,eay32,crypto,' '$(1)'/src/interfaces/libpq/Makefile # Since we build only client libary, use bogus tzdata to satisfy configure. cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ @@ -59,7 +59,7 @@ define $(PKG)_BUILD # Build a native pg_config. cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,postgresql) mv '$(1)/$(postgresql_SUBDIR)' '$(1).native' - $(SED) 's,-DVAL_,-D_DISABLED_VAL_,g' -i '$(1).native'/src/bin/pg_config/Makefile + $(SED) -i 's,-DVAL_,-D_DISABLED_VAL_,g' '$(1).native'/src/bin/pg_config/Makefile cd '$(1).native' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ @@ -25,8 +25,8 @@ define $(PKG)_BUILD cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,qt) mv '$(1)/$(qt_SUBDIR)' '$(1).native' - $(SED) 's,PLATFORM_X11=yes,PLATFORM_X11=no,' -i '$(1)'.native/configure - $(SED) 's,PLATFORM=solaris-cc$$,PLATFORM=solaris-g++,' -i '$(1)'.native/configure + $(SED) -i 's,PLATFORM_X11=yes,PLATFORM_X11=no,' '$(1)'.native/configure + $(SED) -i 's,PLATFORM=solaris-cc$$,PLATFORM=solaris-g++,' '$(1)'.native/configure cd '$(1)'.native && ./configure \ -opensource \ -confirm-license \ @@ -48,8 +48,8 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-uic # rebuild qmake to use "-unix" as default and to use the correct "ar" command - $(SED) 's,\(Option::TARG_MODE Option::target_mode = Option::TARG_\)[A-Z_]*,\1UNIX_MODE,' -i '$(1)'.native/qmake/option.cpp - $(SED) 's,"ar -M,"$(TARGET)-ar -M,' -i '$(1)'.native/qmake/generators/win32/mingw_make.cpp + $(SED) -i 's,\(Option::TARG_MODE Option::target_mode = Option::TARG_\)[A-Z_]*,\1UNIX_MODE,' '$(1)'.native/qmake/option.cpp + $(SED) -i 's,"ar -M,"$(TARGET)-ar -M,' '$(1)'.native/qmake/generators/win32/mingw_make.cpp $(MAKE) -C '$(1)'.native/qmake -j '$(JOBS)' # install the native tools manually @@ -73,18 +73,18 @@ define $(PKG)_BUILD # Adjust the mkspec values that contain the TARGET platform prefix. # The patch planted strings HOSTPLATFORMPREFIX and HOSTPLATFORMINCLUDE. - $(SED) 's,HOSTPLATFORMPREFIX-,$(TARGET)-,g' -i '$(1)'/mkspecs/win32-g++/qmake.conf - $(SED) 's,HOSTPLATFORMINCLUDE,$(PREFIX)/$(TARGET)/include,g' -i '$(1)'/mkspecs/win32-g++/qmake.conf + $(SED) -i 's,HOSTPLATFORMPREFIX-,$(TARGET)-,g' '$(1)'/mkspecs/win32-g++/qmake.conf + $(SED) -i 's,HOSTPLATFORMINCLUDE,$(PREFIX)/$(TARGET)/include,g' '$(1)'/mkspecs/win32-g++/qmake.conf # Make sure qmake doesn't use compilation paths meant for unix find '$(1)'/src -name '*.pr[oi]' -exec \ - $(SED) 's,\(^\|[^_/]\)unix,\1linux,g' -i {} \; + $(SED) -i 's,\(^\|[^_/]\)unix,\1linux,g' {} \; # Make qmake use compilation paths meant for MinGW or Windows in general find '$(1)'/src -name '*.pr[oi]' -exec \ - $(SED) 's,\(^\|[^_/]\)win32-g++\([^-]\|$$\),\1unix\2,g' -i {} \; + $(SED) -i 's,\(^\|[^_/]\)win32-g++\([^-]\|$$\),\1unix\2,g' {} \; find '$(1)'/src -name '*.pr[oi]' -exec \ - $(SED) 's,\(^\|[^_/]\)win32\([^-]\|$$\),\1unix\2,g' -i {} \; + $(SED) -i 's,\(^\|[^_/]\)win32\([^-]\|$$\),\1unix\2,g' {} \; # Configure Qt for MinGW target # We prefer static mingw-cross-env system libs for static build: diff --git a/src/readline.mk b/src/readline.mk index 82edd1b..f98e639 100644 --- a/src/readline.mk +++ b/src/readline.mk @@ -20,8 +20,8 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,^ *case SIGQUIT:.*,,' -i '$(1)/signals.c' - $(SED) 's,^ *case SIGTSTP:.*,,' -i '$(1)/signals.c' + $(SED) -i 's,^ *case SIGQUIT:.*,,' '$(1)/signals.c' + $(SED) -i 's,^ *case SIGTSTP:.*,,' '$(1)/signals.c' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ @@ -20,7 +20,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,-mwindows,-lwinmm -mwindows,' -i '$(1)/configure' + $(SED) -i 's,-mwindows,-lwinmm -mwindows,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/sdl_image.mk b/src/sdl_image.mk index 287f8b9..ac2cc0a 100644 --- a/src/sdl_image.mk +++ b/src/sdl_image.mk @@ -20,7 +20,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,^\(Requires:.*\),\1 libpng,' -i '$(1)/SDL_image.pc.in' + $(SED) -i 's,^\(Requires:.*\),\1 libpng,' '$(1)/SDL_image.pc.in' echo 'Libs.private: -ltiff -ljpeg -lz' >> '$(1)/SDL_image.pc.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ diff --git a/src/sdl_mixer.mk b/src/sdl_mixer.mk index d3e7e1c..d61b5ef 100644 --- a/src/sdl_mixer.mk +++ b/src/sdl_mixer.mk @@ -20,13 +20,13 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,^\(Requires:.*\),\1 vorbisfile,' -i '$(1)/SDL_mixer.pc.in' + $(SED) -i 's,^\(Requires:.*\),\1 vorbisfile,' '$(1)/SDL_mixer.pc.in' echo \ 'Libs.private:' \ "`$(PREFIX)/$(TARGET)/bin/libmikmod-config --libs`" \ "`$(PREFIX)/$(TARGET)/bin/smpeg-config --libs`" \ >> '$(1)/SDL_mixer.pc.in' - $(SED) 's,for path in /usr/local; do,for path in; do,' -i '$(1)/configure' + $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/sdl_pango.mk b/src/sdl_pango.mk index 3ae0e86..e01a7f0 100644 --- a/src/sdl_pango.mk +++ b/src/sdl_pango.mk @@ -19,7 +19,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,^\(Requires:.*\),\1 pangoft2,' -i '$(1)/SDL_Pango.pc.in' + $(SED) -i 's,^\(Requires:.*\),\1 pangoft2,' '$(1)/SDL_Pango.pc.in' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/smpeg.mk b/src/smpeg.mk index 835cbe5..d417205 100644 --- a/src/smpeg.mk +++ b/src/smpeg.mk @@ -19,7 +19,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,\(-lsmpeg\),\1 -lstdc++,' -i '$(1)/smpeg-config.in' + $(SED) -i 's,\(-lsmpeg\),\1 -lstdc++,' '$(1)/smpeg-config.in' cd '$(1)' && ./configure \ AR='$(TARGET)-ar' \ NM='$(TARGET)-nm' \ diff --git a/src/taglib.mk b/src/taglib.mk index 50841fd..44351cc 100644 --- a/src/taglib.mk +++ b/src/taglib.mk @@ -20,9 +20,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) '/#define TAGLIB_EXPORT_H/a#define TAGLIB_STATIC' -i '$(1)/taglib/taglib_export.h' + $(SED) -i '/#define TAGLIB_EXPORT_H/a#define TAGLIB_STATIC' '$(1)/taglib/taglib_export.h' # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/theora.mk b/src/theora.mk index 5e8b011..0505dac 100644 --- a/src/theora.mk +++ b/src/theora.mk @@ -20,7 +20,7 @@ endef define $(PKG)_BUILD # wine confuses the cross-compiling detection, so set it explicitly - $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure' + $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ diff --git a/src/vmime.mk b/src/vmime.mk index 8d872d9..4605e8f 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -23,17 +23,17 @@ define $(PKG)_BUILD # we need scons to generate configure.in, Makefile.am etc. # ansi and pedantic are too strict for mingw. # http://sourceforge.net/tracker/index.php?func=detail&aid=2373234&group_id=2435&atid=102435 - $(SED) "s/'-ansi', //;" -i '$(1)/SConstruct' - $(SED) "s/'-pedantic', //;" -i '$(1)/SConstruct' - $(SED) 's/pkg-config/$(TARGET)-pkg-config/g;' -i '$(1)/SConstruct' + $(SED) -i "s/'-ansi', //;" '$(1)/SConstruct' + $(SED) -i "s/'-pedantic', //;" '$(1)/SConstruct' + $(SED) -i 's/pkg-config/$(TARGET)-pkg-config/g;' '$(1)/SConstruct' cd '$(1)' && scons autotools \ prefix='$(PREFIX)/$(TARGET)' \ target='$(TARGET)' \ sendmail_path=/sbin/sendmail - $(SED) 's,libtoolize ,$(LIBTOOLIZE) ,' -i '$(1)'/bootstrap - $(SED) 's,/bin/bash,/usr/bin/env bash,' -i '$(1)'/bootstrap + $(SED) -i 's,libtoolize ,$(LIBTOOLIZE) ,' '$(1)'/bootstrap + $(SED) -i 's,/bin/bash,/usr/bin/env bash,' '$(1)'/bootstrap cd '$(1)' && ./bootstrap cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ @@ -45,7 +45,7 @@ define $(PKG)_BUILD # Disable VMIME_HAVE_MLANG_H # We have the header, but there is no implementation for IMultiLanguage in MinGW - $(SED) 's,^#define VMIME_HAVE_MLANG_H 1$$,,' -i '$(1)/vmime/config.hpp' + $(SED) -i 's,^#define VMIME_HAVE_MLANG_H 1$$,,' '$(1)/vmime/config.hpp' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' install diff --git a/src/w32api.mk b/src/w32api.mk index 006ebf2..6b64581 100644 --- a/src/w32api.mk +++ b/src/w32api.mk @@ -20,11 +20,11 @@ endef define $(PKG)_BUILD # fix incompatibilities with gettext - $(SED) 's,\(SUBLANG_BENGALI_INDIA\t\)0x01,\10x00,' -i '$(1)/include/winnt.h' - $(SED) 's,\(SUBLANG_PUNJABI_INDIA\t\)0x01,\10x00,' -i '$(1)/include/winnt.h' - $(SED) 's,\(SUBLANG_ROMANIAN_ROMANIA\t\)0x01,\10x00,' -i '$(1)/include/winnt.h' + $(SED) -i 's,\(SUBLANG_BENGALI_INDIA\t\)0x01,\10x00,' '$(1)/include/winnt.h' + $(SED) -i 's,\(SUBLANG_PUNJABI_INDIA\t\)0x01,\10x00,' '$(1)/include/winnt.h' + $(SED) -i 's,\(SUBLANG_ROMANIAN_ROMANIA\t\)0x01,\10x00,' '$(1)/include/winnt.h' # fix incompatibilities with jpeg - $(SED) 's,typedef unsigned char boolean;,,' -i '$(1)/include/rpcndr.h' + $(SED) -i 's,typedef unsigned char boolean;,,' '$(1)/include/rpcndr.h' $(INSTALL) -d '$(PREFIX)/$(TARGET)' cp -rpv '$(1)/include' '$(1)/lib' '$(PREFIX)/$(TARGET)' endef diff --git a/src/winpcap.mk b/src/winpcap.mk index 6dbccb4..82b8a20 100644 --- a/src/winpcap.mk +++ b/src/winpcap.mk @@ -19,11 +19,11 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) '/#include/ s,\\,/,g' -i '$(1)/packetNtx/Dll/Packet32.c' - $(SED) 's,#include <packet32\.h>,#include <Packet32.h>,' -i '$(1)/packetNtx/Dll/Packet32.c' - $(SED) 's,#include <StrSafe\.h>,#include <strsafe.h>,' -i '$(1)/packetNtx/Dll/Packet32.c' - $(SED) 's,#include <Iphlpapi\.h>,#include <iphlpapi.h>,' -i '$(1)/packetNtx/Dll/Packet32.c' - $(SED) 's,#include <IPIfCons\.h>,#include <ipifcons.h>,' -i '$(1)/packetNtx/Dll/Packet32.c' + $(SED) -i '/#include/ s,\\,/,g' '$(1)/packetNtx/Dll/Packet32.c' + $(SED) -i 's,#include <packet32\.h>,#include <Packet32.h>,' '$(1)/packetNtx/Dll/Packet32.c' + $(SED) -i 's,#include <StrSafe\.h>,#include <strsafe.h>,' '$(1)/packetNtx/Dll/Packet32.c' + $(SED) -i 's,#include <Iphlpapi\.h>,#include <iphlpapi.h>,' '$(1)/packetNtx/Dll/Packet32.c' + $(SED) -i 's,#include <IPIfCons\.h>,#include <ipifcons.h>,' '$(1)/packetNtx/Dll/Packet32.c' cd '$(1)' && $(TARGET)-gcc -ICommon -IpacketNtx/Dll -O -c '$(1)/packetNtx/Dll/Packet32.c' $(TARGET)-ar rc '$(1)/libpacket.a' '$(1)/Packet32.o' $(TARGET)-ranlib '$(1)/libpacket.a' @@ -32,10 +32,10 @@ define $(PKG)_BUILD $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' $(INSTALL) -m644 '$(1)/libpacket.a' '$(PREFIX)/$(TARGET)/lib/' mv '$(1)/wpcap/libpcap/Win32/Include/ip6_misc.h' '$(1)/wpcap/libpcap/Win32/Include/IP6_misc.h' - $(SED) 's,#include <packet32\.h>,#include <Packet32.h>,' -i '$(1)/wpcap/Win32-Extensions/Win32-Extensions.c' - $(SED) 's,(char\*)tUstr +=,tUstr +=,' -i '$(1)/wpcap/libpcap/inet.c' - $(SED) 's,-DHAVE_AIRPCAP_API,,' -i '$(1)/wpcap/PRJ/GNUmakefile' - $(SED) 's,/common,/Common,' -i '$(1)/wpcap/PRJ/GNUmakefile' + $(SED) -i 's,#include <packet32\.h>,#include <Packet32.h>,' '$(1)/wpcap/Win32-Extensions/Win32-Extensions.c' + $(SED) -i 's,(char\*)tUstr +=,tUstr +=,' '$(1)/wpcap/libpcap/inet.c' + $(SED) -i 's,-DHAVE_AIRPCAP_API,,' '$(1)/wpcap/PRJ/GNUmakefile' + $(SED) -i 's,/common,/Common,' '$(1)/wpcap/PRJ/GNUmakefile' echo -e 'libwpcap.a: $${OBJS}' >> '$(1)/wpcap/PRJ/GNUmakefile' echo -e '\t$${AR} rc $$@ $${OBJS}' >> '$(1)/wpcap/PRJ/GNUmakefile' echo -e '\t$${RANLIB} $$@' >> '$(1)/wpcap/PRJ/GNUmakefile' diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk index ecfb6ae..89df700 100644 --- a/src/wxwidgets.mk +++ b/src/wxwidgets.mk @@ -19,8 +19,8 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) 's,png_check_sig,png_sig_cmp,g' -i '$(1)/configure' - $(SED) 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' -i '$(1)/configure' + $(SED) -i 's,png_check_sig,png_sig_cmp,g' '$(1)/configure' + $(SED) -i 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ @@ -63,8 +63,8 @@ define $(PKG)_BUILD # build the wxWidgets variant without unicode support cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,wxwidgets) - $(SED) 's,png_check_sig,png_sig_cmp,g' -i '$(1)/$(wxwidgets_SUBDIR)/configure' - $(SED) 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' -i '$(1)/$(wxwidgets_SUBDIR)/configure' + $(SED) -i 's,png_check_sig,png_sig_cmp,g' '$(1)/$(wxwidgets_SUBDIR)/configure' + $(SED) -i 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' '$(1)/$(wxwidgets_SUBDIR)/configure' cd '$(1)/$(wxwidgets_SUBDIR)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ |