2019-07-29 22:48:16 +00:00
|
|
|
From 65208ffdf868d06e6e16eeb12e3f47205a738ed3 Mon Sep 17 00:00:00 2001
|
2019-05-07 15:13:12 +00:00
|
|
|
From: David Malcolm <dmalcolm@redhat.com>
|
|
|
|
|
Date: Mon, 18 Jan 2010 17:59:07 +0000
|
2019-07-29 22:48:16 +00:00
|
|
|
Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a
|
2019-05-07 15:13:12 +00:00
|
|
|
MIME-Version: 1.0
|
|
|
|
|
Content-Type: text/plain; charset=UTF-8
|
|
|
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
|
|
|
|
|
|
Downstream only: not appropriate for upstream.
|
|
|
|
|
|
|
|
|
|
See https://bugzilla.redhat.com/show_bug.cgi?id=556092
|
|
|
|
|
|
|
|
|
|
Co-authored-by: David Malcolm <dmalcolm@redhat.com>
|
|
|
|
|
Co-authored-by: Bohuslav Kabrda <bkabrda@redhat.com>
|
|
|
|
|
Co-authored-by: Matej Stuchlik <mstuchli@redhat.com>
|
|
|
|
|
Co-authored-by: Robert Kuska <rkuska@redhat.com>
|
|
|
|
|
Co-authored-by: Charalampos Stratakis <cstratak@redhat.com>
|
|
|
|
|
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
|
|
|
|
|
---
|
|
|
|
|
Makefile.pre.in | 21 ++-------------------
|
|
|
|
|
1 file changed, 2 insertions(+), 19 deletions(-)
|
|
|
|
|
|
2016-09-29 14:17:06 +00:00
|
|
|
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
2019-07-29 22:48:16 +00:00
|
|
|
index 61d650882f..3f5be819c4 100644
|
2016-09-29 14:17:06 +00:00
|
|
|
--- a/Makefile.pre.in
|
|
|
|
|
+++ b/Makefile.pre.in
|
2019-07-29 22:48:16 +00:00
|
|
|
@@ -561,7 +561,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
|
2018-02-28 09:30:29 +00:00
|
|
|
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
|
2010-01-18 17:59:07 +00:00
|
|
|
|
|
|
|
|
# Build the interpreter
|
2015-09-16 06:36:17 +00:00
|
|
|
-$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
2016-09-29 14:17:06 +00:00
|
|
|
+$(BUILDPYTHON): Programs/python.o $(LDLIBRARY) $(PY3LIBRARY)
|
2019-02-05 00:40:25 +00:00
|
|
|
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
|
2013-04-10 12:30:09 +00:00
|
|
|
platform: $(BUILDPYTHON) pybuilddir.txt
|
2019-07-29 22:48:16 +00:00
|
|
|
@@ -609,12 +609,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
|
2017-11-28 12:47:21 +00:00
|
|
|
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
|
2012-08-14 01:11:12 +00:00
|
|
|
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
|
2010-01-18 17:59:07 +00:00
|
|
|
|
2017-11-28 12:47:21 +00:00
|
|
|
-
|
2010-01-18 17:59:07 +00:00
|
|
|
-# Build static library
|
|
|
|
|
-$(LIBRARY): $(LIBRARY_OBJS)
|
|
|
|
|
- -rm -f $@
|
2017-11-28 12:47:21 +00:00
|
|
|
- $(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS)
|
2010-01-18 17:59:07 +00:00
|
|
|
-
|
2019-02-05 00:40:25 +00:00
|
|
|
libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
|
2010-01-18 17:59:07 +00:00
|
|
|
if test $(INSTSONAME) != $(LDLIBRARY); then \
|
2019-02-05 00:40:25 +00:00
|
|
|
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
|
2019-07-29 22:48:16 +00:00
|
|
|
@@ -692,7 +686,7 @@ Makefile Modules/config.c: Makefile.pre \
|
2019-02-05 00:40:25 +00:00
|
|
|
@echo "The Makefile was updated, you may need to re-run make."
|
|
|
|
|
|
2011-07-11 16:04:52 +00:00
|
|
|
|
2015-09-16 06:36:17 +00:00
|
|
|
-Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
|
|
|
|
+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
|
2019-02-05 00:40:25 +00:00
|
|
|
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
|
2011-07-11 16:04:52 +00:00
|
|
|
|
|
|
|
|
############################################################################
|
2019-07-29 22:48:16 +00:00
|
|
|
@@ -1552,17 +1546,6 @@ libainstall: @DEF_MAKE_RULE@ python-config
|
2010-01-18 17:59:07 +00:00
|
|
|
else true; \
|
|
|
|
|
fi; \
|
|
|
|
|
done
|
|
|
|
|
- @if test -d $(LIBRARY); then :; else \
|
|
|
|
|
- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
|
2013-04-10 12:30:09 +00:00
|
|
|
- if test "$(SHLIB_SUFFIX)" = .dll; then \
|
2010-01-18 17:59:07 +00:00
|
|
|
- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
|
|
|
|
|
- else \
|
|
|
|
|
- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
|
|
|
|
- fi; \
|
|
|
|
|
- else \
|
|
|
|
|
- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
|
|
|
|
|
- fi; \
|
|
|
|
|
- fi
|
|
|
|
|
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
|
2015-09-16 06:36:17 +00:00
|
|
|
$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
|
2010-01-18 17:59:07 +00:00
|
|
|
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
|
2019-05-07 15:13:12 +00:00
|
|
|
--
|
|
|
|
|
2.21.0
|
|
|
|
|
|
