diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-29 19:12:02 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-29 19:12:02 +0200 |
| commit | 27721a18d60baeec19f75faf7cea6aa302ba925a (patch) | |
| tree | e77d75b1f776020bbdb0ddfca924ba3bb11ee401 /python | |
| parent | f40a4db6c8d4807d8133ffbbfa71f71623e2c362 (diff) | |
| parent | 77c6a8e3ac106240b9fca715affedd5280c1367e (diff) | |
CWS-TOOLING: integrate CWS ause127
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 f1e37729b111..ee25e7515777 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -51,7 +51,8 @@ PATCH_FILES=\ Python-$(PYVERSION).patch \ Python-parallel-make.patch \ Python-ssl.patch \ - Python-2.6.1-sysbase.patch + Python-2.6.1-sysbase.patch\ + Python-2.6.1-nohardlink.patch CONFIGURE_DIR= |