[cleanup] Remove autotooling and its patch
rhbz#1291325
This commit is contained in:
parent
5182e811f0
commit
bbc4c0dbf7
84
python3.spec
84
python3.spec
@ -106,34 +106,6 @@
|
||||
# pyc/pyo files)
|
||||
|
||||
|
||||
# We need to get a newer configure generated out of configure.in for the following
|
||||
# patches:
|
||||
# patch 55 (systemtap)
|
||||
# patch 113 (more config flags)
|
||||
#
|
||||
# For patch 55 (systemtap), we need to get a new header for configure to use
|
||||
#
|
||||
# configure.in requires autoconf-2.65, but the version in Fedora is currently
|
||||
# autoconf-2.66
|
||||
#
|
||||
# For now, we'll generate a patch to the generated configure script and
|
||||
# pyconfig.h.in on a machine that has a local copy of autoconf 2.65
|
||||
#
|
||||
# Instructions on obtaining such a copy can be seen at
|
||||
# http://bugs.python.org/issue7997
|
||||
#
|
||||
# To make it easy to regenerate the patch, this specfile can be run in two
|
||||
# ways:
|
||||
# (i) regenerate_autotooling_patch 0 : the normal approach: prep the
|
||||
# source tree using a pre-generated patch to the "configure" script, and do a
|
||||
# full build
|
||||
# (ii) regenerate_autotooling_patch 1 : intended to be run on a developer's
|
||||
# workstation: prep the source tree without patching configure, then rerun a
|
||||
# local copy of autoconf-2.65, regenerate the patch, then exit, without doing
|
||||
# the rest of the build
|
||||
%global regenerate_autotooling_patch 0
|
||||
|
||||
|
||||
# ==================
|
||||
# Top-level metadata
|
||||
# ==================
|
||||
@ -502,33 +474,6 @@ Patch206: 00206-remove-hf-from-arm-triplet.patch
|
||||
# Python.h header to fix a compilation error with OpenMP.
|
||||
Patch207: 00207-hide-atomic-symbols.patch
|
||||
|
||||
|
||||
|
||||
# (New patches go here ^^^)
|
||||
#
|
||||
# When adding new patches to "python" and "python3" in Fedora 17 onwards,
|
||||
# please try to keep the patch numbers in-sync between the two specfiles:
|
||||
#
|
||||
# - use the same patch number across both specfiles for conceptually-equivalent
|
||||
# fixes, ideally with the same name
|
||||
#
|
||||
# - when a patch is relevant to both specfiles, use the same introductory
|
||||
# comment in both specfiles where possible (to improve "diff" output when
|
||||
# comparing them)
|
||||
#
|
||||
# - when a patch is only relevant for one of the two specfiles, leave a gap
|
||||
# in the patch numbering in the other specfile, adding a comment when
|
||||
# omitting a patch, both in the manifest section here, and in the "prep"
|
||||
# phase below
|
||||
#
|
||||
# Hopefully this will make it easier to ensure that all relevant fixes are
|
||||
# applied to both versions.
|
||||
|
||||
# This is the generated patch to "configure"; see the description of
|
||||
# %{regenerate_autotooling_patch}
|
||||
# above:
|
||||
Patch5000: 05000-autotool-intermediates.patch
|
||||
|
||||
# add correct arch for ppc64/ppc64le
|
||||
# it should be ppc64le-linux-gnu/ppc64-linux-gnu instead powerpc64le-linux-gnu/powerpc64-linux-gnu
|
||||
Patch5001: python3-powerppc-arch.patch
|
||||
@ -757,12 +702,6 @@ sed --in-place \
|
||||
--expression="s|http://docs.python.org/library|http://docs.python.org/%{pybasever}/library|g" \
|
||||
Lib/pydoc.py || exit 1
|
||||
|
||||
%if ! 0%{regenerate_autotooling_patch}
|
||||
# Normally we apply the patch to "configure"
|
||||
# We don't apply the patch if we're working towards regenerating it
|
||||
%patch5000 -p0 -b .autotool-intermediates
|
||||
%endif
|
||||
|
||||
%patch5001 -p1
|
||||
|
||||
# ======================================================
|
||||
@ -779,29 +718,6 @@ export LINKCC="gcc"
|
||||
export CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
|
||||
export LDFLAGS="$RPM_LD_FLAGS `pkg-config --libs-only-L openssl`"
|
||||
|
||||
%if 0%{regenerate_autotooling_patch}
|
||||
# If enabled, this code regenerates the patch to "configure", using a
|
||||
# local copy of autoconf-2.65, then exits the build
|
||||
#
|
||||
# The following assumes that the copy is installed to ~/autoconf-2.65/bin
|
||||
# as per these instructions:
|
||||
# http://bugs.python.org/issue7997
|
||||
|
||||
for f in pyconfig.h.in configure ; do
|
||||
cp $f $f.autotool-intermediates ;
|
||||
done
|
||||
|
||||
# Rerun the autotools:
|
||||
autoreconf
|
||||
|
||||
# Regenerate the patch:
|
||||
gendiff . .autotool-intermediates > %{PATCH5000}
|
||||
|
||||
|
||||
# Exit the build
|
||||
exit 1
|
||||
%endif
|
||||
|
||||
# Define a function, for how to perform a "build" of python for a given
|
||||
# configuration:
|
||||
BuildPython() {
|
||||
|
Loading…
Reference in New Issue
Block a user