|
 |
a08450 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
a08450 |
From: David Malcolm <dmalcolm@redhat.com>
|
|
|
a08450 |
Date: Mon, 18 Jan 2010 17:59:07 +0000
|
|
|
a08450 |
Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a
|
|
|
a08450 |
MIME-Version: 1.0
|
|
|
a08450 |
Content-Type: text/plain; charset=UTF-8
|
|
|
a08450 |
Content-Transfer-Encoding: 8bit
|
|
|
a08450 |
|
|
|
a08450 |
Downstream only: not appropriate for upstream.
|
|
|
a08450 |
|
|
|
a08450 |
See https://bugzilla.redhat.com/show_bug.cgi?id=556092
|
|
|
a08450 |
|
|
|
a08450 |
Co-authored-by: David Malcolm <dmalcolm@redhat.com>
|
|
|
a08450 |
Co-authored-by: Bohuslav Kabrda <bkabrda@redhat.com>
|
|
|
a08450 |
Co-authored-by: Matej Stuchlik <mstuchli@redhat.com>
|
|
|
a08450 |
Co-authored-by: Robert Kuska <rkuska@redhat.com>
|
|
|
a08450 |
Co-authored-by: Charalampos Stratakis <cstratak@redhat.com>
|
|
|
a08450 |
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
|
|
|
a08450 |
---
|
|
|
a08450 |
Makefile.pre.in | 21 ++-------------------
|
|
|
a08450 |
1 file changed, 2 insertions(+), 19 deletions(-)
|
|
|
a08450 |
|
|
|
a08450 |
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
|
|
a08450 |
index 11230fa563..dc763e7197 100644
|
|
|
a08450 |
--- a/Makefile.pre.in
|
|
|
a08450 |
+++ b/Makefile.pre.in
|
|
|
a08450 |
@@ -588,7 +588,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
|
|
|
a08450 |
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
|
|
|
a08450 |
|
|
|
a08450 |
# Build the interpreter
|
|
|
a08450 |
-$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
|
|
|
a08450 |
+$(BUILDPYTHON): Programs/python.o $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
|
|
|
a08450 |
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
|
|
|
a08450 |
|
|
|
a08450 |
platform: $(BUILDPYTHON) pybuilddir.txt
|
|
|
a08450 |
@@ -636,12 +636,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
|
|
|
a08450 |
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
|
|
|
a08450 |
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
|
|
|
a08450 |
|
|
|
a08450 |
-
|
|
|
a08450 |
-# Build static library
|
|
|
a08450 |
-$(LIBRARY): $(LIBRARY_OBJS)
|
|
|
a08450 |
- -rm -f $@
|
|
|
a08450 |
- $(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS)
|
|
|
a08450 |
-
|
|
|
a08450 |
libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
|
|
|
a08450 |
if test $(INSTSONAME) != $(LDLIBRARY); then \
|
|
|
a08450 |
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
|
|
|
a08450 |
@@ -723,7 +717,7 @@ Makefile Modules/config.c: Makefile.pre \
|
|
|
a08450 |
@echo "The Makefile was updated, you may need to re-run make."
|
|
|
a08450 |
|
|
|
a08450 |
|
|
|
a08450 |
-Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
|
|
|
a08450 |
+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
|
|
|
a08450 |
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
|
|
|
a08450 |
|
|
|
a08450 |
############################################################################
|
|
|
a08450 |
@@ -1651,17 +1645,6 @@ libainstall: @DEF_MAKE_RULE@ python-config
|
|
|
a08450 |
else true; \
|
|
|
a08450 |
fi; \
|
|
|
a08450 |
done
|
|
|
a08450 |
- @if test -d $(LIBRARY); then :; else \
|
|
|
a08450 |
- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
|
|
|
a08450 |
- if test "$(SHLIB_SUFFIX)" = .dll; then \
|
|
|
a08450 |
- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
|
|
|
a08450 |
- else \
|
|
|
a08450 |
- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
|
|
a08450 |
- fi; \
|
|
|
a08450 |
- else \
|
|
|
a08450 |
- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
|
|
|
a08450 |
- fi; \
|
|
|
a08450 |
- fi
|
|
|
a08450 |
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
|
|
|
a08450 |
$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
|
|
|
a08450 |
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
|