churchyard / rpms / python3

Forked from rpms/python3 6 years ago
Clone

Blame 00111-no-static-lib.patch

cce760d
diff -up Python-3.2.1/Makefile.pre.in.no-static-lib Python-3.2.1/Makefile.pre.in
cce760d
--- Python-3.2.1/Makefile.pre.in.no-static-lib	2011-07-09 02:58:52.000000000 -0400
cce760d
+++ Python-3.2.1/Makefile.pre.in	2011-07-11 11:46:27.381425999 -0400
cce760d
@@ -425,7 +425,7 @@ coverage:
aa4aef2
 
aa4aef2
 
aa4aef2
 # Build the interpreter
34c15c7
-$(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
34c15c7
+$(BUILDPYTHON):	Modules/python.o $(LDLIBRARY) $(PY3LIBRARY)
5080ffc
 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
5080ffc
 
5080ffc
 platform: $(BUILDPYTHON)
cce760d
@@ -439,18 +439,6 @@ sharedmods: $(BUILDPYTHON)
5080ffc
 	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
aa4aef2
 	esac
aa4aef2
 
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)
aa4aef2
-	$(AR) $(ARFLAGS) $@ $(PYTHON_OBJS)
aa4aef2
-	$(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_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); \
cce760d
@@ -540,7 +528,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.d
cce760d
 		echo "-----------------------------------------------"; \
cce760d
 	fi
cce760d
 
cce760d
-Modules/_testembed: Modules/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
cce760d
+Modules/_testembed: Modules/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
cce760d
 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
cce760d
 
cce760d
 ############################################################################
cce760d
@@ -1058,18 +1046,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 \
aa4aef2
-			if test "$(SO)" = .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
aa4aef2
 	$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
aa4aef2
 	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in