Mercurial > mxe-octave
changeset 2329:466e77a78672
Fix annoying whitespaces at EOL
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Tue, 27 Mar 2012 13:29:57 +0200 |
| parents | bec415758d1b |
| children | 95a79430eec1 |
| files | src/eigen.mk src/fltk.mk src/gcc.mk src/gsl.mk src/libircclient.mk src/liboauth.mk src/libpng.mk src/llvm.mk src/vtk.mk |
| diffstat | 9 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eigen.mk Tue Mar 27 13:29:30 2012 +0200 +++ b/src/eigen.mk Tue Mar 27 13:29:57 2012 +0200 @@ -21,6 +21,6 @@ define $(PKG)_BUILD cd '$(1)' && \ - cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' $(MAKE) -C '$(1)' -j '$(JOBS)' install endef
--- a/src/fltk.mk Tue Mar 27 13:29:30 2012 +0200 +++ b/src/fltk.mk Tue Mar 27 13:29:57 2012 +0200 @@ -33,7 +33,7 @@ $(SED) -i 's,-fno-exceptions,,' '$(1)/makeinclude' $(MAKE) -C '$(1)' -j '$(JOBS)' install DIRS=src LIBCOMMAND='$(TARGET)-ar cr' ln -sf '$(PREFIX)/$(TARGET)/bin/fltk-config' '$(PREFIX)/bin/$(TARGET)-fltk-config' - + '$(TARGET)-g++' \ -W -Wall -Werror -pedantic -ansi \ '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-fltk.exe' \
--- a/src/gcc.mk Tue Mar 27 13:29:30 2012 +0200 +++ b/src/gcc.mk Tue Mar 27 13:29:57 2012 +0200 @@ -59,7 +59,7 @@ echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(PREFIX)/$(TARGET)/lib/pkgconfig'\'' exec pkg-config --static "$$@"') \ > '$(PREFIX)/bin/$(TARGET)-pkg-config' chmod 0755 '$(PREFIX)/bin/$(TARGET)-pkg-config' - + # create the CMake toolchain file [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))' (echo 'set(BUILD_SHARED_LIBS OFF)'; \
--- a/src/gsl.mk Tue Mar 27 13:29:30 2012 +0200 +++ b/src/gsl.mk Tue Mar 27 13:29:57 2012 +0200 @@ -28,7 +28,7 @@ --enable-static $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - + '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gsl.exe' \
--- a/src/libircclient.mk Tue Mar 27 13:29:30 2012 +0200 +++ b/src/libircclient.mk Tue Mar 27 13:29:57 2012 +0200 @@ -30,7 +30,7 @@ $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' $(INSTALL) -m644 '$(1)/src/libircclient.a' '$(PREFIX)/$(TARGET)/lib/' $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/libircclient' - $(INSTALL) -m644 '$(1)/include/libircclient.h' '$(PREFIX)/$(TARGET)/include/libircclient' + $(INSTALL) -m644 '$(1)/include/libircclient.h' '$(PREFIX)/$(TARGET)/include/libircclient' $(INSTALL) -m644 '$(1)/include/libirc_errors.h' '$(PREFIX)/$(TARGET)/include/libircclient' $(INSTALL) -m644 '$(1)/include/libirc_events.h' '$(PREFIX)/$(TARGET)/include/libircclient' $(INSTALL) -m644 '$(1)/include/libirc_rfcnumeric.h' '$(PREFIX)/$(TARGET)/include/libircclient'
--- a/src/liboauth.mk Tue Mar 27 13:29:30 2012 +0200 +++ b/src/liboauth.mk Tue Mar 27 13:29:57 2012 +0200 @@ -26,7 +26,7 @@ --disable-curl $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - + '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-liboauth.exe' \
--- a/src/libpng.mk Tue Mar 27 13:29:30 2012 +0200 +++ b/src/libpng.mk Tue Mar 27 13:29:57 2012 +0200 @@ -30,7 +30,7 @@ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - + '$(TARGET)-gcc' \ -W -Wall -Werror -std=c99 -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libpng.exe' \
--- a/src/llvm.mk Tue Mar 27 13:29:30 2012 +0200 +++ b/src/llvm.mk Tue Mar 27 13:29:57 2012 +0200 @@ -3,7 +3,7 @@ # llvm PKG := llvm -$(PKG)_IGNORE := +$(PKG)_IGNORE := $(PKG)_VERSION := 3.0 $(PKG)_CHECKSUM := b683e7294fcf69887c0d709025d4640f5dca755b $(PKG)_SUBDIR := llvm-$($(PKG)_VERSION).src
--- a/src/vtk.mk Tue Mar 27 13:29:30 2012 +0200 +++ b/src/vtk.mk Tue Mar 27 13:29:57 2012 +0200 @@ -29,13 +29,13 @@ -DOPENGL_INCLUDE_DIR='$(1)/Utilities/ParseOGLExt/headers' \ -DVTK_USE_RENDERING=FALSE \ .. - + # only the newly created CompileTools target need to be built $(MAKE) -C '$(1)/native_build' -j '$(JOBS)' VERBOSE=1 CompileTools - + # DirectX is detected on Mac OSX but requires a DX10 header - dxgi.h rm '$(1)/CMake/FindDirectX.cmake' - + # now for the cross compilation mkdir '$(1)/cross_build' cd '$(1)/cross_build' && cmake \