churchyard / rpms / python3

Forked from rpms/python3 3 years ago
Clone

Blame 00111-no-static-lib.patch

0424a4f
diff --git a/Makefile.pre.in b/Makefile.pre.in
0424a4f
index 70e5927..04c8e3d 100644
0424a4f
--- a/Makefile.pre.in
0424a4f
+++ b/Makefile.pre.in
0424a4f
@@ -556,7 +556,7 @@ clinic: $(BUILDPYTHON) $(srcdir)/Modules/_blake2/blake2s_impl.c
bf35167
 	$(RUNSHARED) $(PYTHON_FOR_BUILD) ./Tools/clinic/clinic.py --make
aa4aef2
 
aa4aef2
 # Build the interpreter
Matej Stuchlik abb2ff8
-$(BUILDPYTHON):	Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
0424a4f
+$(BUILDPYTHON):	Programs/python.o $(LDLIBRARY) $(PY3LIBRARY)
Matej Stuchlik abb2ff8
 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
5080ffc
 
58f477b
 platform: $(BUILDPYTHON) pybuilddir.txt
0424a4f
@@ -601,18 +601,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
62d7207
 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
aa4aef2
 
0424a4f
 
aa4aef2
-# Build static library
aa4aef2
-# avoid long command lines, same as LIBRARY_OBJS
aa4aef2
-$(LIBRARY): $(LIBRARY_OBJS)
aa4aef2
-	-rm -f $@
aa4aef2
-	$(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o
aa4aef2
-	$(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
aa4aef2
-	$(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
1c94c1a
-	$(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) Python/frozen.o
0424a4f
-	$(AR) $(ARFLAGS) $@ $(MODULE_OBJS)
aa4aef2
-	$(AR) $(ARFLAGS) $@ $(MODOBJS)
aa4aef2
-	$(RANLIB) $@
aa4aef2
-
5080ffc
 libpython$(LDVERSION).so: $(LIBRARY_OBJS)
aa4aef2
 	if test $(INSTSONAME) != $(LDLIBRARY); then \
5080ffc
 		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
0424a4f
@@ -702,7 +690,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.dist
cce760d
 		echo "-----------------------------------------------"; \
cce760d
 	fi
cce760d
 
Matej Stuchlik abb2ff8
-Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
Matej Stuchlik abb2ff8
+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
Matej Stuchlik abb2ff8
 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
cce760d
 
cce760d
 ############################################################################
0424a4f
@@ -1382,18 +1370,6 @@ libainstall:	all 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
-				$(RANLIB) $(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