diff options
author | Pedro Giffuni <pfg@apache.org> | 2012-07-26 19:20:33 +0000 |
---|---|---|
committer | Pedro Giffuni <pfg@apache.org> | 2012-07-26 19:20:33 +0000 |
commit | ac0b066923d2f201ddc44f1e4a44ec45b1b1b148 (patch) | |
tree | 6a01a0120fc53e09bb0fff293341b1d637118512 /pyuno | |
parent | c3f714be4453789706df803568dca9aa3086ed01 (diff) |
i119384 - Python update to version 2.7.3
This is the last 2.x version released: it includes many bug
fixes and also supports some backward compatible features
from the 3.1 series. More information is available here:
http://www.python.org/download/releases/2.7.3/
In order to reduce conflicts the patches were reorganized:
the FreeBSD patches are in their own patch now. The SSL
patches were split in three parts: -md5, -ssl and a
Windows-specific component that was merged along with
-security-flags into -pcbuild.
Patch by: Hanya Runo and pfg@
Notes
Notes:
ignore: obsolete
Diffstat (limited to 'pyuno')
-rw-r--r-- | pyuno/zipcore/makefile.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pyuno/zipcore/makefile.mk b/pyuno/zipcore/makefile.mk index f49e9dcfc0d3..7b19e1e8bbfc 100644 --- a/pyuno/zipcore/makefile.mk +++ b/pyuno/zipcore/makefile.mk @@ -54,9 +54,14 @@ FINDLIBFILES_TMP:=$(subst,/,$/ \ $(shell @$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v "\.pyc" |$(GREP) -v "\.py~" |$(GREP) -v .orig | $(GREP) -v _failed)) FINDLIBFILES=$(subst,$(SOLARLIBDIR)$/python, $(FINDLIBFILES_TMP)) +FINDINCFILES_TMP:=$(subst,/,$/ \ + $(shell @$(FIND) $(SOLARINCDIR)$/python -type f| $(GREP) -v "\.h~" | $(GREP) -v _failed)) +FINDINCFILES=$(subst,$(SOLARINCDIR)$/python, $(FINDINCFILES_TMP)) + FILES=\ $(PYTHONBINARY) \ - $(foreach,i,$(FINDLIBFILES) $(DESTROOT)$/lib$(i)) + $(foreach,i,$(FINDLIBFILES) $(DESTROOT)$/lib$(i)) \ + $(foreach,i,$(FINDINCFILES) $(DESTROOT)$/include$/python$(PYMAJOR).$(PYMINOR)$(i)) .IF "$(OS)" == "WNT" APP1TARGET = python @@ -101,6 +106,11 @@ $(DESTROOT)$/lib$/% : $(SOLARLIBDIR)$/python$/% -rm -f $@ cat $< > $@ +$(DESTROOT)$/include$/python$(PYMAJOR).$(PYMINOR)%: $(SOLARINCDIR)$/python$/% + -$(MKDIRHIER) $(@:d) + -rm -f $@ + cat $< > $@ + .IF "$(GUI)"== "UNX" $(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST) -$(MKDIRHIER) $(@:d) |