diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2015-04-23 11:17:05 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2015-04-23 21:10:46 (GMT) |
| commit | 6947d3245f9c76d9124a4c4f3c164154a75f3f62 (patch) | |
| tree | 4c019c057003b388e01a8f97caff7d0911b9dd6d /src | |
| parent | bd326e51e2d52b0c40eb5586398c5e58b9f4c602 (diff) | |
| download | mxe-6947d3245f9c76d9124a4c4f3c164154a75f3f62.zip mxe-6947d3245f9c76d9124a4c4f3c164154a75f3f62.tar.gz mxe-6947d3245f9c76d9124a4c4f3c164154a75f3f62.tar.bz2 | |
itk libdca libvpx openscenegraph: gcc 5 compatibility
Diffstat (limited to 'src')
| -rw-r--r-- | src/itk.mk | 3 | ||||
| -rw-r--r-- | src/libdca.mk | 3 | ||||
| -rw-r--r-- | src/libvpx.mk | 3 | ||||
| -rw-r--r-- | src/openscenegraph.mk | 2 |
4 files changed, 8 insertions, 3 deletions
@@ -16,6 +16,8 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + $(SED) -i 's^# error "Dunno about this gcc"^# warning "Dunno about this gcc"^;' \ + '$(1)/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h' mkdir '$(1).build' cd '$(1).build' && cmake \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ @@ -25,6 +27,7 @@ define $(PKG)_BUILD -DBUILD_TESTING=FALSE \ -DBUILD_EXAMPLES=FALSE \ -DITK_USE_SYSTEM_HDF5=TRUE \ + -DCMAKE_C_FLAGS='-std=gnu89' \ '$(1)' $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1 endef diff --git a/src/libdca.mk b/src/libdca.mk index eb56791..81d9399 100644 --- a/src/libdca.mk +++ b/src/libdca.mk @@ -17,7 +17,8 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - $(MXE_CONFIGURE_OPTS) + $(MXE_CONFIGURE_OPTS) \ + CFLAGS='-std=gnu89' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= diff --git a/src/libvpx.mk b/src/libvpx.mk index bc2f774..4a31575 100644 --- a/src/libvpx.mk +++ b/src/libvpx.mk @@ -25,7 +25,8 @@ define $(PKG)_BUILD --target=@libvpx-target@ \ --disable-examples \ --disable-install-docs \ - --as=$(TARGET)-yasm + --as=$(TARGET)-yasm \ + --extra-cflags='-std=gnu89' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install $(TARGET)-ranlib $(PREFIX)/$(TARGET)/lib/libvpx.a diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index 25ee304..520797f 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -22,7 +22,7 @@ define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && cmake '$(1)' \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS \ + -DCMAKE_CXX_FLAGS='-D__STDC_CONSTANT_MACROS -fpermissive' \ -DCMAKE_HAVE_PTHREAD_H=OFF \ -DPKG_CONFIG_EXECUTABLE='$(PREFIX)/bin/$(TARGET)-pkg-config' \ -DDYNAMIC_OPENTHREADS=OFF \ |