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 /dev-libs/libx86 | |
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 'dev-libs/libx86')
-rw-r--r-- | dev-libs/libx86/Manifest | 1 | ||||
-rw-r--r-- | dev-libs/libx86/files/libx86-0.99-ifmask.patch | 21 | ||||
-rw-r--r-- | dev-libs/libx86/files/libx86-1.1-makefile.patch | 28 | ||||
-rw-r--r-- | dev-libs/libx86/libx86-1.1-r2.ebuild | 37 | ||||
-rw-r--r-- | dev-libs/libx86/libx86-1.1-r3.ebuild | 44 | ||||
-rw-r--r-- | dev-libs/libx86/metadata.xml | 8 |
6 files changed, 139 insertions, 0 deletions
diff --git a/dev-libs/libx86/Manifest b/dev-libs/libx86/Manifest new file mode 100644 index 000000000000..5dc206a8adad --- /dev/null +++ b/dev-libs/libx86/Manifest @@ -0,0 +1 @@ +DIST libx86-1.1.tar.gz 87428 SHA256 5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048 SHA512 b946555a45405a06fdf00b3e2522fc99dd7c61349c32726221aa60117a8d3da6da4b44188b1ebb208368e12b396f26055437cebcc8a0e6df10c7a006182c9280 WHIRLPOOL 778dae64fb0a21988debb12ca43ca6eed94fc34ab8d0e012aa30914053f57e6817fc7bbec42f6a85a0be4399263c035f981708036804cb756875143f91fe227c diff --git a/dev-libs/libx86/files/libx86-0.99-ifmask.patch b/dev-libs/libx86/files/libx86-0.99-ifmask.patch new file mode 100644 index 000000000000..c99eeb819f72 --- /dev/null +++ b/dev-libs/libx86/files/libx86-0.99-ifmask.patch @@ -0,0 +1,21 @@ +--- lrmi.c.orig 2008-09-06 12:24:36.070136428 +0200 ++++ lrmi.c 2008-09-06 12:28:10.584287458 +0200 +@@ -55,6 +55,18 @@ OTHER DEALINGS IN THE SOFTWARE. + #include "x86-common.h" + + #if defined(__linux__) ++#ifndef TF_MASK ++#define TF_MASK X86_EFLAGS_TF ++#endif ++#ifndef IF_MASK ++#define IF_MASK X86_EFLAGS_IF ++#endif ++#ifndef IOPL_MASK ++#define IOPL_MASK X86_EFLAGS_IOPL ++#endif ++#ifndef VIF_MASK ++#define VIF_MASK X86_EFLAGS_VIF ++#endif + #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) + #elif defined(__NetBSD__) || defined(__FreeBSD__) + #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL) diff --git a/dev-libs/libx86/files/libx86-1.1-makefile.patch b/dev-libs/libx86/files/libx86-1.1-makefile.patch new file mode 100644 index 000000000000..471c3fbc78fd --- /dev/null +++ b/dev-libs/libx86/files/libx86-1.1-makefile.patch @@ -0,0 +1,28 @@ +--- Makefile.orig 2013-02-11 16:35:56.834368910 +0400 ++++ Makefile 2013-02-11 16:36:02.587369368 +0400 +@@ -22,7 +22,7 @@ + $(AR) cru libx86.a $(OBJECTS) + + shared: $(OBJECTS) +- $(CC) $(CFLAGS) -o libx86.so.1 -shared -Wl,-soname,libx86.so.1 $(OBJECTS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o libx86.so.1 -shared -Wl,-soname,libx86.so.1 $(OBJECTS) + + objclean: + $(MAKE) -C x86emu clean +@@ -31,8 +31,14 @@ + clean: objclean + rm -f *.so.1 *.a + +-install: libx86.so.1 ++install-shared: libx86.so.1 + install -D libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so.1 +- install -D libx86.a $(DESTDIR)$(LIBDIR)/libx86.a + ln -sf libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so ++ ++install-header: + install -p -m 0644 -D lrmi.h $(DESTDIR)/usr/include/libx86.h ++ ++install-static: ++ install -D libx86.a $(DESTDIR)$(LIBDIR)/libx86.a ++ ++install: install-shared install-static install-header diff --git a/dev-libs/libx86/libx86-1.1-r2.ebuild b/dev-libs/libx86/libx86-1.1-r2.ebuild new file mode 100644 index 000000000000..665df42add8f --- /dev/null +++ b/dev-libs/libx86/libx86-1.1-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="A hardware-independent library for executing real-mode x86 code" +HOMEPAGE="http://www.codon.org.uk/~mjg59/libx86" +SRC_URI="http://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +src_prepare() { + # fix compile failure with linux-headers-2.6.26, bug 235599 + epatch "${FILESDIR}"/${PN}-0.99-ifmask.patch + sed -i 's:\($(CC) $(CFLAGS)\)\( -o libx86.so.1\):\1 $(LDFLAGS)\2:' \ + Makefile || die #236888 + tc-export CC AR +} + +src_compile() { + local ARGS + use amd64 && ARGS="BACKEND=x86emu" + emake ${ARGS} +} + +src_install() { + emake \ + LIBDIR="/usr/$(get_libdir)" \ + DESTDIR="${D}" \ + install +} diff --git a/dev-libs/libx86/libx86-1.1-r3.ebuild b/dev-libs/libx86/libx86-1.1-r3.ebuild new file mode 100644 index 000000000000..26eea6a29a03 --- /dev/null +++ b/dev-libs/libx86/libx86-1.1-r3.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="A hardware-independent library for executing real-mode x86 code" +HOMEPAGE="http://www.codon.org.uk/~mjg59/libx86" +SRC_URI="http://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="static-libs" + +src_prepare() { + # fix compile failure with linux-headers-2.6.26, bug 235599 + epatch "${FILESDIR}"/${PN}-0.99-ifmask.patch + # Patch for bugs #236888 and #456648 + epatch "${FILESDIR}"/${P}-makefile.patch + + tc-export CC AR +} + +src_compile() { + local ARGS + use amd64 && ARGS="BACKEND=x86emu" + emake ${ARGS} LIBRARY=shared shared + if use static-libs; then + emake ${ARGS} objclean + emake ${ARGS} LIBRARY=static static + fi +} + +src_install() { + local install_static; + use static-libs && install_static='install-static' + emake \ + LIBDIR="/usr/$(get_libdir)" \ + DESTDIR="${D}" \ + install-header install-shared ${install_static} +} diff --git a/dev-libs/libx86/metadata.xml b/dev-libs/libx86/metadata.xml new file mode 100644 index 000000000000..b6b8956cde34 --- /dev/null +++ b/dev-libs/libx86/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>pinkbyte@gentoo.org</email> + <name>Sergey Popov</name> + </maintainer> +</pkgmetadata> |