slackware-current/source/d/python3/python3.no-static-library.diff
Patrick J Volkerding a25634cd26 Tue Dec 31 05:17:04 UTC 2019
a/kmod-26-x86_64-3.txz:  Rebuilt.
  This doesn't build with --enable-python and python3-3.8.1, so we'll
  disable it for now. The python additions don't appear to be widely
  packaged anyway.
a/util-linux-2.34-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
ap/hplip-3.19.12-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
ap/ksh93-20191228_5abcbd06-x86_64-1.txz:  Upgraded.
ap/linuxdoc-tools-0.9.73-x86_64-3.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
ap/lxc-2.0.11_fad08f383-x86_64-3.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
ap/rpm-4.15.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/Cython-0.29.14-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/clisp-2.50_20191103_c26de7873-x86_64-1.txz:  Upgraded.
d/distcc-3.3.3-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/gdb-8.3.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/llvm-9.0.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/meson-0.52.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/python-pip-19.3.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/python-setuptools-42.0.2-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
d/python3-3.8.1-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
kde/pykde4-4.14.3-x86_64-10.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/Mako-1.1.0-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/PyQt-4.12.3-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/QScintilla-2.11.4-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/alsa-lib-1.2.1.2-x86_64-2.txz:  Rebuilt.
  Recompiled without --enable-mixer-pymods.
l/dbus-python-1.2.14-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/gexiv2-0.12.0-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/gobject-introspection-1.62.0-x86_64-4.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/libcaca-0.99.beta19-x86_64-5.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/libcap-ng-0.7.10-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/libproxy-0.4.15-x86_64-4.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/libwebp-1.0.3-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/libwmf-0.2.8.4-x86_64-9.txz:  Rebuilt.
  Correct the path for the GDK_PIXBUF_DIR.
  Thanks to B. Watson and Robby Workman.
l/libxml2-2.9.10-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/newt-0.52.21-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/pycairo-1.18.2-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/pycups-1.9.74-x86_64-3.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/pycurl-7.43.0.3-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/pygobject-2.28.7-x86_64-5.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/pygobject3-3.34.0-x86_64-3.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/pyparsing-2.4.5-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-appdirs-1.4.3-x86_64-4.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-certifi-2019.11.28-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-chardet-3.0.4-x86_64-4.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-docutils-0.15.2-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-idna-2.8-x86_64-3.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-notify2-0.3.1-x86_64-4.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-packaging-19.2-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-pillow-6.2.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-ply-3.11-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-requests-2.22.0-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-sane-2.8.3-x86_64-4.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-six-1.13.0-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/python-urllib3-1.25.7-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/sip-4.19.20-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/system-config-printer-1.5.12-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/talloc-2.3.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/tdb-1.4.3-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/tevent-0.10.2-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/urwid-1.0.3-x86_64-5.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
l/zstd-1.4.4-x86_64-2.txz:  Rebuilt.
  Fix libdir in libzstd.pc. Thanks to orbea.
n/gpgme-1.13.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
n/obexftp-0.24.2-x86_64-5.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
n/pssh-2.3.1-x86_64-5.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
n/s-nail-14.9.16-x86_64-1.txz:  Upgraded.
n/samba-4.11.4-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
x/pyxdg-0.26-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
x/xcb-proto-1.13-x86_64-4.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
xap/blueman-2.1.1-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
xap/hexchat-2.14.3-x86_64-2.txz:  Rebuilt.
  Recompiled against python3-3.8.1.
extra/pure-alsa-system/alsa-lib-1.2.1.2-x86_64-2_alsa.txz:  Rebuilt.
  Recompiled without --enable-mixer-pymods.
isolinux/initrd.img:  Rebuilt.
  SeTEFI: Patched to remove extra whitespace from lsblk output.
  Thanks to Didier Spaier.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
  SeTEFI: Patched to remove extra whitespace from lsblk output.
  Thanks to Didier Spaier.
2019-12-31 14:59:51 +01:00

78 lines
3.1 KiB
Diff

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