1 | | Attached is a patch that will make the MapGuide source tree buildable on Ubuntu 11.10. An overview of this patch is as follows: |
| 1 | Attached is a patch that will make the MapGuide source tree buildable on Ubuntu 11.10 with the provided compilers (GCC 4.6). An overview of this patch is as follows: |
| 2 | |
| 3 | * `IMake/stdafx.h`: includes the cstdio header to fix compiler errors relating to stdio functions |
| 4 | * `IMake/Makefile`: replace -mcpu (deprecated) with -mtune and replace i386 to i686. Also remove self deletion on "clean" target |
| 5 | * `Oem/ACE/ACE_wrappers/include/makeinclude/platform_linux.GNU`: Refined check for librt.so |
| 6 | * `Oem/ACE/ACE_wrappers/include/makeinclude/platform_linux_common.GNU`: Refined check for librt.so |
| 7 | * `Oem/geos-2.2.0/configure.in`: Fix invalid use of the AC_SUBST macro (on Ubuntu this spat out "AC_SUBST(xxx) is not a valid shell variable name" before this patch) |
| 8 | * `Oem/SWIGEx/Makefile`: Same fixes as the Makefile for IMake |
| 9 | * `Oem/dbxml/xqilla/Makefile.in`: Remove the lexer regeneration step as this requires a super-ancient (circa-1997) and custom-patched version of flex. Regenerating the lexer does not seem to be necessary |
| 10 | * `Oem/dbxml/xqilla/include/xqilla/framework/XPath2MemoryManager.hpp`: includes the cstddef header to fix the "ptrdiff_t does not name a type" compiler error. |
| 11 | * `Oem/Makefile.am`: Remove copy commands to non-existent DWF Toolkit files |
| 12 | * `Common/Security/CryptographyUtil.cpp`: Include cstdio header to fix compiler errors. |
| 13 | * `Common/Renderers/ObservationMesh.cpp`: include cstdio header to fix compiler errors. |
| 14 | * `Common/Renderers/Makefile.am`: Add linker references to DWF Toolkit |
| 15 | * `Common/Stylization/atom.h`: Rename Shape() to GetShape() to fix compiler error (declaration of 'virtual RichText::ATOM::Shape::Type RichText::ATOM::IStructure::Shape() const' changes meaning of 'Shape' from 'class RichText::ATOM::Shape' [-fpermissive]) |
| 16 | * `Common/Stylization/atom_element_structure.h`: Rename Shape() to GetShape() to fix compiler error (declaration of 'virtual RichText::ATOM::Shape::Type RichText::ATOM::IStructure::Shape() const' changes meaning of 'Shape' from 'class RichText::ATOM::Shape' [-fpermissive]) |
| 17 | * `Common/Stylization/Makefile.am`: Add linker references to FDO Expression Engine |
| 18 | * `Common/Stylization/SE_BufferPool.cpp`: Add cstdlib header to fix compiler errors. |
| 19 | * `configure.in`: Update version to 2.4.0 and change -mcpu (deprecated) to -mtune and i386 to i686 |
| 20 | * `Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp`: Include cstdio header to fix compiler errors. |
| 21 | * `Web/src/CgiAgent/Makefile.am`: Add linker reference to MgMapGuideCommon and lib_json in oem |