diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-libs/lrmi/files | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
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, 44 insertions, 0 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 new file mode 100644 index 000000000000..9547439376a3 --- /dev/null +++ b/sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch @@ -0,0 +1,18 @@ +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 new file mode 100644 index 000000000000..b23bd9c5cdf8 --- /dev/null +++ b/sys-libs/lrmi/files/lrmi-0.10-ldflags.patch @@ -0,0 +1,26 @@ +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) |