diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:46:31 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:46:31 +0200 |
| commit | a5303710f05e76f3cb3bf9d5d0c4985ad6603095 (patch) | |
| tree | a297dc94d798ac004a4ad65c4d57c7c6af5e7dbe /python | |
| parent | 8e872440fdf116e903baf92c80b88154566688c8 (diff) | |
| parent | e0785dd388faf57cd20bf3bb13a28ffc410911ef (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
berkeleydb/makefile.mk
Diffstat (limited to 'python')
| -rw-r--r-- | python/Python-2.6.1-nohardlink.patch | 20 | ||||
| -rw-r--r-- | python/Python-2.6.1-sysbase.patch | 13 | ||||
| -rw-r--r-- | python/makefile.mk | 4 |
3 files changed, 36 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/Python-2.6.1-sysbase.patch b/python/Python-2.6.1-sysbase.patch new file mode 100644 index 000000000000..fb81056c1595 --- /dev/null +++ b/python/Python-2.6.1-sysbase.patch @@ -0,0 +1,13 @@ +--- misc/Python-2.6.1/configure Thu Mar 17 13:00:41 2011 ++++ misc/build/Python-2.6.1/configure Thu Mar 17 12:58:50 2011 +@@ -2042,7 +2042,9 @@ + if test -z "$MACHDEP" + then + ac_sys_system=`uname -s` +- if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \ ++ if test -n "$OOO_SYSBASE_SYS_RELEASE"; then ++ ac_sys_release=$OOO_SYSBASE_SYS_RELEASE ++ elif test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \ + -o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then + ac_sys_release=`uname -v` + else diff --git a/python/makefile.mk b/python/makefile.mk index eb72a267ca88..fb729bda8db5 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -50,7 +50,9 @@ PATCH_FILES=\ Python-parallel-make.patch \ Python-ssl.patch \ Python-aix.patch \ - Python-2.6.1-urllib.patch + Python-2.6.1-urllib.patch \ + Python-2.6.1-sysbase.patch \ + Python-2.6.1-nohardlink.patch CONFIGURE_DIR= |