diff options
| -rw-r--r-- | xen-tools-4.16.0-xenstat.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/xen-tools-4.16.0-xenstat.patch b/xen-tools-4.16.0-xenstat.patch new file mode 100644 index 0000000..c47b3dc --- /dev/null +++ b/xen-tools-4.16.0-xenstat.patch @@ -0,0 +1,51 @@ +diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile +index c99508ae..b54b700c 100644 +--- a/tools/libs/stat/Makefile ++++ b/tools/libs/stat/Makefile +@@ -51,23 +51,23 @@ install-bindings: install-perl-bindings install-python-bindings + .PHONY: uninstall-bindings + uninstall-bindings: uninstall-perl-bindings uninstall-python-bindings + +-$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) include/xenstat.h ++$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) ../../include/xenstat.h + +-SWIG_FLAGS=-module xenstat -Iinclude -I. ++SWIG_FLAGS=-module xenstat -Iinclude -I. -I../../include/ + + # Python bindings +-PYTHON_VERSION=$(PYTHON:python%=%) +-PYTHON_FLAGS=-I/usr/include/python$(PYTHON_VERSION) -lpython$(PYTHON_VERSION) ++PYTHON_FLAGS=`$(PYTHON) -c 'import distutils.sysconfig; print("-I" + distutils.sysconfig.get_python_inc(True) + " " + distutils.sysconfig.get_config_var("BLDLIBRARY"))'` ++PYTHON_FLAGS+=-Wno-error=missing-prototypes -fPIC -lxenstat + $(PYMOD): $(PYSRC) + $(PYSRC): bindings/swig/xenstat.i + swig -python $(SWIG_FLAGS) -outdir $(@D) -o $(PYSRC) $< + + $(PYLIB): $(PYSRC) +- $(CC) $(CFLAGS) $(LDFLAGS) $(PYTHON_FLAGS) $(SHLIB_LDFLAGS) -lxenstat -o $@ $< $(APPEND_LDFLAGS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(PYTHON_FLAGS) $(SHLIB_LDFLAGS) -o $@ $< $(SHLIB) $(LDLIBS-y) $(APPEND_LDFLAGS) + + python-bindings: $(PYLIB) $(PYMOD) + +-pythonlibdir=$(prefix)/lib/python$(PYTHON_VERSION)/site-packages ++pythonlibdir=`$(PYTHON) -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())'` + install-python-bindings: $(PYLIB) $(PYMOD) + $(INSTALL_PROG) $(PYLIB) $(DESTDIR)$(pythonlibdir)/_xenstat.so + $(INSTALL_PROG) $(PYMOD) $(DESTDIR)$(pythonlibdir)/xenstat.py +@@ -91,13 +91,14 @@ $(PERLSRC): bindings/swig/xenstat.i + swig -perl $(SWIG_FLAGS) -outdir $(@D) -o $(PERLSRC) $< + + $(PERLLIB): $(PERLSRC) +- $(CC) $(CFLAGS) $(LDFLAGS) $(PERL_FLAGS) $(SHLIB_LDFLAGS) -lxenstat -o $@ $< $(APPEND_LDFLAGS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(PERL_FLAGS) $(SHLIB_LDFLAGS) -o $@ $< $(SHLIB) $(LDLIBS-y) $(APPEND_LDFLAGS) ++ + + .PHONY: perl-bindings + perl-bindings: $(PERLLIB) $(PERLMOD) + + .PHONY: install-perl-bindings +-perllibdir=$(prefix)/lib/perl5 ++perllibdir=$(prefix)/$(libdir)/perl5 + perlmoddir=$(prefix)/share/perl5 + install-perl-bindings: $(PERLLIB) $(PERLMOD) + $(INSTALL_PROG) $(PERLLIB) $(DESTDIR)$(perllibdir)/xenstat.so |