From d7a871ff104d2553887a74659fbc915bd7949a6a Mon Sep 17 00:00:00 2001 From: zbyniu Date: Thu, 12 Aug 2010 00:14:59 +0000 Subject: [PATCH] - merged in upstream Changed files: OpenIPMI-lt.patch -> 1.2 OpenIPMI-python.patch -> 1.6 --- OpenIPMI-lt.patch | 29 -------------- OpenIPMI-python.patch | 90 ------------------------------------------- 2 files changed, 119 deletions(-) delete mode 100644 OpenIPMI-lt.patch delete mode 100644 OpenIPMI-python.patch diff --git a/OpenIPMI-lt.patch b/OpenIPMI-lt.patch deleted file mode 100644 index 2b7c4b5..0000000 --- a/OpenIPMI-lt.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- OpenIPMI-2.0.14/swig/perl/Makefile.am.orig 2007-10-02 16:34:34.000000000 +0200 -+++ OpenIPMI-2.0.14/swig/perl/Makefile.am 2008-07-10 07:29:13.967027928 +0200 -@@ -16,19 +16,19 @@ - all: OpenIPMI.so - - OpenIPMI_SRC = OpenIPMI_wrap.c OpenIPMI_perl.c --OpenIPMI_OBJ = OpenIPMI_wrap.o OpenIPMI_perl.o -+OpenIPMI_OBJ = OpenIPMI_wrap.lo OpenIPMI_perl.lo - - OpenIPMI.so: $(OpenIPMI_OBJ) -- $(LIBTOOL) --mode=link $(CC) -shared -o $@ $^ $(OPENIPMI_SWIG_LIBS) -- rm OpenIPMI.so -+ $(LIBTOOL) --mode=link $(CC) -shared -module -avoid-version -o $(@:.so=.la) $^ $(OPENIPMI_SWIG_LIBS) -rpath $(PERL_INSTALL_DIR)/auto/OpenIPMI -+ rm -f OpenIPMI.so - mv .libs/OpenIPMI.so . - rm -rf .libs - --OpenIPMI_wrap.o: OpenIPMI_wrap.c OpenIPMI.h -- $(COMPILE) -c $< -+OpenIPMI_wrap.lo: OpenIPMI_wrap.c OpenIPMI.h -+ $(LIBTOOL) --mode=compile $(COMPILE) -c $< - --OpenIPMI_perl.o: OpenIPMI_perl.c OpenIPMI.h -- $(COMPILE) -c $< -+OpenIPMI_perl.lo: OpenIPMI_perl.c OpenIPMI.h -+ $(LIBTOOL) --mode=compile $(COMPILE) -c $< - - OpenIPMI_wrap.c OpenIPMI.pm: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i - $(SWIG) $(DEFS) -perl5 -o $@ -I$(top_srcdir)/swig/perl $< diff --git a/OpenIPMI-python.patch b/OpenIPMI-python.patch deleted file mode 100644 index 874661f..0000000 --- a/OpenIPMI-python.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- OpenIPMI-2.0.13/swig/python/openipmigui/Makefile.am.orig 2007-11-03 20:00:30.925230000 +0100 -+++ OpenIPMI-2.0.13/swig/python/openipmigui/Makefile.am 2007-11-03 20:17:14.238405581 +0100 -@@ -35,12 +35,12 @@ - done) - -rmdir "$(DESTDIR)$(PYTHON_INSTALL_DIR)/openipmigui" - --PYPATH=$(top_builddir)/swig/python:$(srcdir) -+PYPATH=$(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs:$(srcdir) - - .py.pyc: -- LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import $*' -+ LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/.libs/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import $*' - - .py.pyo: -- LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import $*' -+ LD_PRELOAD=$(OPENIPMI_SWIG_SO):$(top_builddir)/swig/python/.libs/_OpenIPMI.so PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import $*' - - CLEANFILES = $(PYC_FILES) $(PYO_FILES) ---- OpenIPMI-2.0.13/swig/python/Makefile.am.orig 2007-10-16 18:10:53.000000000 +0200 -+++ OpenIPMI-2.0.13/swig/python/Makefile.am 2007-11-03 20:15:34.520722993 +0100 -@@ -5,46 +5,33 @@ AM_CFLAGS = $(PYTHON_CFLAGS) \ - -I $(top_builddir) \ - -I $(top_builddir)/include \ - -I $(top_srcdir)/include \ -- -I $(top_srcdir)/swig/python -+ -I $(top_srcdir)/swig/python \ -+ -Wall -DPYTHON_HAS_POSIX_THREADS=@PYTHON_HAS_POSIX_THREADS@ - --CC = @CC@ -Wall --CFLAGS = @CFLAGS@ -fPIC -DPYTHON_HAS_POSIX_THREADS=@PYTHON_HAS_POSIX_THREADS@ --DEFS = @DEFS@ -+pythonlibdir=$(PYTHON_INSTALL_LIB_DIR) -+PYPATH=$(top_builddir)/swig/python:$(top_builddir)/swig/python/.libs:$(srcdir)/openipmigui - --COMPILE = $(CC) $(DEFS) $(AM_CFLAGS) $(CFLAGS) -+pythonlib_LTLIBRARIES = _OpenIPMI.la - --all-local: _OpenIPMI.so -- --OpenIPMI_SRC = OpenIPMI_wrap.c --OpenIPMI_OBJ = OpenIPMI_wrap.o -+_OpenIPMI_la_SOURCES = OpenIPMI_wrap.c -+_OpenIPMI_la_LDFLAGS = -module -avoid-version -+_OpenIPMI_la_LIBADD = $(OPENIPMI_SWIG_LIBS) - - EXTRA_DIST = OpenIPMI_lang.i OpenIPMI.h openipmigui.py - --_OpenIPMI.so: $(OpenIPMI_OBJ) -- $(LIBTOOL) --mode=link $(CC) -shared -o $@ $^ $(OPENIPMI_SWIG_LIBS) -- rm _OpenIPMI.so -- mv .libs/_OpenIPMI.so . -- rm -rf .libs -- --OpenIPMI_wrap.o OpenIPMI.py: OpenIPMI_wrap.c OpenIPMI.h -- $(COMPILE) -c $< -- --OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.so -- -$(pythonprog) -c 'import OpenIPMI.py' -+OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.la -+ -PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import OpenIPMI.py' - --OpenIPMI.pyo: OpenIPMI.py _OpenIPMI.so -- -$(pythonprog) -O -c 'import OpenIPMI.py' -+OpenIPMI.pyo: OpenIPMI.py _OpenIPMI.la -+ -PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py' - --OpenIPMI_wrap.c: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i -+OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i - $(SWIG) $(DEFS) -python -o $@ -I$(top_srcdir)/swig/python $< - --CLEANFILES = $(OpenIPMI_OBJ) _OpenIPMI.so OpenIPMI_wrap.c \ -- OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc -+CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc - --install-exec-local: _OpenIPMI.so OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo -+install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo - $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR) -- $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_LIB_DIR) -- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) _OpenIPMI.so "$(DESTDIR)$(PYTHON_INSTALL_LIB_DIR)/" - $(INSTALL_DATA) OpenIPMI.py "$(DESTDIR)$(PYTHON_INSTALL_DIR)" - $(INSTALL_DATA) OpenIPMI.pyc "$(DESTDIR)$(PYTHON_INSTALL_DIR)" - $(INSTALL_DATA) OpenIPMI.pyo "$(DESTDIR)$(PYTHON_INSTALL_DIR)" -@@ -60,7 +47,5 @@ uninstall-local: - rm -f "$(DESTDIR)$(PYTHON_INSTALL_DIR)/OpenIPMI.pyo" - rm -f "$(DESTDIR)$(bindir)/openipmigui" - --PYPATH=$(top_builddir)/swig/python:$(srcdir)/openipmigui -- - rungui: - LD_LIBRARY_PATH=$(top_builddir)/glib/.libs LD_PRELOAD=$(OPENIPMI_SWIG_SO) PYTHONPATH=$(PYPATH) $(pythonprog) $(top_srcdir)/swig/python/openipmigui.py -- 2.44.0