| 1 | From 92e2dcace7a3c02289b314238c5f18caec659ff1 Mon Sep 17 00:00:00 2001
|
| 2 | From: Julien Lepiller <[email protected]>
|
| 3 | Date: Sat, 5 Jun 2021 12:41:47 +0200
|
| 4 | Subject: [PATCH] No static lib.
|
| 5 |
|
| 6 | This patch is adapted from Fedora. The original patch did not apply
|
| 7 | because of whitespace changes.
|
| 8 |
|
| 9 | 00111 #
|
| 10 | Patch the Makefile.pre.in so that the generated Makefile doesn't try to build
|
| 11 | a libpythonMAJOR.MINOR.a (bug 550692):
|
| 12 | Downstream only: not appropriate for upstream
|
| 13 | ---
|
| 14 | Makefile.pre.in | 26 +-------------------------
|
| 15 | 1 file changed, 1 insertion(+), 25 deletions(-)
|
| 16 |
|
| 17 | diff --git a/Makefile.pre.in b/Makefile.pre.in
|
| 18 | index 6239fc3..948f196 100644
|
| 19 | |
| 20 | |
| 21 | @@ -486,7 +486,7 @@ coverage-report: regen-grammar
|
| 22 |
|
| 23 |
|
| 24 | # Build the interpreter
|
| 25 | -$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY)
|
| 26 | +$(BUILDPYTHON): Modules/python.o $(LDLIBRARY)
|
| 27 | $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
|
| 28 | Modules/python.o \
|
| 29 | $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
| 30 | @@ -527,18 +527,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
|
| 31 | _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
|
| 32 | $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
|
| 33 |
|
| 34 | -# Build static library
|
| 35 | -# avoid long command lines, same as LIBRARY_OBJS
|
| 36 | -$(LIBRARY): $(LIBRARY_OBJS)
|
| 37 | - -rm -f $@
|
| 38 | - $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o
|
| 39 | - $(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
|
| 40 | - $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
|
| 41 | - $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS)
|
| 42 | - $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
|
| 43 | - $(AR) $(ARFLAGS) $@ $(MODOBJS)
|
| 44 | - $(RANLIB) $@
|
| 45 | -
|
| 46 | libpython$(VERSION).so: $(LIBRARY_OBJS)
|
| 47 | if test $(INSTSONAME) != $(LDLIBRARY); then \
|
| 48 | $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
|
| 49 | @@ -1216,18 +1204,6 @@ libainstall: @DEF_MAKE_RULE@ python-config
|
| 50 | else true; \
|
| 51 | fi; \
|
| 52 | done
|
| 53 | - @if test -d $(LIBRARY); then :; else \
|
| 54 | - if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
|
| 55 | - if test "$(SO)" = .dll; then \
|
| 56 | - $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
|
| 57 | - else \
|
| 58 | - $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
| 59 | - $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
| 60 | - fi; \
|
| 61 | - else \
|
| 62 | - echo Skip install of $(LIBRARY) - use make frameworkinstall; \
|
| 63 | - fi; \
|
| 64 | - fi
|
| 65 | $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
|
| 66 | $(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
|
| 67 | $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
|
| 68 | --
|
| 69 | 2.31.1
|
| 70 |
|