churchyard / rpms / python38

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