diff options
| -rw-r--r-- | src/eigen.mk | 2 | ||||
| -rw-r--r-- | src/fltk.mk | 2 | ||||
| -rw-r--r-- | src/gcc.mk | 2 | ||||
| -rw-r--r-- | src/gsl.mk | 2 | ||||
| -rw-r--r-- | src/libircclient.mk | 2 | ||||
| -rw-r--r-- | src/liboauth.mk | 2 | ||||
| -rw-r--r-- | src/libpng.mk | 2 | ||||
| -rw-r--r-- | src/llvm.mk | 2 | ||||
| -rw-r--r-- | src/vtk.mk | 6 |
9 files changed, 11 insertions, 11 deletions
diff --git a/src/eigen.mk b/src/eigen.mk index 92ea9b5..33435ff 100644 --- a/src/eigen.mk +++ b/src/eigen.mk @@ -21,6 +21,6 @@ endef 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 diff --git a/src/fltk.mk b/src/fltk.mk index e44bf06..ba9a0e8 100644 --- a/src/fltk.mk +++ b/src/fltk.mk @@ -33,7 +33,7 @@ define $(PKG)_BUILD $(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' \ @@ -59,7 +59,7 @@ define $(PKG)_BUILD 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)'; \ @@ -28,7 +28,7 @@ define $(PKG)_BUILD --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' \ diff --git a/src/libircclient.mk b/src/libircclient.mk index 70b1ea3..00dd07e 100644 --- a/src/libircclient.mk +++ b/src/libircclient.mk @@ -30,7 +30,7 @@ define $(PKG)_BUILD $(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' diff --git a/src/liboauth.mk b/src/liboauth.mk index 96fee60..5a6f6ca 100644 --- a/src/liboauth.mk +++ b/src/liboauth.mk @@ -26,7 +26,7 @@ define $(PKG)_BUILD --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' \ diff --git a/src/libpng.mk b/src/libpng.mk index b12f9b2..df323d2 100644 --- a/src/libpng.mk +++ b/src/libpng.mk @@ -30,7 +30,7 @@ define $(PKG)_BUILD --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' \ diff --git a/src/llvm.mk b/src/llvm.mk index a733d6a..eee2164 100644 --- a/src/llvm.mk +++ b/src/llvm.mk @@ -3,7 +3,7 @@ # llvm PKG := llvm -$(PKG)_IGNORE := +$(PKG)_IGNORE := $(PKG)_VERSION := 3.0 $(PKG)_CHECKSUM := b683e7294fcf69887c0d709025d4640f5dca755b $(PKG)_SUBDIR := llvm-$($(PKG)_VERSION).src @@ -29,13 +29,13 @@ define $(PKG)_BUILD -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 \ |