From: maintenance team Date: Thu, 19 Oct 2006 08:13:49 +0000 (+0000) Subject: Adding patches for 64bit X-Git-Tag: V_3_2_3~28 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=12c4bf0cdee8e8d777344aea9fd3da9a985ec677;p=tools%2Finstall.git Adding patches for 64bit --- diff --git a/config_files/Python-2.4.1-lib64.patch b/config_files/Python-2.4.1-lib64.patch new file mode 100755 index 0000000..e7ff034 --- /dev/null +++ b/config_files/Python-2.4.1-lib64.patch @@ -0,0 +1,288 @@ +--- Python-2.4.1/Include/pythonrun.h.lib64 2005-08-25 14:19:42.000000000 +0200 ++++ Python-2.4.1/Include/pythonrun.h 2005-08-25 14:19:39.000000000 +0200 +@@ -93,6 +93,8 @@ + /* In their own files */ + PyAPI_FUNC(const char *) Py_GetVersion(void); + PyAPI_FUNC(const char *) Py_GetPlatform(void); ++PyAPI_FUNC(const char *) Py_GetArch(void); ++PyAPI_FUNC(const char *) Py_GetLib(void); + PyAPI_FUNC(const char *) Py_GetCopyright(void); + PyAPI_FUNC(const char *) Py_GetCompiler(void); + PyAPI_FUNC(const char *) Py_GetBuildInfo(void); +--- Python-2.4.1/Lib/distutils/command/install.py.lib64 2005-08-25 14:20:10.000000000 +0200 ++++ Python-2.4.1/Lib/distutils/command/install.py 2005-08-25 14:20:09.000000000 +0200 +@@ -19,6 +19,8 @@ + from distutils.errors import DistutilsOptionError + from glob import glob + ++libname = sys.lib ++ + if sys.version < "2.2": + WINDOWS_SCHEME = { + 'purelib': '$base', +@@ -38,15 +40,15 @@ + + INSTALL_SCHEMES = { + 'unix_prefix': { +- 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/lib/python$py_version_short/site-packages', ++ 'purelib': '$base/'+libname+'/python$py_version_short/site-packages', ++ 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', + }, + 'unix_home': { +- 'purelib': '$base/lib/python', +- 'platlib': '$base/lib/python', ++ 'purelib': '$base/'+libname+'/python', ++ 'platlib': '$base/'+libname+'/python', + 'headers': '$base/include/python/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +--- Python-2.4.1/Lib/distutils/tests/test_install.py.lib64 2005-08-25 14:20:13.000000000 +0200 ++++ Python-2.4.1/Lib/distutils/tests/test_install.py 2005-08-25 14:20:13.000000000 +0200 +@@ -1,6 +1,7 @@ + """Tests for distutils.command.install.""" + + import os ++import sys + import unittest + + from distutils.command.install import install +@@ -38,7 +39,7 @@ + expected = os.path.normpath(expected) + self.assertEqual(got, expected) + +- libdir = os.path.join(destination, "lib", "python") ++ libdir = os.path.join(destination, sys.lib, "python") + check_path(cmd.install_lib, libdir) + check_path(cmd.install_platlib, libdir) + check_path(cmd.install_purelib, libdir) +--- Python-2.4.1/Lib/distutils/sysconfig.py.lib64 2005-08-25 14:20:13.000000000 +0200 ++++ Python-2.4.1/Lib/distutils/sysconfig.py 2005-08-25 14:20:12.000000000 +0200 +@@ -100,7 +100,7 @@ + + if os.name == "posix": + libpython = os.path.join(prefix, +- "lib", "python" + get_python_version()) ++ sys.lib, "python" + get_python_version()) + if standard_lib: + return libpython + else: +--- Python-2.4.1/Lib/site.py.lib64 2005-08-25 14:21:50.000000000 +0200 ++++ Python-2.4.1/Lib/site.py 2005-08-25 14:55:33.000000000 +0200 +@@ -179,12 +179,18 @@ + sitedirs = [os.path.join(prefix, "Lib", "site-packages")] + elif os.sep == '/': + sitedirs = [os.path.join(prefix, +- "lib", ++ sys.lib, + "python" + sys.version[:3], + "site-packages"), +- os.path.join(prefix, "lib", "site-python")] ++ os.path.join(prefix, sys.lib, "site-python")] ++ if sys.lib != 'lib': ++ sitedirs.append(os.path.join(prefix, ++ 'lib', ++ "python" + sys.version[:3], ++ "site-packages")) ++ sitedirs.append(os.path.join(prefix, 'lib', "site-python")) + else: +- sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")] ++ sitedirs = [prefix, os.path.join(prefix, sys.lib, "site-packages")] + if sys.platform == 'darwin': + # for framework builds *only* we add the standard Apple + # locations. Currently only per-user, but /Library and +--- Python-2.4.1/Modules/getpath.c.lib64 2005-08-25 14:23:20.000000000 +0200 ++++ Python-2.4.1/Modules/getpath.c 2005-08-25 14:23:06.000000000 +0200 +@@ -111,9 +111,17 @@ + #define EXEC_PREFIX PREFIX + #endif + ++#ifndef LIB_PYTHON ++#if defined(__x86_64__) ++#define LIB_PYTHON "lib64/python" VERSION ++#else ++#define LIB_PYTHON "lib/python" VERSION ++#endif ++#endif ++ + #ifndef PYTHONPATH +-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ +- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" ++#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \ ++ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload" + #endif + + #ifndef LANDMARK +@@ -124,7 +132,7 @@ + static char exec_prefix[MAXPATHLEN+1]; + static char progpath[MAXPATHLEN+1]; + static char *module_search_path = NULL; +-static char lib_python[] = "lib/python" VERSION; ++static char lib_python[] = LIB_PYTHON; + + static void + reduce(char *dir) +--- Python-2.4.1/Python/getplatform.c.lib64 2005-08-25 14:23:53.000000000 +0200 ++++ Python-2.4.1/Python/getplatform.c 2005-08-25 14:23:47.000000000 +0200 +@@ -10,3 +10,23 @@ + { + return PLATFORM; + } ++ ++#ifndef ARCH ++#define ARCH "unknown" ++#endif ++ ++const char * ++Py_GetArch(void) ++{ ++ return ARCH; ++} ++ ++#ifndef LIB ++#define LIB "lib" ++#endif ++ ++const char * ++Py_GetLib(void) ++{ ++ return LIB; ++} +--- Python-2.4.1/Python/sysmodule.c.lib64 2005-08-25 14:23:53.000000000 +0200 ++++ Python-2.4.1/Python/sysmodule.c 2005-08-25 14:23:52.000000000 +0200 +@@ -1022,6 +1022,12 @@ + PyDict_SetItemString(sysdict, "platform", + v = PyString_FromString(Py_GetPlatform())); + Py_XDECREF(v); ++ PyDict_SetItemString(sysdict, "arch", ++ v = PyString_FromString(Py_GetArch())); ++ Py_XDECREF(v); ++ PyDict_SetItemString(sysdict, "lib", ++ v = PyString_FromString(Py_GetLib())); ++ Py_XDECREF(v); + PyDict_SetItemString(sysdict, "executable", + v = PyString_FromString(Py_GetProgramFullPath())); + Py_XDECREF(v); +--- Python-2.4.1/configure.in.lib64 2005-08-25 14:24:33.000000000 +0200 ++++ Python-2.4.1/configure.in 2005-08-25 14:19:07.000000000 +0200 +@@ -423,6 +423,41 @@ + ;; + esac + ++AC_SUBST(ARCH) ++AC_MSG_CHECKING(ARCH) ++ARCH=`uname -m` ++case $ARCH in ++i?86) ARCH=i386;; ++esac ++AC_MSG_RESULT($ARCH) ++ ++AC_SUBST(LIB) ++AC_MSG_CHECKING(LIB) ++case $ac_sys_system in ++Linux*) ++ # Test if the compiler is 64bit ++ echo 'int i;' > conftest.$ac_ext ++ python_cv_cc_64bit_output=no ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *"ELF 64"*) ++ python_cv_cc_64bit_output=yes ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++esac ++ ++case $ARCH:$python_cv_cc_64bit_output in ++powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) ++ LIB="lib64" ++ ;; ++*:*) ++ LIB="lib" ++ ;; ++esac ++AC_MSG_RESULT($LIB) + + AC_SUBST(LIBRARY) + AC_MSG_CHECKING(LIBRARY) +--- Python-2.4.1/Makefile.pre.in.lib64 2005-08-25 14:24:35.000000000 +0200 ++++ Python-2.4.1/Makefile.pre.in 2005-08-25 14:19:06.000000000 +0200 +@@ -70,6 +70,8 @@ + + # Machine-dependent subdirectories + MACHDEP= @MACHDEP@ ++LIB= @LIB@ ++ARCH= @ARCH@ + + # Install prefix for architecture-independent files + prefix= @prefix@ +@@ -79,11 +81,11 @@ + + # Expanded directories + BINDIR= $(exec_prefix)/bin +-LIBDIR= $(exec_prefix)/lib ++LIBDIR= $(exec_prefix)/$(LIB) + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ + CONFINCLUDEDIR= $(exec_prefix)/include +-SCRIPTDIR= $(prefix)/lib ++SCRIPTDIR= $(prefix)/$(LIB) + + # Detailed destination directories + BINLIBDEST= $(LIBDIR)/python$(VERSION) +@@ -458,7 +460,7 @@ + Python/compile.o Python/symtable.o: $(GRAMMAR_H) + + Python/getplatform.o: $(srcdir)/Python/getplatform.c +- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c ++ $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c + + Python/importdl.o: $(srcdir)/Python/importdl.c + $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c +--- Python-2.4.1/setup.py.lib64 2005-08-25 14:24:35.000000000 +0200 ++++ Python-2.4.1/setup.py 2005-08-25 14:19:07.000000000 +0200 +@@ -259,12 +259,12 @@ + except NameError: + have_unicode = 0 + ++ libname = sys.lib + # lib_dirs and inc_dirs are used to search for files; + # if a file is found in one of those directories, it can + # be assumed that no additional -I,-L directives are needed. + lib_dirs = self.compiler.library_dirs + [ +- '/lib64', '/usr/lib64', +- '/lib', '/usr/lib', ++ libname, '/usr/'+libname + ] + inc_dirs = self.compiler.include_dirs + ['/usr/include'] + exts = [] +@@ -426,11 +426,11 @@ + elif self.compiler.find_library_file(lib_dirs, 'curses'): + readline_libs.append('curses') + elif self.compiler.find_library_file(lib_dirs + +- ['/usr/lib/termcap'], ++ ['/usr/'+libname+'/termcap'], + 'termcap'): + readline_libs.append('termcap') + exts.append( Extension('readline', ['readline.c'], +- library_dirs=['/usr/lib/termcap'], ++ library_dirs=['/usr/'+libname+'/termcap'], + libraries=readline_libs) ) + if platform not in ['mac']: + # crypt module. +@@ -1017,8 +1017,8 @@ + added_lib_dirs.append('/usr/openwin/lib') + elif os.path.exists('/usr/X11R6/include'): + include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') ++ added_lib_dirs.append('/usr/X11R6/'+sys.lib) ++ #added_lib_dirs.append('/usr/X11R6/lib') + elif os.path.exists('/usr/X11R5/include'): + include_dirs.append('/usr/X11R5/include') + added_lib_dirs.append('/usr/X11R5/lib') diff --git a/config_files/cmake-1.6.6.patch b/config_files/cmake-1.6.6.patch new file mode 100755 index 0000000..bd7585f --- /dev/null +++ b/config_files/cmake-1.6.6.patch @@ -0,0 +1,249 @@ +diff -Naur cmake-1.6.6-original/Modules/FindGLUT.cmake cmake-1.6.6-changed/Modules/FindGLUT.cmake +--- cmake-1.6.6-original/Modules/FindGLUT.cmake 2002-12-03 21:44:50.000000000 +0300 ++++ cmake-1.6.6-changed/Modules/FindGLUT.cmake 2006-10-03 11:19:07.000000000 +0400 +@@ -20,10 +20,10 @@ + + FIND_LIBRARY( GLUT_glut_LIBRARY glut32 + ${OPENGL_LIBRARY_DIR} +- /usr/lib +- /usr/lib/w32api +- /usr/local/lib +- /usr/X11R6/lib ++ /usr/lib64 ++ /usr/lib64/w32api ++ /usr/local/lib64 ++ /usr/X11R6/lib64 + ) + + +@@ -59,28 +59,28 @@ + /usr/X11R6/include + /usr/include/X11 + /opt/graphics/OpenGL/include +- /opt/graphics/OpenGL/contrib/libglut ++ /opt/graphics/OpenGL/contrib/lib64glut + ) + + FIND_LIBRARY( GLUT_glut_LIBRARY glut +- /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib ++ /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 + ) + + FIND_LIBRARY( GLUT_Xi_LIBRARY Xi +- /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib ++ /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 + ) + + FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu +- /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib ++ /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 + ) + + ENDIF (APPLE) +diff -Naur cmake-1.6.6-original/Modules/FindGTK.cmake cmake-1.6.6-changed/Modules/FindGTK.cmake +--- cmake-1.6.6-original/Modules/FindGTK.cmake 2003-03-17 18:00:49.000000000 +0300 ++++ cmake-1.6.6-changed/Modules/FindGTK.cmake 2006-10-03 11:19:43.000000000 +0400 +@@ -32,10 +32,10 @@ + /usr/local/include + /usr/openwin/share/include + /usr/local/include/glib12 +- /usr/lib/glib/include +- /usr/local/lib/glib/include ++ /usr/lib64/glib/include ++ /usr/local/lib64/glib/include + /opt/gnome/include +- /opt/gnome/lib/glib/include ++ /opt/gnome/lib64/glib/include + ) + + FIND_PATH( GTK_glib_INCLUDE_PATH glib.h +@@ -44,7 +44,7 @@ + /usr/openwin/share/include + /usr/include/gtk-1.2 + /usr/local/include/glib12 +- /usr/lib/glib/include ++ /usr/lib64/glib/include + /usr/include/glib-1.2 + /usr/local/include/glib-1.2 + /opt/gnome/include +@@ -59,11 +59,11 @@ + ) + + FIND_LIBRARY( GTK_gtkgl_LIBRARY gtkgl +- /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib +- /opt/gnome/lib ++ /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 ++ /opt/gnome/lib64 + ) + + # +@@ -72,38 +72,38 @@ + + FIND_LIBRARY( GTK_gtk_LIBRARY + NAMES gtk gtk12 +- PATHS /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib +- /opt/gnome/lib ++ PATHS /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 ++ /opt/gnome/lib64 + ) + + FIND_LIBRARY( GTK_gdk_LIBRARY + NAMES gdk gdk12 +- PATHS /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib +- /opt/gnome/lib ++ PATHS /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 ++ /opt/gnome/lib64 + ) + + FIND_LIBRARY( GTK_gmodule_LIBRARY + NAMES gmodule gmodule12 +- PATHS /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib +- /opt/gnome/lib ++ PATHS /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 ++ /opt/gnome/lib64 + ) + + FIND_LIBRARY( GTK_glib_LIBRARY + NAMES glib glib12 +- PATHS /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib +- /opt/gnome/lib ++ PATHS /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 ++ /opt/gnome/lib64 + ) + + IF(GTK_gtk_INCLUDE_PATH) +diff -Naur cmake-1.6.6-original/Modules/FindOpenGL.cmake cmake-1.6.6-changed/Modules/FindOpenGL.cmake +--- cmake-1.6.6-original/Modules/FindOpenGL.cmake 2003-01-15 23:32:14.000000000 +0300 ++++ cmake-1.6.6-changed/Modules/FindOpenGL.cmake 2006-10-03 11:19:52.000000000 +0400 +@@ -30,13 +30,13 @@ + ) + + FIND_LIBRARY(OPENGL_gl_LIBRARY opengl32 +- /usr/lib +- /usr/lib/w32api ++ /usr/lib64 ++ /usr/lib64/w32api + ) + + FIND_LIBRARY(OPENGL_glu_LIBRARY glu32 +- /usr/lib +- /usr/lib/w32api ++ /usr/lib64 ++ /usr/lib64/w32api + ) + + ELSE (CYGWIN) +@@ -81,11 +81,11 @@ + + FIND_LIBRARY(OPENGL_gl_LIBRARY + NAMES MesaGL GL +- PATHS /usr/lib +- /usr/local/lib +- /opt/graphics/OpenGL/lib +- /usr/openwin/lib +- /usr/X11R6/lib ++ PATHS /usr/lib64 ++ /usr/local/lib64 ++ /opt/graphics/OpenGL/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 + ) + + # On Unix OpenGL most certainly always requires X11. +@@ -102,11 +102,11 @@ + FIND_LIBRARY(OPENGL_glu_LIBRARY + NAMES MesaGLU GLU + PATHS ${OPENGL_gl_LIBRARY} +- /usr/lib +- /usr/local/lib +- /opt/graphics/OpenGL/lib +- /usr/openwin/lib +- /usr/X11R6/lib ++ /usr/lib64 ++ /usr/local/lib64 ++ /opt/graphics/OpenGL/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 + ) + + ENDIF (WIN32) +diff -Naur cmake-1.6.6-original/Modules/FindX11.cmake cmake-1.6.6-changed/Modules/FindX11.cmake +--- cmake-1.6.6-original/Modules/FindX11.cmake 2003-01-31 19:40:01.000000000 +0300 ++++ cmake-1.6.6-changed/Modules/FindX11.cmake 2006-10-03 11:20:06.000000000 +0400 +@@ -20,10 +20,10 @@ + ) + + SET(X11_LIB_SEARCH_PATH +- /usr/X11R6/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/lib ++ /usr/X11R6/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/lib64 + ) + + FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) +diff -Naur cmake-1.6.6-original/Modules/Platform/gcc.cmake cmake-1.6.6-changed/Modules/Platform/gcc.cmake +--- cmake-1.6.6-original/Modules/Platform/gcc.cmake 2003-01-22 23:00:08.000000000 +0300 ++++ cmake-1.6.6-changed/Modules/Platform/gcc.cmake 2006-10-12 11:48:38.000000000 +0400 +@@ -3,8 +3,10 @@ + SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os") + SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O3") + SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") ++SET (CMAKE_CXX_FLAGS "-m64 -fPIC") + SET (CMAKE_C_FLAGS_INIT "") + SET (CMAKE_C_FLAGS_DEBUG_INIT "-g") + SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os") + SET (CMAKE_C_FLAGS_RELEASE_INIT "-O3") + SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") ++SET (CMAKE_C_FLAGS "-m64 -fPIC") diff --git a/config_files/cmake-1.6.6.patch-old b/config_files/cmake-1.6.6.patch-old new file mode 100755 index 0000000..b2d7ce3 --- /dev/null +++ b/config_files/cmake-1.6.6.patch-old @@ -0,0 +1,235 @@ +diff -Naur cmake-1.6.6-original/Modules/FindGLUT.cmake cmake-1.6.6-changed/Modules/FindGLUT.cmake +--- cmake-1.6.6-original/Modules/FindGLUT.cmake 2002-12-03 21:44:50.000000000 +0300 ++++ cmake-1.6.6-changed/Modules/FindGLUT.cmake 2006-10-03 11:19:07.000000000 +0400 +@@ -20,10 +20,10 @@ + + FIND_LIBRARY( GLUT_glut_LIBRARY glut32 + ${OPENGL_LIBRARY_DIR} +- /usr/lib +- /usr/lib/w32api +- /usr/local/lib +- /usr/X11R6/lib ++ /usr/lib64 ++ /usr/lib64/w32api ++ /usr/local/lib64 ++ /usr/X11R6/lib64 + ) + + +@@ -59,28 +59,28 @@ + /usr/X11R6/include + /usr/include/X11 + /opt/graphics/OpenGL/include +- /opt/graphics/OpenGL/contrib/libglut ++ /opt/graphics/OpenGL/contrib/lib64glut + ) + + FIND_LIBRARY( GLUT_glut_LIBRARY glut +- /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib ++ /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 + ) + + FIND_LIBRARY( GLUT_Xi_LIBRARY Xi +- /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib ++ /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 + ) + + FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu +- /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib ++ /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 + ) + + ENDIF (APPLE) +diff -Naur cmake-1.6.6-original/Modules/FindGTK.cmake cmake-1.6.6-changed/Modules/FindGTK.cmake +--- cmake-1.6.6-original/Modules/FindGTK.cmake 2003-03-17 18:00:49.000000000 +0300 ++++ cmake-1.6.6-changed/Modules/FindGTK.cmake 2006-10-03 11:19:43.000000000 +0400 +@@ -32,10 +32,10 @@ + /usr/local/include + /usr/openwin/share/include + /usr/local/include/glib12 +- /usr/lib/glib/include +- /usr/local/lib/glib/include ++ /usr/lib64/glib/include ++ /usr/local/lib64/glib/include + /opt/gnome/include +- /opt/gnome/lib/glib/include ++ /opt/gnome/lib64/glib/include + ) + + FIND_PATH( GTK_glib_INCLUDE_PATH glib.h +@@ -44,7 +44,7 @@ + /usr/openwin/share/include + /usr/include/gtk-1.2 + /usr/local/include/glib12 +- /usr/lib/glib/include ++ /usr/lib64/glib/include + /usr/include/glib-1.2 + /usr/local/include/glib-1.2 + /opt/gnome/include +@@ -59,11 +59,11 @@ + ) + + FIND_LIBRARY( GTK_gtkgl_LIBRARY gtkgl +- /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib +- /opt/gnome/lib ++ /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 ++ /opt/gnome/lib64 + ) + + # +@@ -72,38 +72,38 @@ + + FIND_LIBRARY( GTK_gtk_LIBRARY + NAMES gtk gtk12 +- PATHS /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib +- /opt/gnome/lib ++ PATHS /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 ++ /opt/gnome/lib64 + ) + + FIND_LIBRARY( GTK_gdk_LIBRARY + NAMES gdk gdk12 +- PATHS /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib +- /opt/gnome/lib ++ PATHS /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 ++ /opt/gnome/lib64 + ) + + FIND_LIBRARY( GTK_gmodule_LIBRARY + NAMES gmodule gmodule12 +- PATHS /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib +- /opt/gnome/lib ++ PATHS /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 ++ /opt/gnome/lib64 + ) + + FIND_LIBRARY( GTK_glib_LIBRARY + NAMES glib glib12 +- PATHS /usr/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/X11R6/lib +- /opt/gnome/lib ++ PATHS /usr/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 ++ /opt/gnome/lib64 + ) + + IF(GTK_gtk_INCLUDE_PATH) +diff -Naur cmake-1.6.6-original/Modules/FindOpenGL.cmake cmake-1.6.6-changed/Modules/FindOpenGL.cmake +--- cmake-1.6.6-original/Modules/FindOpenGL.cmake 2003-01-15 23:32:14.000000000 +0300 ++++ cmake-1.6.6-changed/Modules/FindOpenGL.cmake 2006-10-03 11:19:52.000000000 +0400 +@@ -30,13 +30,13 @@ + ) + + FIND_LIBRARY(OPENGL_gl_LIBRARY opengl32 +- /usr/lib +- /usr/lib/w32api ++ /usr/lib64 ++ /usr/lib64/w32api + ) + + FIND_LIBRARY(OPENGL_glu_LIBRARY glu32 +- /usr/lib +- /usr/lib/w32api ++ /usr/lib64 ++ /usr/lib64/w32api + ) + + ELSE (CYGWIN) +@@ -81,11 +81,11 @@ + + FIND_LIBRARY(OPENGL_gl_LIBRARY + NAMES MesaGL GL +- PATHS /usr/lib +- /usr/local/lib +- /opt/graphics/OpenGL/lib +- /usr/openwin/lib +- /usr/X11R6/lib ++ PATHS /usr/lib64 ++ /usr/local/lib64 ++ /opt/graphics/OpenGL/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 + ) + + # On Unix OpenGL most certainly always requires X11. +@@ -102,11 +102,11 @@ + FIND_LIBRARY(OPENGL_glu_LIBRARY + NAMES MesaGLU GLU + PATHS ${OPENGL_gl_LIBRARY} +- /usr/lib +- /usr/local/lib +- /opt/graphics/OpenGL/lib +- /usr/openwin/lib +- /usr/X11R6/lib ++ /usr/lib64 ++ /usr/local/lib64 ++ /opt/graphics/OpenGL/lib64 ++ /usr/openwin/lib64 ++ /usr/X11R6/lib64 + ) + + ENDIF (WIN32) +diff -Naur cmake-1.6.6-original/Modules/FindX11.cmake cmake-1.6.6-changed/Modules/FindX11.cmake +--- cmake-1.6.6-original/Modules/FindX11.cmake 2003-01-31 19:40:01.000000000 +0300 ++++ cmake-1.6.6-changed/Modules/FindX11.cmake 2006-10-03 11:20:06.000000000 +0400 +@@ -20,10 +20,10 @@ + ) + + SET(X11_LIB_SEARCH_PATH +- /usr/X11R6/lib +- /usr/local/lib +- /usr/openwin/lib +- /usr/lib ++ /usr/X11R6/lib64 ++ /usr/local/lib64 ++ /usr/openwin/lib64 ++ /usr/lib64 + ) + + FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) diff --git a/config_files/netgen-4.5.patch b/config_files/netgen-4.5.patch new file mode 100755 index 0000000..40edbf9 --- /dev/null +++ b/config_files/netgen-4.5.patch @@ -0,0 +1,45 @@ +diff -ur netgen-4.5.old/libsrc/makefile.inc netgen-4.5.new/libsrc/makefile.inc +--- netgen-4.5/libsrc/makefile.inc 2006-04-27 13:12:54.000000000 +0400 ++++ netgen-4.5/libsrc/makefile.inc 2006-09-05 14:16:32.000000000 +0400 +@@ -14,7 +14,7 @@ + # + include $(LIBSRC_DIR)/makefile.mach.$(MACHINE) + # +-CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) \ ++CPLUSPLUSFLAGS1 = -c -m64 -fPIC -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) \ + -DOCCGEOMETRY -DOCC52 -DHAVE_IOSTREAM -DHAVE_LIMITS + # + ARFLAGS = r +diff -ur netgen-4.5.old/libsrc/makefile.mach.LINUX64 netgen-4.5.new/libsrc/makefile.mach.LINUX64 +--- netgen-4.5/libsrc/makefile.mach.LINUX64 2006-03-29 15:09:32.000000000 +0400 ++++ netgen-4.5/libsrc/makefile.mach.LINUX64 2006-09-07 15:48:39.000000000 +0400 +@@ -11,7 +11,7 @@ + # + # + CFLAGS2 = +-CPLUSPLUSFLAGS2 = -pg -march=nocona -O2 -DLINUX -DOPENGL \ ++CPLUSPLUSFLAGS2 = -pg -march=nocona -O2 -DLINUX \ + -ftemplate-depth-99 -finline-limit=100000 \ + -fforce-addr -funroll-loops \ + -DTRAFO -DNGSOLVE -DnoADDON -DnoLAPACK -DnoFAST \ +@@ -23,7 +23,7 @@ + # + # + +-LINKFLAGS2 = -pg -L/usr/openwin/lib64 -L/usr/X11R6/lib64 -L/usr/lib/GL3.5 -L/usr/lib64 ++LINKFLAGS2 = -fPIC -pg -L/usr/openwin/lib64 -L/usr/X11R6/lib64 -L/usr/lib/GL3.5 -L/usr/lib64 + + + SYSLIB2 = -lstdc++ +diff -ur netgen-4.5.old/Makefile netgen-4.5.new/Makefile +--- netgen-4.5/Makefile 2006-03-29 15:09:12.000000000 +0400 ++++ netgen-4.5/Makefile 2006-09-07 15:46:07.000000000 +0400 +@@ -72,7 +72,7 @@ + # + #CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -DOPENGL + +-CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) -I./ngsolve/include -Ilibsrc/interface -DOPENGL -I$(METISINC) ++CPLUSPLUSFLAGS1 = -c -m64 -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) -I./ngsolve/include -Ilibsrc/interface -I$(METISINC) + + LINKFLAGS1 = -lGL -lGLU -lX11 -lXext -lXmu + # diff --git a/config_files/omniNotify-2.1.patch b/config_files/omniNotify-2.1.patch new file mode 100755 index 0000000..ed9997a --- /dev/null +++ b/config_files/omniNotify-2.1.patch @@ -0,0 +1,94 @@ +diff -Naur omniNotify-orig/include/RDIstrstream.h omniNotify/include/RDIstrstream.h +--- omniNotify/include/RDIstrstream.h 2003-10-12 22:51:15.000000000 +0400 ++++ omniNotify/include/RDIstrstream.h 2006-09-28 17:44:20.000000000 +0400 +@@ -57,8 +57,10 @@ + RDIstrstream& operator<<(const void *p); + RDIstrstream& operator<<(int n); + RDIstrstream& operator<<(unsigned int n); ++#ifndef HAS_LongLong + RDIstrstream& operator<<(long n); + RDIstrstream& operator<<(unsigned long n); ++#endif + RDIstrstream& operator<<(short n) {return operator<<((int)n);} + RDIstrstream& operator<<(unsigned short n) {return operator<<((unsigned int)n);} + #ifdef HAS_LongLong +diff -Naur omniNotify-orig/include/RDITimeWrappers.h omniNotify/include/RDITimeWrappers.h +--- omniNotify/include/RDITimeWrappers.h 2003-10-23 17:28:18.000000000 +0400 ++++ omniNotify/include/RDITimeWrappers.h 2006-09-28 18:10:41.000000000 +0400 +@@ -236,8 +236,11 @@ + // pretty-printing of absolute local time -- no newline + void out_local(RDIstrstream& str) { + CORBA::ULong ts, tn; +- get_posixbase_secs_nanosecs(ts, tn); +- RDI_posixbase_out_time(str, ts, tn); ++ unsigned long ts3, tn3; ++ get_posixbase_secs_nanosecs(ts3, tn3); ++ RDI_posixbase_out_time(str, ts3, tn3); ++ ts = (CORBA::ULong)ts3; ++ tn = (CORBA::ULong)tn3; + str << " (local time)"; + } + +@@ -396,8 +399,11 @@ + // pretty-printing of absolute univ time -- no newline + void out_gmt(RDIstrstream& str) { + CORBA::ULong ts, tn; +- get_gmt_posixbase_secs_nanosecs(ts, tn); +- RDI_posixbase_out_time(str, ts, tn); ++ unsigned long ts4, tn4; ++ get_gmt_posixbase_secs_nanosecs(ts4, tn4); ++ RDI_posixbase_out_time(str, ts4, tn4); ++ ts = (CORBA::ULong)ts4; ++ tn = (CORBA::ULong)tn4; + str << " (greenwich mean time)"; + } + // static helpers for producing TimeBase::UtcT min and max +diff -Naur omniNotify-orig/lib/RDIstrstream.cc omniNotify/lib/RDIstrstream.cc +--- omniNotify/lib/RDIstrstream.cc 2003-10-23 08:39:12.000000000 +0400 ++++ omniNotify/lib/RDIstrstream.cc 2006-09-28 16:56:03.000000000 +0400 +@@ -175,6 +175,7 @@ + return *this; + } + ++#ifndef HAS_LongLong + RDIstrstream& + RDIstrstream::operator<<(long n) + { +@@ -194,6 +195,7 @@ + width_fill(); + return *this; + } ++#endif + + #ifdef HAS_LongLong + RDIstrstream& +diff -Naur omniNotify-orig/lib/RDITimeWrappers.cc omniNotify/lib/RDITimeWrappers.cc +--- omniNotify/lib/RDITimeWrappers.cc 2003-10-23 08:39:12.000000000 +0400 ++++ omniNotify/lib/RDITimeWrappers.cc 2006-09-28 16:56:09.000000000 +0400 +@@ -147,7 +147,10 @@ + #define WHATFN "RDI_TimeT::fmt_local" + const char *RDI_TimeT::fmt_local() { + CORBA::ULong ts, tm; +- get_posixbase_secs_msecs(ts, tm); ++ unsigned long ts2, tm2; ++ get_posixbase_secs_msecs(ts2, tm2); ++ ts = (CORBA::ULong)ts2; ++ tm = (CORBA::ULong)tm2; + time_t secs_as_time_t = ts; + TW_SCOPE_LOCK(otime_lock, RDI_out_time_lock, "RDI_out_time", WHATFN); + RDI_TimeT_fmt_local_buf_idx = (RDI_TimeT_fmt_local_buf_idx + 1) % 10; +diff -Naur omniNotify/mk/beforeauto.mk.in omniNotify/mk/beforeauto.mk.in +--- omniNotify/mk/beforeauto.mk.in 2003-10-29 22:18:36.000000000 +0300 ++++ omniNotify/mk/beforeauto.mk.in 2006-10-13 16:58:26.000000000 +0400 +@@ -95,9 +95,9 @@ + + CPPFLAGS = $(DIR_CPPFLAGS) $(IMPORT_CPPFLAGS) + +-CFLAGS = $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS) ++CFLAGS = -m64 $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS) + +-CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS) ++CXXFLAGS = -m64 $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS) + + + ############################################################################# diff --git a/config_files/omniORB-4.0.7.patch b/config_files/omniORB-4.0.7.patch new file mode 100755 index 0000000..2a6dab6 --- /dev/null +++ b/config_files/omniORB-4.0.7.patch @@ -0,0 +1,15 @@ +diff -Naur omniORB-4.0.7-original/mk/beforeauto.mk.in omniORB-4.0.7-changed/mk/beforeauto.mk.in +--- omniORB-4.0.7-original/mk/beforeauto.mk.in 2005-03-22 16:53:41.000000000 +0300 ++++ omniORB-4.0.7-changed/mk/beforeauto.mk.in 2006-10-13 16:26:46.000000000 +0400 +@@ -87,9 +87,9 @@ + + CPPFLAGS = $(DIR_CPPFLAGS) $(IMPORT_CPPFLAGS) + +-CFLAGS = $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS) ++CFLAGS = -m64 $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS) + +-CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS) ++CXXFLAGS = -m64 $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS) + + + ############################################################################# diff --git a/config_files/omniORBpy-2.7.patch b/config_files/omniORBpy-2.7.patch new file mode 100755 index 0000000..0187fa4 --- /dev/null +++ b/config_files/omniORBpy-2.7.patch @@ -0,0 +1,15 @@ +diff -Naur omniORBpy-2.7-original/mk/beforeauto.mk.in omniORBpy-2.7-changed/mk/beforeauto.mk.in +--- omniORBpy-2.7-original/mk/beforeauto.mk.in 2006-01-09 19:26:26.000000000 +0300 ++++ omniORBpy-2.7-changed/mk/beforeauto.mk.in 2006-10-13 16:57:51.000000000 +0400 +@@ -96,9 +96,9 @@ + + CPPFLAGS = $(DIR_CPPFLAGS) $(IMPORT_CPPFLAGS) + +-CFLAGS = $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS) ++CFLAGS = -m64 $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS) + +-CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS) ++CXXFLAGS = -m64 $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS) + + + ############################################################################# diff --git a/config_files/qt-3.3.4.patch b/config_files/qt-3.3.4.patch new file mode 100755 index 0000000..f5051b8 --- /dev/null +++ b/config_files/qt-3.3.4.patch @@ -0,0 +1,12 @@ +diff -Naur qt-3.3.4-original/mkspecs/linux-g++-64/qmake.conf qt-3.3.4-changed/mkspecs/linux-g++-64/qmake.conf +--- qt-3.3.4-original/mkspecs/linux-g++-64/qmake.conf 2005-01-21 20:16:44.000000000 +0300 ++++ qt-3.3.4-changed/mkspecs/linux-g++-64/qmake.conf 2006-10-12 14:09:27.000000000 +0400 +@@ -17,7 +17,7 @@ + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc + QMAKE_YACCFLAGS = -d +-QMAKE_CFLAGS = -pipe ++QMAKE_CFLAGS = -pipe -m64 + QMAKE_CFLAGS_DEPS = -M + QMAKE_CFLAGS_WARN_ON = -Wall -W + QMAKE_CFLAGS_WARN_OFF = -w diff --git a/config_files/sip-4.2.1.patch b/config_files/sip-4.2.1.patch new file mode 100755 index 0000000..381ea38 --- /dev/null +++ b/config_files/sip-4.2.1.patch @@ -0,0 +1,36 @@ +diff -Naur sip-original/configure.py sip-changed/configure.py +--- sip-original/configure.py 2006-03-16 12:29:17.000000000 +0300 ++++ sip-changed/configure.py 2006-10-03 18:52:25.000000000 +0400 +@@ -405,7 +405,7 @@ + f.close() + + cmd = "gcc -c /tmp/testqtlicense.cxx -I${QTDIR}/include -o /tmp/testqtlicense.o > /dev/null ; " +- cmd += "gcc /tmp/testqtlicense.o -L${QTDIR}/lib -lqt-mt -o /tmp/testqtlicense > /dev/null ; " ++ cmd += "gcc /tmp/testqtlicense.o -L${QTDIR}/lib64 -lqt-mt -o /tmp/testqtlicense > /dev/null ; " + cmd += "/tmp/testqtlicense > /tmp/testqtlicense.log" + + res = os.system(cmd) +diff -Naur sip-original/specs/linux-g++-64 sip-changed/specs/linux-g++-64 +--- sip-original/specs/linux-g++-64 2005-03-06 13:30:23.000000000 +0300 ++++ sip-changed/specs/linux-g++-64 2006-10-03 18:52:35.000000000 +0400 +@@ -43,7 +43,7 @@ + QMAKE_INCDIR_X11 = /usr/X11R6/include + QMAKE_LIBDIR_X11 = /usr/X11R6/lib64 + QMAKE_INCDIR_QT = $(QTDIR)/include +-QMAKE_LIBDIR_QT = $(QTDIR)/lib ++QMAKE_LIBDIR_QT = $(QTDIR)/lib64 + QMAKE_INCDIR_OPENGL = /usr/X11R6/include + QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 + +diff -Naur sip-original/specs/linux-g++-64 sip-changed/specs/linux-g++-64 +--- sip-original/specs/linux-g++-64 2005-03-06 13:30:23.000000000 +0300 ++++ sip-changed/specs/linux-g++-64 2006-10-16 15:54:00.000000000 +0400 +@@ -17,7 +17,7 @@ + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc + QMAKE_YACCFLAGS = -d +-QMAKE_CFLAGS = -pipe ++QMAKE_CFLAGS = -pipe -m64 + QMAKE_CFLAGS_DEPS = -M + QMAKE_CFLAGS_WARN_ON = -Wall -W + QMAKE_CFLAGS_WARN_OFF = -w