Remove forgotten $(LIBRARY) from Patch111

(and also enable it)
This commit is contained in:
Robert Kuska 2015-09-21 15:37:07 +02:00
parent abb2ff8b05
commit 7035fe2876
2 changed files with 2 additions and 4 deletions

View File

@ -6,7 +6,7 @@ diff -up cpython-59223da36dec/Makefile.pre.in.no-static-lib cpython-59223da36dec
# Build the interpreter # Build the interpreter
-$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) -$(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) $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
platform: $(BUILDPYTHON) pybuilddir.txt platform: $(BUILDPYTHON) pybuilddir.txt

View File

@ -736,7 +736,6 @@ Patch203: 00203-disable-threading-test-koji.patch
# FIXED UPSTREAM # FIXED UPSTREAM
# Patch204: 00204-increase-dh-keys-size.patch # Patch204: 00204-increase-dh-keys-size.patch
Patch205: config-to-lib64.patch
# (New patches go here ^^^) # (New patches go here ^^^)
@ -939,7 +938,7 @@ sed -r -i s/'_PIP_VERSION = "[0-9.]+"'/'_PIP_VERSION = "%{pip_version}"'/ Lib/en
%endif %endif
#%patch111 -p1 %patch111 -p1
# 112: not for python3 # 112: not for python3
%patch113 -p1 %patch113 -p1
# 00114: Upstream as of Python 3.4.0.b2 # 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 # 00202: upstream as of 3.5.0b3
%patch203 -p1 %patch203 -p1
# 00204: upstream as of 3.5.0b3 # 00204: upstream as of 3.5.0b3
%patch205 -p1
# Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there # 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. # are many differences between 2.6 and the Python 3 library.