diff --git a/python/python/libdir-from-configure.patch b/python/python/libdir-from-configure.patch deleted file mode 100644 index 0931ea51d..000000000 --- a/python/python/libdir-from-configure.patch +++ /dev/null @@ -1,41 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../python/libdir-from-configure.patch -# Copyright (C) 2007 The OpenSDE Project -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - - -Fix pythons' Makefile template to take the bin and libdir from configure - -fixes to use lib64 for architectures required. - - - Rene Rebe - ---- Python-2.4.3/Makefile.pre.in.orig 2007-10-10 09:47:02.000000000 +0300 -+++ Python-2.4.3/Makefile.pre.in 2007-10-10 19:26:51.000000000 +0300 -@@ -78,12 +78,12 @@ - exec_prefix= @exec_prefix@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include --SCRIPTDIR= $(prefix)/lib -+SCRIPTDIR= @libdir@ - - # Detailed destination directories - BINLIBDEST= $(LIBDIR)/python$(VERSION) diff --git a/python/python/python-2.6-chflags-cross.patch b/python/python/python-2.6-chflags-cross.patch deleted file mode 100644 index b51fc605c..000000000 --- a/python/python/python-2.6-chflags-cross.patch +++ /dev/null @@ -1,77 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../python/python-2.6-chflags-cross.patch -# Copyright (C) 2009 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -http://ftp.eenet.ee/gentoo-portage/dev-lang/python/files/python-2.6-chflags-cross.patch - -if we're cross-compiling, fall back to a link-only test rather than trying -to run a program for the chflags functions - ---- python-2.6/configure.in -+++ python-2.6/configure.in -@@ -2565,7 +2565,7 @@ - - # On Tru64, chflags seems to be present, but calling it will - # exit Python --AC_MSG_CHECKING(for chflags) -+AC_CACHE_CHECK([for chflags], [py_cv_has_chflags], [dnl - AC_TRY_RUN([ - #include - #include -@@ -2575,12 +2575,18 @@ - return 1; - return 0; - } --],AC_DEFINE(HAVE_CHFLAGS, 1, Define to 1 if you have the `chflags' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+], [py_cv_has_chflags="yes"], -+ [py_cv_has_chflags="no"], -+ [py_cv_has_chflags="cross"]) -+]) -+if test "$py_cv_has_chflags" = "cross" ; then -+ AC_CHECK_FUNC([chflags], [py_cv_has_chflags="yes"], [py_cv_has_chflags="no"]) -+fi -+if test "$py_cv_has_chflags" = "yes" ; then -+ AC_DEFINE(HAVE_CHFLAGS, 1, Define to 1 if you have the `chflags' function.) -+fi - --AC_MSG_CHECKING(for lchflags) -+AC_CACHE_CHECK([for lchflags], [py_cv_has_lchflags], [dnl - AC_TRY_RUN([ - #include - #include -@@ -2590,10 +2596,16 @@ - return 1; - return 0; - } --],AC_DEFINE(HAVE_LCHFLAGS, 1, Define to 1 if you have the `lchflags' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+], [py_cv_has_lchflags="yes"], -+ [py_cv_has_lchflags="no"], -+ [py_cv_has_lchflags="cross"]) -+]) -+if test "$py_cv_has_lchflags" = "cross" ; then -+ AC_CHECK_FUNC([lchflags], [py_cv_has_lchflags="yes"], [py_cv_has_lchflags="no"]) -+fi -+if test "$py_cv_has_lchflags" = "yes" ; then -+ AC_DEFINE(HAVE_LCHFLAGS, 1, Define to 1 if you have the `lchflags' function.) -+fi - - dnl Check if system zlib has *Copy() functions - dnl