You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
75 lines
3.1 KiB
75 lines
3.1 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: David Malcolm <dmalcolm@redhat.com> |
|
Date: Mon, 18 Jan 2010 17:59:07 +0000 |
|
Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a |
|
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(-) |
|
|
|
diff --git a/Makefile.pre.in b/Makefile.pre.in |
|
index e87a7620c4..381a8ab879 100644 |
|
--- a/Makefile.pre.in |
|
+++ b/Makefile.pre.in |
|
@@ -565,7 +565,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c |
|
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir) |
|
|
|
# Build the interpreter |
|
-$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) |
|
+$(BUILDPYTHON): Programs/python.o $(LDLIBRARY) $(PY3LIBRARY) |
|
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) |
|
|
|
platform: $(BUILDPYTHON) pybuilddir.txt |
|
@@ -613,12 +613,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o |
|
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ |
|
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build |
|
|
|
- |
|
-# Build static library |
|
-$(LIBRARY): $(LIBRARY_OBJS) |
|
- -rm -f $@ |
|
- $(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS) |
|
- |
|
libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS) |
|
if test $(INSTSONAME) != $(LDLIBRARY); then \ |
|
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \ |
|
@@ -696,7 +690,7 @@ Makefile Modules/config.c: Makefile.pre \ |
|
@echo "The Makefile was updated, you may need to re-run make." |
|
|
|
|
|
-Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) |
|
+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY) |
|
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) |
|
|
|
############################################################################ |
|
@@ -1579,17 +1573,6 @@ libainstall: @DEF_MAKE_RULE@ python-config |
|
else true; \ |
|
fi; \ |
|
done |
|
- @if test -d $(LIBRARY); then :; else \ |
|
- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ |
|
- if test "$(SHLIB_SUFFIX)" = .dll; then \ |
|
- $(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 |
|
$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o |
|
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
|
|
|