From 6a98161933d13e0fddbbd5141d64b02270486873 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sat, 17 Mar 2012 14:35:30 -0400 Subject: [PATCH] lrmi: Sync with upstream. Merge changes from the main Gentoo tree. Also use EAPI=4 and src_prepare to apply the new patches. --- sys-libs/lrmi/Manifest | 5 ++-- .../lrmi/files/lrmi-0.10-kernel-2.6.26.patch | 18 +++++++++++++ sys-libs/lrmi/files/lrmi-0.10-ldflags.patch | 26 +++++++++++++++++++ sys-libs/lrmi/lrmi-0.10-r1.ebuild | 23 ++++++++++------ 4 files changed, 62 insertions(+), 10 deletions(-) create mode 100644 sys-libs/lrmi/files/lrmi-0.10-kernel-2.6.26.patch create mode 100644 sys-libs/lrmi/files/lrmi-0.10-ldflags.patch diff --git a/sys-libs/lrmi/Manifest b/sys-libs/lrmi/Manifest index b785f28..1531ab4 100644 --- a/sys-libs/lrmi/Manifest +++ b/sys-libs/lrmi/Manifest @@ -1,3 +1,4 @@ +AUX lrmi-0.10-kernel-2.6.26.patch 593 RMD160 a30d5164643be00dfcb2e45623aaa7626c25f1d2 SHA1 d00ea0857bbef88425bee9928a1b28b9fd5193a2 SHA256 44249d94d58bcac734683c3a15b5b9bcefc815b7aa4df1e053172e90c3c3ab9d +AUX lrmi-0.10-ldflags.patch 933 RMD160 8a00795f9cd3ccdfa69604907d22f6b50c8d022a SHA1 d2c485b780cc32119c0db949fc406e9b25e2543c SHA256 43356cc620593291d8ff079d36a770440b7cfa0c2318f869928c1968c08f2075 DIST lrmi-0.10.tar.gz 10271 RMD160 3805b41fd2a558ec145991c30a7f88101af48f1c SHA1 1495b3c2f3613979eb0396fd99a8e5e52d53ec80 SHA256 b0be55c14407f586dc10836e8f348b3a002c461a9b47a302071eac0ef85770da -EBUILD lrmi-0.10-r1.ebuild 941 RMD160 568bbe934e5d525215dd37754cbccb8f2a3d0d01 SHA1 69c7b41c9528b35ffd7543a9dfdd4166b00c78cf SHA256 f9c338c790f635a0c401792f9673a337d64d979cf96fd74fc086ecaa8ddefbe7 -MISC lrmi-0.10-r1.ebuild~ 773 RMD160 e1cf7eda6e44c8df917ccd8c4bd0a867dfa1c9bc SHA1 9706081e3bf04dc64aa6ba4f6bbd062e9ea599d8 SHA256 663d5fa96e67e76e9d9c63da675ea1c00134be4b28c3e505f94f5aad3a1d911b +EBUILD lrmi-0.10-r1.ebuild 1147 RMD160 6590c7f5819aa15e197d39e2e654829c84ef9cea SHA1 1b9ef79b4fbab4df0e5d58904192b6af31ea8200 SHA256 1ef34c8a98e4347b87247ec1b0d0eb79f07deb55286d502dfa8c0fcecb6617df 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 0000000..9547439 --- /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 0000000..39d298c --- /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) diff --git a/sys-libs/lrmi/lrmi-0.10-r1.ebuild b/sys-libs/lrmi/lrmi-0.10-r1.ebuild index e34d3a6..081c727 100644 --- a/sys-libs/lrmi/lrmi-0.10-r1.ebuild +++ b/sys-libs/lrmi/lrmi-0.10-r1.ebuild @@ -1,6 +1,10 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/lrmi-0.10-r1.ebuild,v 1.1 2006/02/14 00:25:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/lrmi/lrmi-0.10-r1.ebuild,v 1.5 2010/08/20 13:10:18 spock Exp $ + +EAPI=4 + +inherit eutils toolchain-funcs DESCRIPTION="library for calling real mode BIOS routines under Linux" HOMEPAGE="http://www.sourceforge.net/projects/lrmi/" @@ -8,19 +12,22 @@ SRC_URI="mirror://sourceforge/lrmi/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="x86" IUSE="" -DEPEND="" -RDEPEND="" +src_prepare() { + epatch "${FILESDIR}"/${P}-kernel-2.6.26.patch + epatch "${FILESDIR}"/${P}-ldflags.patch +} src_compile() { - emake CFLAGS="${CFLAGS}" || die + tc-export CC AR RANLIB + emake CFLAGS="${CFLAGS} -Wall" LDFLAGS="${LDFLAGS}" || die "emake failed." } src_install() { - dolib.a liblrmi.a || die "dolib.a" - dolib.so liblrmi.so.${PV} || die "dolib.so" + dolib.a liblrmi.a || die "dolib.a failed." + dolib.so liblrmi.so.${PV} || die "dolib.so failed." dosym liblrmi.so.${PV} /usr/lib/liblrmi.so dosym liblrmi.so.${PV} /usr/lib/liblrmi.so.${PV%%.*} -- 2.43.0