projects / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| bf250edf MT |
1 | diff -up cpython-59223da36dec/Makefile.pre.in.no-static-lib cpython-59223da36dec/Makefile.pre.in |
| 2 | --- cpython-59223da36dec/Makefile.pre.in.no-static-lib 2012-08-07 16:43:43.296466422 -0400 | |
| 3 | +++ cpython-59223da36dec/Makefile.pre.in 2012-08-07 16:44:13.299464371 -0400 | |
| 4 | @@ -464,7 +464,7 @@ coverage: | |
| 5 | ||
| 6 | ||
| 7 | # Build the interpreter | |
| 8 | -$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) | |
| 9 | +$(BUILDPYTHON): Modules/python.o $(LDLIBRARY) $(PY3LIBRARY) | |
| 10 | $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) | |
| 11 | ||
| 12 | platform: $(BUILDPYTHON) $(SYSCONFIGDATA) | |
| 13 | @@ -480,18 +480,6 @@ sharedmods: $(BUILDPYTHON) $(SYSCONFIGDA | |
| 14 | $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ | |
| 15 | $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build | |
| 16 | ||
| 17 | -# Build static library | |
| 18 | -# avoid long command lines, same as LIBRARY_OBJS | |
| 19 | -$(LIBRARY): $(LIBRARY_OBJS) | |
| 20 | - -rm -f $@ | |
| 21 | - $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o | |
| 22 | - $(AR) $(ARFLAGS) $@ $(PARSER_OBJS) | |
| 23 | - $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS) | |
| 24 | - $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) Python/frozen.o | |
| 25 | - $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS) | |
| 26 | - $(AR) $(ARFLAGS) $@ $(MODOBJS) | |
| 27 | - $(RANLIB) $@ | |
| 28 | - | |
| 29 | libpython$(LDVERSION).so: $(LIBRARY_OBJS) | |
| 30 | if test $(INSTSONAME) != $(LDLIBRARY); then \ | |
| 31 | $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ | |
| 32 | @@ -581,7 +569,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.d | |
| 33 | echo "-----------------------------------------------"; \ | |
| 34 | fi | |
| 35 | ||
| 36 | -Modules/_testembed: Modules/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) | |
| 37 | +Modules/_testembed: Modules/_testembed.o $(LDLIBRARY) $(PY3LIBRARY) | |
| 38 | $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) | |
| 39 | ||
| 40 | ############################################################################ | |
| 41 | @@ -1155,18 +1143,6 @@ libainstall: all python-config | |
| 42 | else true; \ | |
| 43 | fi; \ | |
| 44 | done | |
| 45 | - @if test -d $(LIBRARY); then :; else \ | |
| 46 | - if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ | |
| 47 | - if test "$(SO)" = .dll; then \ | |
| 48 | - $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ | |
| 49 | - else \ | |
| 50 | - $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ | |
| 51 | - $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ | |
| 52 | - fi; \ | |
| 53 | - else \ | |
| 54 | - echo Skip install of $(LIBRARY) - use make frameworkinstall; \ | |
| 55 | - fi; \ | |
| 56 | - fi | |
| 57 | $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c | |
| 58 | $(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o | |
| 59 | $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in |