diff -u -r cmake-2.4.3/Modules/CMakeDetermineSystem.cmake cmake-2.4.3.patched/Modules/CMakeDetermineSystem.cmake --- cmake-2.4.3/Modules/CMakeDetermineSystem.cmake 2006-07-31 16:49:56.000000000 +0200 +++ cmake-2.4.3.patched/Modules/CMakeDetermineSystem.cmake 2006-12-19 11:24:19.000000000 +0100 @@ -25,6 +25,7 @@ # Ultrix ULTRIX # cygwin CYGWIN_NT-5.1 # MacOSX Darwin +# OS/390 OS/390 IF(UNIX) FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) @@ -61,6 +62,11 @@ SET(CMAKE_SYSTEM_NAME BSDOS) ENDIF(CMAKE_SYSTEM_NAME MATCHES BSD.OS) +# fix for OS/390 , remove the / +IF(CMAKE_SYSTEM_NAME MATCHES OS.390) + SET(CMAKE_SYSTEM_NAME OS390) +ENDIF(CMAKE_SYSTEM_NAME MATCHES OS.390) + # fix for CYGWIN which has windows version in it IF(CMAKE_SYSTEM_NAME MATCHES CYGWIN) SET(CMAKE_SYSTEM_NAME CYGWIN) diff -u -r cmake-2.4.3/Source/cmCommandArgumentLexer.cxx cmake-2.4.3.patched/Source/cmCommandArgumentLexer.cxx --- cmake-2.4.3/Source/cmCommandArgumentLexer.cxx 2006-07-31 16:49:56.000000000 +0200 +++ cmake-2.4.3.patched/Source/cmCommandArgumentLexer.cxx 2006-12-18 14:27:13.000000000 +0100 @@ -365,6 +365,7 @@ } ; static yyconst flex_int32_t yy_ec[256] = +#ifndef OS_390 { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -395,6 +396,38 @@ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; +#else + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 3, 1, 1, 1, 1, 4, 4, 1, 1, 1, + + 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 5, 1, 1, 1, 1, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, + 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, + 1, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 7, 4, 4, 4, 4, 4, 4, 4, 4, + + 4, 1, 1, 1, 1, 1, 1, 8, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, + 1, 1, 1, 6, 1, 4, 4, 4, 4, 4, + 4, 4, 4, 1, 1, 1, 1, 1, 1, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 1, 1, 1, 1 + } ; +#endif static yyconst flex_int32_t yy_meta[9] = { 0, diff -u -r cmake-2.4.3/Source/cmDependsFortranLexer.cxx cmake-2.4.3.patched/Source/cmDependsFortranLexer.cxx --- cmake-2.4.3/Source/cmDependsFortranLexer.cxx 2006-07-31 16:49:57.000000000 +0200 +++ cmake-2.4.3.patched/Source/cmDependsFortranLexer.cxx 2006-12-18 16:03:35.000000000 +0100 @@ -388,6 +388,7 @@ } ; static yyconst flex_int32_t yy_ec[256] = +#ifndef OS_390 { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, @@ -418,6 +419,36 @@ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; +#else + { 0, + 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, + 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 5, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, + 9, 12, 1, 13, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, + 14, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 8, 1, 11, 1, 7, 1, 15, 1, + 16, 17, 18, 19, 1, 1, 20, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 21, 22, 23, 24, + 1, 1, 25, 1, 1, 1, 1, 1, 1, 1, + 1, 26, 27, 28, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 15, 1, 16, 17, 18, 19, 1, 1, + 20, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 21, 22, 23, 24, 1, 1, 25, 1, 1, 1, + 1, 1, 1, 1, 1, 26, 27, 28, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1 + } ; +#endif static yyconst flex_int32_t yy_meta[29] = { 0, diff -u -r cmake-2.4.3/Source/cmDependsJavaLexer.cxx cmake-2.4.3.patched/Source/cmDependsJavaLexer.cxx --- cmake-2.4.3/Source/cmDependsJavaLexer.cxx 2006-07-31 16:49:57.000000000 +0200 +++ cmake-2.4.3.patched/Source/cmDependsJavaLexer.cxx 2006-12-18 16:04:26.000000000 +0100 @@ -391,6 +391,7 @@ } ; static yyconst flex_int32_t yy_ec[256] = +#ifndef OS_390 { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, @@ -421,6 +422,36 @@ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; +#else + { 0, + 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, + 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 16, 23, 10, 13, 62, 8, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, + 6, 12, 11, 22, 36, 15, 17, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 14, 7, 30, 25, + 26, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 21, 1, 1, 9, 24, 5, 1, 37, 38, + 39, 40, 41, 42, 43, 44, 45, 1, 1, 1, + 1, 1, 1, 1, 30, 46, 47, 48, 49, 50, + 51, 30, 52, 1, 1, 1, 1, 1, 1, 1, + 64, 53, 54, 55, 56, 57, 58, 59, 60, 1, + 1, 1, 33, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 35, 1, + 1, 61, 27, 27, 27, 28, 29, 28, 30, 30, + 30, 1, 1, 1, 1, 1, 1, 63, 30, 30, + 31, 30, 30, 30, 30, 30, 30, 1, 1, 1, + 1, 1, 1, 34, 1, 30, 30, 30, 30, 30, + 32, 30, 30, 1, 1, 1, 1, 1, 1, 18, + 19, 19, 19, 19, 19, 19, 19, 20, 20, 1, + 1, 1, 1, 1, 1 + } ; +#endif static yyconst flex_int32_t yy_meta[65] = { 0, diff -u -r cmake-2.4.3/Source/cmExprLexer.cxx cmake-2.4.3.patched/Source/cmExprLexer.cxx --- cmake-2.4.3/Source/cmExprLexer.cxx 2006-07-31 16:49:57.000000000 +0200 +++ cmake-2.4.3.patched/Source/cmExprLexer.cxx 2006-12-18 16:04:02.000000000 +0100 @@ -360,6 +360,7 @@ } ; static yyconst flex_int32_t yy_ec[256] = +#ifndef OS_390 { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -390,6 +391,36 @@ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; +#else + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 11, 4, 7, 14, 3, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 6, 5, 1, 13, 8, 9, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 1, 12, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 15, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 1, + 1, 1, 1, 1, 1 + } ; +#endif static yyconst flex_int32_t yy_meta[16] = { 0, diff -u -r cmake-2.4.3/Source/cmListFileLexer.c cmake-2.4.3.patched/Source/cmListFileLexer.c --- cmake-2.4.3/Source/cmListFileLexer.c 2006-07-31 16:49:57.000000000 +0200 +++ cmake-2.4.3.patched/Source/cmListFileLexer.c 2006-12-18 16:04:49.000000000 +0100 @@ -372,6 +372,7 @@ } ; static yyconst flex_int32_t yy_ec[256] = +#ifndef OS_390 { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, @@ -402,6 +403,36 @@ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; +#else + { 0, + 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, + 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 8, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 7, 1, 9, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 11, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 6, 1, 1, 1, 5, 1, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 1, 1, 1, + 1, 1, 1, 1, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 1, 1, 1, 1, 1, 1, 1, + 1, 11, 11, 11, 11, 11, 11, 11, 11, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 1, 1, 1, 1, 1, 1, 1, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 1, 1, 1, + 1, 1, 1, 12, 1, 11, 11, 11, 11, 11, + 11, 11, 11, 1, 1, 1, 1, 1, 1, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 1, + 1, 1, 1, 1, 1 + } ; +#endif static yyconst flex_int32_t yy_meta[13] = { 0, diff -u -r cmake-2.4.3/Source/cmSystemTools.cxx cmake-2.4.3.patched/Source/cmSystemTools.cxx --- cmake-2.4.3/Source/cmSystemTools.cxx 2006-07-31 16:49:57.000000000 +0200 +++ cmake-2.4.3.patched/Source/cmSystemTools.cxx 2006-12-18 16:02:04.000000000 +0100 @@ -26,7 +26,11 @@ #ifndef _WIN32 #include #include +#ifndef OS_390 #include +#else +#include +#endif #include #endif diff -u -r cmake-2.4.3/Source/kwsys/DynamicLoader.cxx cmake-2.4.3.patched/Source/kwsys/DynamicLoader.cxx --- cmake-2.4.3/Source/kwsys/DynamicLoader.cxx 2006-07-31 16:49:59.000000000 +0200 +++ cmake-2.4.3.patched/Source/kwsys/DynamicLoader.cxx 2006-12-20 09:28:16.000000000 +0100 @@ -26,6 +26,11 @@ #include #endif //__hpux +#ifdef OS_390 +#include +#include +#endif // OS_390 + // Work-around CMake dependency scanning limitation. This must // duplicate the above list of headers. #if 0 @@ -33,13 +38,14 @@ # include "Configure.hxx.in" #endif -// This file is actually 3 different implementations. +// This file is actually 5 different implementations. // 1. HP machines which uses shl_load // 2. Mac OS X 10.2.x and earlier which uses NSLinkModule // 3. Windows which uses LoadLibrary // 4. Most unix systems (including Mac OS X 10.3 and later) which use dlopen // (default) Each part of the ifdef contains a complete implementation for // the static methods of DynamicLoader. +// 5. OS/390 machines which uses dllload namespace KWSYS_NAMESPACE { @@ -327,6 +333,75 @@ #endif //_WIN32 // --------------------------------------------------------------- +// 5. Implementation for OS/390 machines +#ifdef OS_390 +#include +#define DYNAMICLOADER_DEFINED 1 + +namespace KWSYS_NAMESPACE +{ + +//---------------------------------------------------------------------------- +DynamicLoader::LibraryHandle DynamicLoader::OpenLibrary(const char* libname ) +{ + return dllload(libname); +} + +//---------------------------------------------------------------------------- +int DynamicLoader::CloseLibrary(DynamicLoader::LibraryHandle lib) +{ + return !dllfree(lib); +} + +//---------------------------------------------------------------------------- +DynamicLoader::SymbolPointer +DynamicLoader::GetSymbolAddress(DynamicLoader::LibraryHandle lib, const char* sym) +{ + void* addr; + int status; + + addr = (void*) dllqueryfn(lib, sym); + + // Hack to cast pointer-to-data to pointer-to-function. + return *reinterpret_cast(&addr); +} + +//---------------------------------------------------------------------------- +const char* DynamicLoader::LibPrefix() +{ + return "lib"; +} + +//---------------------------------------------------------------------------- +const char* DynamicLoader::LibExtension() +{ + return ".so"; +} + +//---------------------------------------------------------------------------- +const char* DynamicLoader::LastError() +{ + // TODO: Need implementation with errno/strerror + // TODO: Needs investigation of what errno is set upon error!!! + /* If successful, dllqueryfn returns a pointer to a function. If + * unnsuccsessfull it returns NULL and sets errno. + */ + + if( errno == ENOEXEC + || errno == EINVAL ) + { + return strerror(errno); + } + // else + return 0; +} + +} // namespace KWSYS_NAMESPACE + +#endif // OS_390 + + +// --------------------------------------------------------------- // 4. Implementation for default UNIX machines. // if nothing has been defined then use this #ifndef DYNAMICLOADER_DEFINED @@ -394,3 +469,4 @@ } // namespace KWSYS_NAMESPACE #endif + diff -u -r cmake-2.4.3/Source/kwsys/DynamicLoader.hxx.in cmake-2.4.3.patched/Source/kwsys/DynamicLoader.hxx.in --- cmake-2.4.3/Source/kwsys/DynamicLoader.hxx.in 2006-07-31 16:49:59.000000000 +0200 +++ cmake-2.4.3.patched/Source/kwsys/DynamicLoader.hxx.in 2006-12-20 09:13:03.000000000 +0100 @@ -18,6 +18,8 @@ #if defined(__hpux) #include +#elif defined(OS_390) + #include #elif defined(_WIN32) #include #elif defined(__APPLE__) @@ -54,6 +56,8 @@ // They are different on several different OS's #if defined(__hpux) typedef shl_t LibraryHandle; +#elif defined(OS_390) + typedef dllhandle* LibraryHandle; #elif defined(_WIN32) typedef HMODULE LibraryHandle; #elif defined(__APPLE__) diff -u -r cmake-2.4.3/Source/kwsys/SystemTools.cxx cmake-2.4.3.patched/Source/kwsys/SystemTools.cxx --- cmake-2.4.3/Source/kwsys/SystemTools.cxx 2006-07-31 16:49:59.000000000 +0200 +++ cmake-2.4.3.patched/Source/kwsys/SystemTools.cxx 2006-12-21 08:18:09.000000000 +0100 @@ -51,7 +51,9 @@ // support for realpath call #ifndef _WIN32 #include +#ifndef OS_390 #include +#endif #include #include #include diff -u -r cmake-2.4.3/Utilities/cmtar/extract.c cmake-2.4.3.patched/Utilities/cmtar/extract.c --- cmake-2.4.3/Utilities/cmtar/extract.c 2006-07-31 16:50:01.000000000 +0200 +++ cmake-2.4.3.patched/Utilities/cmtar/extract.c 2006-12-20 15:37:43.000000000 +0100 @@ -606,8 +606,12 @@ filename, devmaj, devmin); #endif #ifndef WIN32 +#ifdef OS_390 + if (mknod(filename, mode | S_IFCHR, 0x00010000|0x0001) == -1) +#else if (mknod(filename, mode | S_IFCHR, compat_makedev(devmaj, devmin)) == -1) +#endif #else (void)devmin; (void)devmaj; @@ -682,8 +686,12 @@ filename, devmaj, devmin); #endif #ifndef WIN32 +#ifdef OS_390 + if (mknod(filename, mode | S_IFBLK, 0) == -1) +#else if (mknod(filename, mode | S_IFBLK, compat_makedev(devmaj, devmin)) == -1) +#endif #else (void)devmin; (void)devmaj; diff -u -r cmake-2.4.3/Utilities/cmzlib/zconf.h cmake-2.4.3.patched/Utilities/cmzlib/zconf.h --- cmake-2.4.3/Utilities/cmzlib/zconf.h 2006-07-31 16:50:01.000000000 +0200 +++ cmake-2.4.3.patched/Utilities/cmzlib/zconf.h 2006-12-21 09:34:36.000000000 +0100 @@ -261,7 +261,7 @@ #endif /* MVS linker does not support external names larger than 8 bytes */ -#if defined(__MVS__) +#if defined(__MVS__) && !defined(OS_390) # pragma map(deflateInit_,"DEIN") # pragma map(deflateInit2_,"DEIN2") # pragma map(deflateEnd,"DEEND") diff -u -P -r cmake-2.4.3/Modules/Platform/OS390.cmake cmake-2.4.3.patched/Modules/Platform/OS390.cmake --- cmake-2.4.3/Modules/Platform/OS390.cmake 1970-01-01 01:00:00.000000000 +0100 +++ cmake-2.4.3.patched/Modules/Platform/OS390.cmake 2006-12-21 12:46:15.000000000 +0100 @@ -0,0 +1,3 @@ +SET(CMAKE_DL_LIBS "") +SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-Wc,dll") +INCLUDE(Platform/UnixPaths) diff -u -r cmake-2.4.3/Utilities/cmtar/handle.c cmake-2.4.3.patched/Utilities/cmtar/handle.c --- cmake-2.4.3/Utilities/cmtar/handle.c 2006-07-31 16:50:01.000000000 +0200 +++ cmake-2.4.3.patched/Utilities/cmtar/hangle.c 2006-12-21 09:34:36.000000000 +0100 @@ -26,7 +26,7 @@ #ifdef HAVE_IO_H #include -//Yogi: hack. this should work on windows where there is no O_ACCMODE defined +/* Yogi: hack. this should work on windows where there is no O_ACCMODE defined */ #ifndef O_ACCMODE # define O_ACCMODE 0x0003 #endif