From 7035fe28761540699a1c363f3fe10af1423468f9 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Mon, 21 Sep 2015 15:37:07 +0200 Subject: [PATCH] Remove forgotten $(LIBRARY) from Patch111 (and also enable it) --- 00111-no-static-lib.patch | 2 +- python3.spec | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/00111-no-static-lib.patch b/00111-no-static-lib.patch index d55ac0a..006bb90 100644 --- a/00111-no-static-lib.patch +++ b/00111-no-static-lib.patch @@ -6,7 +6,7 @@ diff -up cpython-59223da36dec/Makefile.pre.in.no-static-lib cpython-59223da36dec # Build the interpreter -$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) -+$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) ++$(BUILDPYTHON): Programs/python.o $(LDLIBRARY) $(PY3LIBRARY) $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) platform: $(BUILDPYTHON) pybuilddir.txt diff --git a/python3.spec b/python3.spec index 13e17a8..a384d1d 100644 --- a/python3.spec +++ b/python3.spec @@ -736,7 +736,6 @@ Patch203: 00203-disable-threading-test-koji.patch # FIXED UPSTREAM # Patch204: 00204-increase-dh-keys-size.patch -Patch205: config-to-lib64.patch # (New patches go here ^^^) @@ -939,7 +938,7 @@ sed -r -i s/'_PIP_VERSION = "[0-9.]+"'/'_PIP_VERSION = "%{pip_version}"'/ Lib/en %endif -#%patch111 -p1 +%patch111 -p1 # 112: not for python3 %patch113 -p1 # 00114: Upstream as of Python 3.4.0.b2 @@ -1028,7 +1027,6 @@ sed -r -i s/'_PIP_VERSION = "[0-9.]+"'/'_PIP_VERSION = "%{pip_version}"'/ Lib/en # 00202: upstream as of 3.5.0b3 %patch203 -p1 # 00204: upstream as of 3.5.0b3 -%patch205 -p1 # Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there # are many differences between 2.6 and the Python 3 library.