diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2011-03-22 10:24:28 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2011-03-22 10:24:28 +0100 |
| commit | 77c6a8e3ac106240b9fca715affedd5280c1367e (patch) | |
| tree | d9506fada65a809f4d489143158fca0b9ffcd247 /python | |
| parent | 1e94a4e6c2591d3ad9101e5b524294a5986c0949 (diff) | |
ause127: #i117375# avoid hard links in python build
Diffstat (limited to 'python')
| -rw-r--r-- | python/Python-2.6.1-nohardlink.patch | 20 | ||||
| -rw-r--r-- | python/makefile.mk | 3 |
2 files changed, 22 insertions, 1 deletions
diff --git a/python/Python-2.6.1-nohardlink.patch b/python/Python-2.6.1-nohardlink.patch new file mode 100644 index 000000000000..c552b1a0e126 --- /dev/null +++ b/python/Python-2.6.1-nohardlink.patch @@ -0,0 +1,20 @@ +--- misc/Python-2.6.1/Makefile.pre.in 2011-03-08 18:23:37.230410480 +0100 ++++ misc/build/Python-2.6.1/Makefile.pre.in 2011-03-08 18:22:57.935746999 +0100 +@@ -414,7 +414,7 @@ + libpython$(VERSION).so: $(LIBRARY_OBJS) + if test $(INSTSONAME) != $(LDLIBRARY); then \ + $(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ +- $(LN) -f $(INSTSONAME) $@; \ ++ $(LN) -fs $(INSTSONAME) $@; \ + else\ + $(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ + fi +@@ -767,7 +767,7 @@ + then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \ + else true; \ + fi +- (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON)) ++ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) $(PYTHON)) + -rm -f $(DESTDIR)$(BINDIR)/python-config + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config) + diff --git a/python/makefile.mk b/python/makefile.mk index 607ba93ab92d..806830033d35 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -50,7 +50,8 @@ TARFILE_MD5=e81c2f0953aa60f8062c05a4673f2be0 PATCH_FILES=\ Python-$(PYVERSION).patch \ Python-parallel-make.patch \ - Python-ssl.patch + Python-ssl.patch \ + Python-2.6.1-nohardlink.patch CONFIGURE_DIR= |