Author: hdu Date: Wed Apr 17 12:31:34 2013 New Revision: 1468866 URL: http://svn.apache.org/r1468866 Log: fix build breaker by avoiding typedef of typeof magic for a simple type
even recent clang versions choke on "typedef typeof(SIG_DFL)" at least on Mac Added: openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-clang.patch Modified: openoffice/trunk/ext_libraries/coinmp/makefile.mk Added: openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-clang.patch URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-clang.patch?rev=1468866&view=auto ============================================================================== --- openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-clang.patch (added) +++ openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-clang.patch Wed Apr 17 12:31:34 2013 @@ -0,0 +1,14 @@ +--- misc/CoinMP-1.6.0/CoinUtils/src/CoinSignal.hpp 2011-01-04 00:31:00.000000000 +0100 ++++ misc/build/CoinMP-1.6.0/CoinUtils/src/CoinSignal.hpp 2013-03-01 18:22:08.000000000 +0100 +@@ -95,7 +95,10 @@ + + //----------------------------------------------------------------------------- + +-#if defined(__MACH__) && defined(__GNUC__) ++#if defined(__clang__) ++ typedef void(*CoinSighandler_t)(int); ++# define CoinSighandler_t_defined ++#elif defined(__MACH__) && defined(__GNUC__) + typedef typeof(SIG_DFL) CoinSighandler_t; + # define CoinSighandler_t_defined + #endif Modified: openoffice/trunk/ext_libraries/coinmp/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/coinmp/makefile.mk?rev=1468866&r1=1468865&r2=1468866&view=diff ============================================================================== --- openoffice/trunk/ext_libraries/coinmp/makefile.mk (original) +++ openoffice/trunk/ext_libraries/coinmp/makefile.mk Wed Apr 17 12:31:34 2013 @@ -45,14 +45,16 @@ all: TARFILE_NAME=CoinMP-1.6.0 TARFILE_MD5=2b5f1ca58d6ef30f18f1415b65bed81c -PATCH_FILES=coinmp-1.6.0.patch +PATCH_FILES=coinmp-1.6.0.patch coinmp-1.6.0-clang.patch .IF "$(COM)"=="MSC" BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe CoinMP\\MSVisualStudio\\v9\\CoinMP.sln "Release|Win32" .ELSE CONFIGURE_ACTION=./configure -CONFIGURE_FLAGS=--disable-pkg-config --disable-bzlib --disable-zlib -BUILD_ACTION=$(GNUMAKE) +#CONFIGURE_FLAGS=--disable-pkg-config --disable-bzlib --disable-zlib CC='$(CC) $(ARCH_FLAGS)' CXX='$(CXX) $(ARCH_FLAGS)' CFLAGS='$(ARCH_FLAGS) -Wc,-arch -Wc,i386' CPPFLAGS='$(ARCH_FLAGS)' LDFLAGS='$(ARCH_FLAGS)' compiler_flags='$(ARCH_FLAGS)' +CONFIGURE_FLAGS=--disable-pkg-config --disable-bzlib --disable-zlib CC='$(CC) $(ARCH_FLAGS)' CXX='$(CXX) $(ARCH_FLAGS)' +#BUILD_ACTION= CC="$(CC) $(ARCH_FLAGS)" CPP="$(CXX) $(ARCH_FLAGS)" $(GNUMAKE) -j8 +BUILD_ACTION= $(GNUMAKE) -j8 .ENDIF OUT2INC+=CoinMP$/src/CoinMP.h