Browse Source

python: fixed build by rediffing the no-autotools-version-restriction patch

user/chris/next/shadow
Christian Wiese 13 years ago
parent
commit
cebb5554f2
  1. 21
      python/python/python-2.7-no-autoconf-version-restriction.patch

21
python/python/python-2.7.1-no-autoconf-version-restriction.patch → python/python/python-2.7-no-autoconf-version-restriction.patch

@ -1,8 +1,8 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../python/python-2.7.1-no-autoconf-version-restriction.patch # Filename: package/.../python/python-2.7-no-autoconf-version-restriction.patch
# Copyright (C) 2011 The OpenSDE Project # Copyright (C) 2011 - 2012 The OpenSDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
# #
@ -16,21 +16,14 @@
Description: Do not restrict the build system to autoconf 2.65 Description: Do not restrict the build system to autoconf 2.65
--- Python-2.7.1/configure.in.orig 2011-11-21 15:35:01.064104356 +0100 --- Python-2.7.3/configure.in.orig 2012-04-10 01:07:36.000000000 +0200
+++ Python-2.7.1/configure.in 2011-11-21 15:36:50.608104276 +0100 +++ Python-2.7.3/configure.in 2012-05-08 20:22:00.373393473 +0200
@@ -5,15 +5,6 @@ @@ -5,8 +5,6 @@
# Set VERSION so we only need to edit in one place (i.e., here) # Set VERSION so we only need to edit in one place (i.e., here)
m4_define(PYTHON_VERSION, 2.7) m4_define(PYTHON_VERSION, 2.7)
-dnl Some m4 magic to ensure that the configure script is generated -AC_PREREQ(2.65)
-dnl by the correct autoconf version.
-m4_define([version_required],
-[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [$1]), 0,
- [],
- [m4_fatal([Autoconf version $1 is required for Python], 63)])
-])
-version_required(2.65)
- -
AC_REVISION($Revision: 86076 $) AC_REVISION($Revision$)
AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/) AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
AC_CONFIG_SRCDIR([Include/object.h]) AC_CONFIG_SRCDIR([Include/object.h])
Loading…
Cancel
Save