2012-08-14 01:11:12 +00:00
|
|
|
diff -up cpython-59223da36dec/Makefile.pre.in.no-static-lib cpython-59223da36dec/Makefile.pre.in
|
|
|
|
|
--- cpython-59223da36dec/Makefile.pre.in.no-static-lib 2012-08-07 16:43:43.296466422 -0400
|
|
|
|
|
+++ cpython-59223da36dec/Makefile.pre.in 2012-08-07 16:44:13.299464371 -0400
|
2015-09-16 06:36:17 +00:00
|
|
|
@@ -550,7 +550,7 @@ clinic: $(BUILDPYTHON)
|
2013-11-27 12:03:43 +00:00
|
|
|
$(RUNSHARED) $(PYTHON_FOR_BUILD) ./Tools/clinic/clinic.py --make
|
2010-01-18 17:59:07 +00:00
|
|
|
|
|
|
|
|
# Build the interpreter
|
2015-09-16 06:36:17 +00:00
|
|
|
-$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
|
|
|
|
+$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
|
|
|
|
$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
|
2013-04-10 12:30:09 +00:00
|
|
|
platform: $(BUILDPYTHON) pybuilddir.txt
|
2012-08-14 01:11:12 +00:00
|
|
|
@@ -480,18 +480,6 @@ sharedmods: $(BUILDPYTHON) $(SYSCONFIGDA
|
Update to Python 3.4 alpha 4.
- Refreshed patches: 55 (systemtap), 102 (lib64), 111 (no static lib),
114 (statvfs flags), 132 (unittest rpmbuild hooks), 134 (fix COUNT_ALLOCS in
test_sys), 143 (tsc on ppc64), 146 (hashlib fips), 153 (test gdb noise),
157 (UID+GID overflows), 173 (ENOPROTOOPT in bind_port), 186 (dont raise
from py_compile)
- Removed patches: 129 (test_subprocess nonreadable dir - no longer fails in
Koji), 142 (the mock issue that caused this is fixed)
- Added patch 187 (remove thread atfork) - will be in next version
- Refreshed script for checking pyc and pyo timestamps with new ignored files.
- The fips patch is disabled for now until upstream makes a final decision
what to do with sha3 implementation for 3.4.0.
2013-11-05 11:39:14 +00:00
|
|
|
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
|
2012-08-14 01:11:12 +00:00
|
|
|
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
|
2010-01-18 17:59:07 +00:00
|
|
|
|
|
|
|
|
-# Build static library
|
|
|
|
|
-# avoid long command lines, same as LIBRARY_OBJS
|
|
|
|
|
-$(LIBRARY): $(LIBRARY_OBJS)
|
|
|
|
|
- -rm -f $@
|
|
|
|
|
- $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o
|
|
|
|
|
- $(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
|
|
|
|
|
- $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
|
2012-07-20 20:34:09 +00:00
|
|
|
- $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) Python/frozen.o
|
2010-01-18 17:59:07 +00:00
|
|
|
- $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
|
|
|
|
|
- $(AR) $(ARFLAGS) $@ $(MODOBJS)
|
|
|
|
|
- $(RANLIB) $@
|
|
|
|
|
-
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
libpython$(LDVERSION).so: $(LIBRARY_OBJS)
|
2010-01-18 17:59:07 +00:00
|
|
|
if test $(INSTSONAME) != $(LDLIBRARY); then \
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
|
2015-09-16 06:36:17 +00:00
|
|
|
@@ -674,7 +674,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.d
|
2011-07-11 16:04:52 +00:00
|
|
|
echo "-----------------------------------------------"; \
|
|
|
|
|
fi
|
|
|
|
|
|
2015-09-16 06:36:17 +00:00
|
|
|
-Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
|
|
|
|
+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
|
|
|
|
|
$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
2011-07-11 16:04:52 +00:00
|
|
|
|
|
|
|
|
############################################################################
|
2015-09-16 06:36:17 +00:00
|
|
|
@@ -1354,18 +1354,6 @@ libainstall: all python-config
|
2010-01-18 17:59:07 +00:00
|
|
|
else true; \
|
|
|
|
|
fi; \
|
|
|
|
|
done
|
|
|
|
|
- @if test -d $(LIBRARY); then :; else \
|
|
|
|
|
- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
|
2013-04-10 12:30:09 +00:00
|
|
|
- if test "$(SHLIB_SUFFIX)" = .dll; then \
|
2010-01-18 17:59:07 +00:00
|
|
|
- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
|
|
|
|
|
- else \
|
|
|
|
|
- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
|
|
|
|
- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
|
|
|
|
- fi; \
|
|
|
|
|
- else \
|
|
|
|
|
- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
|
|
|
|
|
- fi; \
|
|
|
|
|
- fi
|
|
|
|
|
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
|
2015-09-16 06:36:17 +00:00
|
|
|
$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
|
2010-01-18 17:59:07 +00:00
|
|
|
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
|
