From: maintenance team Date: Wed, 24 Oct 2007 14:07:06 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: V_4_1_1~124 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b2878a0795fa537d9261419fe68e0e27270d5e23;p=tools%2Finstall.git *** empty log message *** --- diff --git a/SALOME_3_2_5_Release_Notes.pdf b/SALOME_3_2_5_Release_Notes.pdf deleted file mode 100755 index ba74ce5..0000000 Binary files a/SALOME_3_2_5_Release_Notes.pdf and /dev/null differ diff --git a/config_files/patches/Python-2.4.1-lib64.patch b/config_files/patches/Python-2.4.1-lib64.patch deleted file mode 100755 index e7ff034..0000000 --- a/config_files/patches/Python-2.4.1-lib64.patch +++ /dev/null @@ -1,288 +0,0 @@ ---- 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/patches/cmake-1.6.6-lib64.patch b/config_files/patches/cmake-1.6.6-lib64.patch deleted file mode 100755 index bd7585f..0000000 --- a/config_files/patches/cmake-1.6.6-lib64.patch +++ /dev/null @@ -1,249 +0,0 @@ -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/patches/omniNotify-2.1-lib64.patch b/config_files/patches/omniNotify-2.1-lib64.patch deleted file mode 100755 index ed9997a..0000000 --- a/config_files/patches/omniNotify-2.1-lib64.patch +++ /dev/null @@ -1,94 +0,0 @@ -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/patches/omniORB-4.0.7-lib64.patch b/config_files/patches/omniORB-4.0.7-lib64.patch deleted file mode 100755 index 2a6dab6..0000000 --- a/config_files/patches/omniORB-4.0.7-lib64.patch +++ /dev/null @@ -1,15 +0,0 @@ -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/patches/omniORBpy-2.7-lib64.patch b/config_files/patches/omniORBpy-2.7-lib64.patch deleted file mode 100755 index 0187fa4..0000000 --- a/config_files/patches/omniORBpy-2.7-lib64.patch +++ /dev/null @@ -1,15 +0,0 @@ -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/patches/python_patch_lib64.patch b/config_files/patches/python_patch_lib64.patch new file mode 100755 index 0000000..1e99600 --- /dev/null +++ b/config_files/patches/python_patch_lib64.patch @@ -0,0 +1,301 @@ +diff -Naur --exclude=CVS Python-2.4.4/configure.in Python-2.4.4-patched/configure.in +--- Python-2.4.4/configure.in 2006-10-17 20:03:36.000000000 +0400 ++++ Python-2.4.4-patched/configure.in 2007-04-23 19:31:52.000000000 +0400 +@@ -494,6 +494,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) +diff -Naur --exclude=CVS Python-2.4.4/Include/pythonrun.h Python-2.4.4-patched/Include/pythonrun.h +--- Python-2.4.4/Include/pythonrun.h 2004-10-07 07:58:07.000000000 +0400 ++++ Python-2.4.4-patched/Include/pythonrun.h 2007-04-23 19:10:18.000000000 +0400 +@@ -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); +diff -Naur --exclude=CVS Python-2.4.4/Lib/distutils/command/install.py Python-2.4.4-patched/Lib/distutils/command/install.py +--- Python-2.4.4/Lib/distutils/command/install.py 2005-01-20 22:15:39.000000000 +0300 ++++ Python-2.4.4-patched/Lib/distutils/command/install.py 2007-04-23 19:12:27.000000000 +0400 +@@ -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', +diff -Naur --exclude=CVS Python-2.4.4/Lib/distutils/sysconfig.py Python-2.4.4-patched/Lib/distutils/sysconfig.py +--- Python-2.4.4/Lib/distutils/sysconfig.py 2006-10-08 21:41:25.000000000 +0400 ++++ Python-2.4.4-patched/Lib/distutils/sysconfig.py 2007-04-23 19:21:19.000000000 +0400 +@@ -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: +diff -Naur --exclude=CVS Python-2.4.4/Lib/distutils/tests/test_install.py Python-2.4.4-patched/Lib/distutils/tests/test_install.py +--- Python-2.4.4/Lib/distutils/tests/test_install.py 2004-06-26 03:02:59.000000000 +0400 ++++ Python-2.4.4-patched/Lib/distutils/tests/test_install.py 2007-04-23 19:20:24.000000000 +0400 +@@ -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) +diff -Naur --exclude=CVS Python-2.4.4/Lib/site.py Python-2.4.4-patched/Lib/site.py +--- Python-2.4.4/Lib/site.py 2004-07-20 06:28:28.000000000 +0400 ++++ Python-2.4.4-patched/Lib/site.py 2007-04-23 19:23:19.000000000 +0400 +@@ -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 +diff -Naur --exclude=CVS Python-2.4.4/Makefile.pre.in Python-2.4.4-patched/Makefile.pre.in +--- Python-2.4.4/Makefile.pre.in 2006-10-08 21:41:25.000000000 +0400 ++++ Python-2.4.4-patched/Makefile.pre.in 2007-04-23 19:34:43.000000000 +0400 +@@ -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) +@@ -471,7 +473,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 +diff -Naur --exclude=CVS Python-2.4.4/Modules/getpath.c Python-2.4.4-patched/Modules/getpath.c +--- Python-2.4.4/Modules/getpath.c 2006-02-20 20:37:39.000000000 +0300 ++++ Python-2.4.4-patched/Modules/getpath.c 2007-04-23 19:25:34.000000000 +0400 +@@ -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) +diff -Naur --exclude=CVS Python-2.4.4/Python/getplatform.c Python-2.4.4-patched/Python/getplatform.c +--- Python-2.4.4/Python/getplatform.c 2000-09-02 03:29:29.000000000 +0400 ++++ Python-2.4.4-patched/Python/getplatform.c 2007-04-23 19:27:19.000000000 +0400 +@@ -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; ++} +diff -Naur --exclude=CVS Python-2.4.4/Python/sysmodule.c Python-2.4.4-patched/Python/sysmodule.c +--- Python-2.4.4/Python/sysmodule.c 2006-10-05 22:08:58.000000000 +0400 ++++ Python-2.4.4-patched/Python/sysmodule.c 2007-04-23 19:29:43.000000000 +0400 +@@ -1035,6 +1035,10 @@ + PyString_FromString(Py_GetCopyright())); + SET_SYS_FROM_STRING("platform", + PyString_FromString(Py_GetPlatform())); ++ SET_SYS_FROM_STRING("arch", ++ PyString_FromString(Py_GetArch())); ++ SET_SYS_FROM_STRING("lib", ++ PyString_FromString(Py_GetLib())); + SET_SYS_FROM_STRING("executable", + PyString_FromString(Py_GetProgramFullPath())); + SET_SYS_FROM_STRING("prefix", +diff -Naur --exclude=CVS Python-2.4.4/setup.py Python-2.4.4-patched/setup.py +--- Python-2.4.4/setup.py 2006-10-08 21:41:25.000000000 +0400 ++++ Python-2.4.4-patched/setup.py 2007-04-23 19:38:02.000000000 +0400 +@@ -263,12 +263,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 = [] +@@ -450,7 +450,7 @@ + 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') + +@@ -465,7 +465,7 @@ + readline_extra_link_args = () + + exts.append( Extension('readline', ['readline.c'], +- library_dirs=['/usr/lib/termcap'], ++ library_dirs=['/usr/'+libname+'/termcap'], + extra_link_args=readline_extra_link_args, + libraries=readline_libs) ) + if platform not in ['mac']: +@@ -1069,8 +1069,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/patches/qt-3.3.3-load-gl.patch b/config_files/patches/qt-3.3.3-load-gl.patch deleted file mode 100755 index 5337b85..0000000 --- a/config_files/patches/qt-3.3.3-load-gl.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur qt-3.3.3-original/src/opengl/qgl_x11.cpp qt-3.3.3-patched/src/opengl/qgl_x11.cpp ---- qt-3.3.3-original/src/opengl/qgl_x11.cpp 2004-08-05 18:42:12.000000000 +0400 -+++ qt-3.3.3-patched/src/opengl/qgl_x11.cpp 2006-12-14 16:26:33.000000000 +0300 -@@ -125,7 +125,7 @@ - if (gl_syms_resolved) - return TRUE; - -- QLibrary gl("GL"); -+ QLibrary gl("libGL.so.1"); - gl.setAutoUnload(FALSE); - - qt_glCallLists = (_glCallLists) gl.resolve("glCallLists"); -diff -Naur qt-3.3.3-original/src/tools/qlibrary.cpp qt-3.3.3-patched/src/tools/qlibrary.cpp ---- qt-3.3.3-original/src/tools/qlibrary.cpp 2004-08-05 18:41:55.000000000 +0400 -+++ qt-3.3.3-patched/src/tools/qlibrary.cpp 2006-12-14 16:29:26.000000000 +0300 -@@ -39,6 +39,7 @@ - #include "qplatformdefs.h" - #include - #include -+#include - #include - - #ifndef QT_NO_LIBRARY -@@ -393,6 +394,8 @@ - return libfile; - - QString filename = libfile; -+ if (QFile::exists(filename)) -+ return filename; - - #if defined(Q_WS_WIN) - if ( filename.findRev( '.' ) <= filename.findRev( '/' ) ) -@@ -422,10 +425,11 @@ - QString path = tmpfilename.left( x + 1 ); - QString file = tmpfilename.right( tmpfilename.length() - x - 1 ); - tmpfilename = QString( "%1lib%2" ).arg( path ).arg( file ); -- } else { -+ } else if (tmpfilename.left(3) != QString("lib")) { - tmpfilename = QString( "lib%1" ).arg( filename ); - } -- tmpfilename += filter; -+ if (!tmpfilename.contains(QRegExp(filter + "((\\.[0-9]+)+)?$"))) -+ tmpfilename += filter; - if(QFile::exists(tmpfilename) || it == filters.end()) { - filename = tmpfilename; - break; diff --git a/config_files/patches/qt-3.3.4-lib64.patch b/config_files/patches/qt-3.3.4-lib64.patch deleted file mode 100755 index f5051b8..0000000 --- a/config_files/patches/qt-3.3.4-lib64.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/patches/sip-4.2.1-lib64.patch b/config_files/patches/sip-4.2.1-lib64.patch deleted file mode 100755 index 381ea38..0000000 --- a/config_files/patches/sip-4.2.1-lib64.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 diff --git a/config_files/patches/vtk-4.2.6-lib64.patch b/config_files/patches/vtk-4.2.6-lib64.patch deleted file mode 100755 index f5a3710..0000000 --- a/config_files/patches/vtk-4.2.6-lib64.patch +++ /dev/null @@ -1,820 +0,0 @@ -diff -Naur VTK-4.2.6-original/CMake/FindOSMesa.cmake VTK-4.2.6-changed/CMake/FindOSMesa.cmake ---- VTK-4.2.6-original/CMake/FindOSMesa.cmake 2003-02-12 02:05:20.000000000 +0300 -+++ VTK-4.2.6-changed/CMake/FindOSMesa.cmake 2006-10-03 11:33:54.000000000 +0400 -@@ -19,11 +19,11 @@ - # in the main Mesa library - IF (NOT OSMESA_LIBRARY) - FIND_LIBRARY(OSMESA_LIBRARY OSMesa -- /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 (NOT OSMESA_LIBRARY) - -diff -Naur VTK-4.2.6-original/CMakeLists.txt VTK-4.2.6-changed/CMakeLists.txt ---- VTK-4.2.6-original/CMakeLists.txt 2004-03-03 22:28:17.000000000 +0300 -+++ VTK-4.2.6-changed/CMakeLists.txt 2006-10-04 14:02:56.000000000 +0400 -@@ -448,8 +448,8 @@ - # Configure Matrox Imaging support. - IF(VTK_USE_MATROX_IMAGING) - FIND_LIBRARY(MIL_LIBRARY MIL -- "C:/Program Files/Matrox Imaging/mil/library/winnt/msc/dll" -- "C:/Program Files/Matrox Imaging/mil/library/windows/msc/dll" -+ "C:/Program Files/Matrox Imaging/mil/lib64rary/winnt/msc/dll" -+ "C:/Program Files/Matrox Imaging/mil/lib64rary/windows/msc/dll" - ) - FIND_PATH(MIL_INCLUDE_PATH mil.h - "C:/Program Files/Matrox Imaging/mil/include" -@@ -698,11 +698,11 @@ - ENDIF(VTK_USE_PARALLEL) - - # Install cmake extensions so user projects can load them. --INSTALL_FILES(/lib/vtk/CMake FILES -+INSTALL_FILES(/lib64/vtk/CMake FILES - ${VTK_SOURCE_DIR}/CMake/vtkLoadCMakeExtensions.cmake) - FOREACH(cmd VTK_WRAP_TCL2 VTK_WRAP_PYTHON2 VTK_WRAP_JAVA2 - VTK_MAKE_INSTANTIATOR2 VTK_GENERATE_JAVA_DEPENDENCIES) -- INSTALL_FILES(/lib/vtk/CMake FILES -+ INSTALL_FILES(/lib64/vtk/CMake FILES - "${VTK_BINARY_DIR}/CMake/${CMAKE_SHARED_MODULE_PREFIX}cm${cmd}${CMAKE_SHARED_MODULE_SUFFIX}" - ) - ENDFOREACH(cmd) -@@ -710,7 +710,7 @@ - # Save the compiler settings so another project can import them. - INCLUDE(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake) - CMAKE_EXPORT_BUILD_SETTINGS(${VTK_BINARY_DIR}/VTKBuildSettings.cmake) --INSTALL_FILES(/lib/vtk .cmake VTKBuildSettings) -+INSTALL_FILES(/lib64/vtk .cmake VTKBuildSettings) - - # Save library dependencies. - EXPORT_LIBRARY_DEPENDENCIES(${VTK_BINARY_DIR}/VTKLibraryDepends.cmake) -@@ -720,9 +720,9 @@ - - # Install some files. - INSTALL_FILES(/include/vtk .h vtkConfigure vtkToolkits) --INSTALL_FILES(/lib/vtk .cmake UseVTK VTKLibraryDepends) -+INSTALL_FILES(/lib64/vtk .cmake UseVTK VTKLibraryDepends) - IF(VTK_WRAP_HINTS) -- INSTALL_FILES(/lib/vtk FILES ${VTK_WRAP_HINTS}) -+ INSTALL_FILES(/lib64/vtk FILES ${VTK_WRAP_HINTS}) - ENDIF(VTK_WRAP_HINTS) - - #----------------------------------------------------------------------------- -diff -Naur VTK-4.2.6-original/Common/CMakeLists.txt VTK-4.2.6-changed/Common/CMakeLists.txt ---- VTK-4.2.6-original/Common/CMakeLists.txt 2003-02-13 00:48:52.000000000 +0300 -+++ VTK-4.2.6-changed/Common/CMakeLists.txt 2006-10-04 14:03:25.000000000 +0400 -@@ -250,7 +250,7 @@ - VTK_WRAP_TCL2(vtkCommonTCL CommonTCL_SRCS ${Common_SRCS}) - ADD_LIBRARY(vtkCommonTCL ${CommonTCL_SRCS} vtkTclUtil.cxx) - TARGET_LINK_LIBRARIES (vtkCommonTCL ${TCL_LIBRARY} vtkCommon) -- INSTALL_TARGETS(/lib/vtk vtkCommonTCL) -+ INSTALL_TARGETS(/lib64/vtk vtkCommonTCL) - INSTALL_FILES(/include/vtk .h - vtkTclUtil - ) -@@ -271,7 +271,7 @@ - ENDIF(WIN32) - TARGET_LINK_LIBRARIES(vtkCommonPython vtkCommon) - -- INSTALL_TARGETS(/lib/vtk vtkCommonPython) -+ INSTALL_TARGETS(/lib64/vtk vtkCommonPython) - INSTALL_FILES(/include/vtk .h - vtkPythonUtil - ) -@@ -284,13 +284,13 @@ - VTK_WRAP_JAVA2(vtkCommonJava CommonJava_SRCS ${Common_SRCS}) - ADD_LIBRARY(vtkCommonJava SHARED ${CommonJava_SRCS} vtkJavaUtil.cxx) - TARGET_LINK_LIBRARIES(vtkCommonJava vtkCommon) -- INSTALL_TARGETS(/lib/vtk vtkCommonJava) -+ INSTALL_TARGETS(/lib64/vtk vtkCommonJava) - INSTALL_FILES(/include/vtk .h - vtkJavaUtil - ) - ENDIF (VTK_WRAP_JAVA) - --INSTALL_TARGETS(/lib/vtk vtkCommon) -+INSTALL_TARGETS(/lib64/vtk vtkCommon) - INSTALL_FILES(/include/vtk .h ${Common_SRCS} - vtkCellType - vtkSetGet -@@ -306,7 +306,7 @@ - vtkImageProgressIterator - ) - --INSTALL_FILES(/lib/vtk/testing FILES -+INSTALL_FILES(/lib64/vtk/testing FILES - ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py - ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl - ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl -@@ -314,6 +314,6 @@ - INSTALL_FILES(/include/vtk FILES - ${VTK_SOURCE_DIR}/Common/Testing/Cxx/vtkRegressionTestImage.h) - IF(VTK_USE_PARALLEL) -- INSTALL_FILES(/lib/vtk/testing FILES -+ INSTALL_FILES(/lib64/vtk/testing FILES - ${VTK_SOURCE_DIR}/Common/Testing/Tcl/prtImageTest.tcl) - ENDIF(VTK_USE_PARALLEL) -diff -Naur VTK-4.2.6-original/Common/Testing/Install/test.sh.in VTK-4.2.6-changed/Common/Testing/Install/test.sh.in ---- VTK-4.2.6-original/Common/Testing/Install/test.sh.in 2006-10-04 11:09:49.000000000 +0400 -+++ VTK-4.2.6-changed/Common/Testing/Install/test.sh.in 2006-10-04 11:09:24.000000000 +0400 -@@ -47,7 +47,7 @@ - echo "Writing CMakeCache.txt" - ( - cat > CMakeCache.txt <