diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:19:36 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 23:22:23 +0100 |
commit | 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch) | |
tree | 76e74807bc479502e13866b581b6bf86734ec634 /sys-libs/lrmi/files | |
parent | 30d6f67c98d149508509d5e86f176d558793acc0 (diff) |
gentoo resync : 13.10.2019
Diffstat (limited to 'sys-libs/lrmi/files')
-rw-r--r-- | sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch | 18 | ||||
-rw-r--r-- | sys-libs/lrmi/files/lrmi-0.10-ldflags.patch | 26 |
2 files changed, 0 insertions, 44 deletions
diff --git a/sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch b/sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch deleted file mode 100644 index 9547439376a3..000000000000 --- a/sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naurp lrmi-0.10-orig/lrmi.c lrmi-0.10/lrmi.c ---- lrmi-0.10-orig/lrmi.c 2008-08-23 14:39:44.000000000 +0200 -+++ lrmi-0.10/lrmi.c 2008-08-23 14:40:25.000000000 +0200 -@@ -61,6 +61,14 @@ OTHER DEALINGS IN THE SOFTWARE. - - #include "lrmi.h" - -+/* 2.6.26+ kernels don't define the legacy masks. */ -+#if defined(__linux__) && !defined(TF_MASK) -+ #define TF_MASK X86_EFLAGS_TF -+ #define IF_MASK X86_EFLAGS_IF -+ #define VIF_MASK X86_EFLAGS_VIF -+ #define IOPL_MASK X86_EFLAGS_IOPL -+#endif -+ - #define REAL_MEM_BASE ((void *)0x10000) - #define REAL_MEM_SIZE 0x40000 - #define REAL_MEM_BLOCKS 0x100 diff --git a/sys-libs/lrmi/files/lrmi-0.10-ldflags.patch b/sys-libs/lrmi/files/lrmi-0.10-ldflags.patch deleted file mode 100644 index b23bd9c5cdf8..000000000000 --- a/sys-libs/lrmi/files/lrmi-0.10-ldflags.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naurp lrmi-0.10-orig/Makefile lrmi-0.10/Makefile ---- lrmi-0.10-orig/Makefile 2010-08-20 15:03:17.093144820 +0200 -+++ lrmi-0.10/Makefile 2010-08-20 15:03:47.761144267 +0200 -@@ -2,6 +2,7 @@ LIBDIR ?= /usr/local/lib - INCDIR ?= /usr/local/include - - CFLAGS = -g -Wall -+LDFLAGS = - - sources = lrmi.c - objects = lrmi.o -@@ -26,12 +27,12 @@ liblrmi.a: $(objects) - - liblrmi.so: $(pic_objects) - # $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -shared -o $@ $^ -- $(CC) $(CPPFLAGS) $(CFLAGS) -Wl,-soname,$(LIBNAME).so.$(MAJOR) -fPIC -shared -o $(LIBNAME).so.$(VERSION) $^ -+ $(CC) $(CPPFLAGS) $(CFLAGS) -Wl,-soname,$(LIBNAME).so.$(MAJOR) $(LDFLAGS) -fPIC -shared -o $(LIBNAME).so.$(VERSION) $^ - ln -sf $(LIBNAME).so.$(VERSION) $(LIBNAME).so.$(MAJOR) - ln -sf $(LIBNAME).so.$(MAJOR) $(LIBNAME).so - - vbetest: vbetest.c liblrmi.a -- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ - - install: - mkdir -p $(LIBDIR) |