From a52deaab9aa74a2896f2e75d7f55e8b4673488db Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Mon, 21 Sep 2015 15:55:00 +0200 Subject: [PATCH] Make LIBPL variable respect libdir macro --- 00205-make-libpl-respect-lib64.patch | 12 ++++++++++++ python3.spec | 5 +++++ 2 files changed, 17 insertions(+) create mode 100644 00205-make-libpl-respect-lib64.patch diff --git a/00205-make-libpl-respect-lib64.patch b/00205-make-libpl-respect-lib64.patch new file mode 100644 index 0000000..4a6703b --- /dev/null +++ b/00205-make-libpl-respect-lib64.patch @@ -0,0 +1,12 @@ +diff -up Python-3.5.0/Makefile.pre.in.lib Python-3.5.0/Makefile.pre.in +--- Python-3.5.0/Makefile.pre.in.lib 2015-09-21 15:39:47.928286620 +0200 ++++ Python-3.5.0/Makefile.pre.in 2015-09-21 15:42:58.004042762 +0200 +@@ -1340,7 +1340,7 @@ inclinstall: + + # Install the library and miscellaneous stuff needed for extending/embedding + # This goes into $(exec_prefix) +-LIBPL= @LIBPL@ ++LIBPL= $(LIBDEST)/config-$(LDVERSION) + + # pkgconfig directory + LIBPC= $(LIBDIR)/pkgconfig diff --git a/python3.spec b/python3.spec index a384d1d..4bb612c 100644 --- a/python3.spec +++ b/python3.spec @@ -736,6 +736,10 @@ Patch203: 00203-disable-threading-test-koji.patch # FIXED UPSTREAM # Patch204: 00204-increase-dh-keys-size.patch +# LIBPL variable in makefile takes LIBPL from configure.ac +# but the LIBPL variable defined there doesn't respect libdir macro +Patch205: 00205-make-libpl-respect-lib64.patch + # (New patches go here ^^^) @@ -1027,6 +1031,7 @@ 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.