diff options
| author |   Eric Hameleers <alien@slackware.com> | 2022-10-22 08:45:37 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2022-10-22 08:45:37 +0000 |
| commit | eff58f59e2f49a7d89b38a2328ce9a88403b7965 (patch) | |
| tree | c29477dc19f440cd38dd3f5fcd8d743ef07cc349 /calibre/build | |
| parent | 2fa31f3198ab74f7b9b2011a2558789d068c91b4 (diff) | |
| download | asb-eff58f59e2f49a7d89b38a2328ce9a88403b7965.tar.gz asb-eff58f59e2f49a7d89b38a2328ce9a88403b7965.tar.xz | |
calibre: respin the patch to skip building a huge static library for python3
Diffstat (limited to 'calibre/build')
| -rw-r--r-- | calibre/build/patches/python3.no-static-library.diff | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/calibre/build/patches/python3.no-static-library.diff b/calibre/build/patches/python3.no-static-library.diff index e735f266..3b3afb07 100644 --- a/calibre/build/patches/python3.no-static-library.diff +++ b/calibre/build/patches/python3.no-static-library.diff @@ -1,4 +1,4 @@ -From 2559cbe8f0431ba20de8a1c9921013e5e3820967 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 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 @@ -15,25 +15,25 @@ 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> +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 +index 77f91e72b1..bb4069b18a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -562,7 +562,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c +@@ -586,7 +586,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) +-$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS) ++$(BUILDPYTHON): Programs/python.o $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS) $(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 +@@ -634,12 +634,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build @@ -46,16 +46,16 @@ index 4ad3df1122..72d202d71b 100644 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 \ +@@ -721,7 +715,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) +-Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS) ++Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS) $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) ############################################################################ -@@ -1557,17 +1551,6 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1630,17 +1624,6 @@ libainstall: @DEF_MAKE_RULE@ python-config else true; \ fi; \ done @@ -73,6 +73,3 @@ index 4ad3df1122..72d202d71b 100644 $(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 - |