From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- dev-libs/ucl/Manifest | 1 + dev-libs/ucl/files/ucl-1.03-CFLAGS.patch | 134 ++++++++++++++++++++++++ dev-libs/ucl/files/ucl-1.03-x32.patch | 173 +++++++++++++++++++++++++++++++ dev-libs/ucl/metadata.xml | 7 ++ dev-libs/ucl/ucl-1.03-r1.ebuild | 41 ++++++++ 5 files changed, 356 insertions(+) create mode 100644 dev-libs/ucl/Manifest create mode 100644 dev-libs/ucl/files/ucl-1.03-CFLAGS.patch create mode 100644 dev-libs/ucl/files/ucl-1.03-x32.patch create mode 100644 dev-libs/ucl/metadata.xml create mode 100644 dev-libs/ucl/ucl-1.03-r1.ebuild (limited to 'dev-libs/ucl') diff --git a/dev-libs/ucl/Manifest b/dev-libs/ucl/Manifest new file mode 100644 index 000000000000..1d414da3d9a3 --- /dev/null +++ b/dev-libs/ucl/Manifest @@ -0,0 +1 @@ +DIST ucl-1.03.tar.gz 534881 SHA256 b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348 SHA512 7dd1824d01b4bb41ee03bbceddc634a9f7f910d235e5cca163d783680d6743f0f3cc309bbbcc1e094d897d549d3805a555f9093b4d77805443d896dd1862aa34 WHIRLPOOL 64b9124cf863248e74c97c45631a0fca7337fa6a99bd08dfbd5e7ca65d8fd509ba6a331059f87472d7dbcd56f9f354359d0c2da412224f9f4fda8ff3c8b6d2a6 diff --git a/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch b/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch new file mode 100644 index 000000000000..07c925b4888e --- /dev/null +++ b/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch @@ -0,0 +1,134 @@ +From: Nathan Phillip Brink +Subject: Respect CCASFLAGS (which often defaults to CFLAGS). Fixes + compilation for portage-multilib users. + +diff -r c090ed619e90 configure.ac +--- a/configure.ac Sun Jun 26 16:00:09 2011 -0400 ++++ b/configure.ac Sun Jun 26 20:52:01 2011 -0400 +@@ -47,14 +47,12 @@ + AC_CANONICAL_TARGET + AM_MAINTAINER_MODE + +-if test -z "$ac_abs_top_srcdir"; then +- _AC_SRCPATHS(.) +-fi + if test -r .Conf.settings1; then + . ./.Conf.settings1 + fi + + AC_PROG_CC ++AM_PROG_AS + AC_PROG_CPP + mfx_PROG_CPPFLAGS + AC_C_CONST +@@ -84,13 +82,13 @@ + if test "X$enable_asm" != Xno; then + mfx_compile_S='${CC-cc} -c conftest.S 1>&AS_MESSAGE_LOG_FD' + cat > conftest.S <> 0)); +--- a/acc/acclib/perfctr.ch ++++ b/acc/acclib/perfctr.ch +@@ -63,7 +63,7 @@ ACCLIB_PUBLIC(int, acc_perfctr_open) (acc_perfctr_handle_p h) + break; /* no working TSC available */ + case PERFCTR_X86_AMD_K7: + #endif +-#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32) ++#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) + case PERFCTR_X86_AMD_K8: + case PERFCTR_X86_AMD_K8C: + cc->tsc_on = 1; cc->nractrs = 2; +--- a/acc/acclib/rdtsc.ch ++++ b/acc/acclib/rdtsc.ch +@@ -21,7 +21,7 @@ + #if defined(acc_int32e_t) + + +-#if ((ACC_ARCH_AMD64 || ACC_ARCH_IA32) && ACC_CC_GNUC) ++#if ((ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) && ACC_CC_GNUC) + # if (ACC_CC_GNUC >= 0x020000ul) + # define __ACCLIB_RDTSC_REGS : : "r" (t) : "cc", "memory", "eax", "edx" + # else +@@ -38,7 +38,7 @@ + + ACCLIB_PUBLIC(int, acc_tsc_read) (acc_uint32e_t* t) + { +-#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32) && defined(__ACCLIB_RDTSC_REGS) ++#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) && defined(__ACCLIB_RDTSC_REGS) + __asm__ __volatile__( + "clc \n" ".byte 0x0f, 0x31\n" + "movl %%eax,(%0)\n" "movl %%edx,4(%0)\n" +@@ -73,7 +73,7 @@ ACCLIB_PUBLIC(int, acc_tsc_read) (acc_uint32e_t* t) + + ACCLIB_PUBLIC(int, acc_tsc_read_add) (acc_uint32e_t* t) + { +-#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32) && defined(__ACCLIB_RDTSC_REGS) ++#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) && defined(__ACCLIB_RDTSC_REGS) + __asm__ __volatile__( + "clc \n" ".byte 0x0f, 0x31\n" + "addl %%eax,(%0)\n" "adcl $0,%%edx\n" "addl %%edx,4(%0)\n" +--- a/src/ucl_conf.h ++++ b/src/ucl_conf.h +@@ -172,7 +172,7 @@ + #undef UA_SET2 + #undef UA_GET4 + #undef UA_SET4 +-#if 1 && (ACC_ARCH_AMD64 || ACC_ARCH_IA32) ++#if 1 && (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) + # define UA_GET2(p) (* (const ucl_ushortp) (p)) + # define UA_SET2(p) (* (ucl_ushortp) (p)) + # define UA_GET4(p) (* (const acc_uint32e_t *) (p)) diff --git a/dev-libs/ucl/metadata.xml b/dev-libs/ucl/metadata.xml new file mode 100644 index 000000000000..ff62877c67ae --- /dev/null +++ b/dev-libs/ucl/metadata.xml @@ -0,0 +1,7 @@ + + + + + maintainer-needed@gentoo.org + + diff --git a/dev-libs/ucl/ucl-1.03-r1.ebuild b/dev-libs/ucl/ucl-1.03-r1.ebuild new file mode 100644 index 000000000000..906fda7117a8 --- /dev/null +++ b/dev-libs/ucl/ucl-1.03-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils + +DESCRIPTION="the UCL Compression Library" +HOMEPAGE="http://www.oberhumer.com/opensource/ucl/" +SRC_URI="http://www.oberhumer.com/opensource/ucl/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="static-libs" + +src_prepare() { + epatch "${FILESDIR}"/${P}-CFLAGS.patch + epatch "${FILESDIR}"/${P}-x32.patch #426334 + + # lzo (and ucl) have some weird sort of mfx_* set of autoconf macros + # which may only be distributed with lzo itself? Rescue them and + # place them into acinclude.m4 because there doesn't seem to be an + # m4/... + sed -n -e '/^AC_DEFUN.*mfx_/,/^])#$/p' aclocal.m4 > acinclude.m4 || die "Unable to rescue mfx_* autoconf macros." + + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die + + eautoreconf +} + +src_configure() { + econf \ + --enable-shared \ + $(use_enable static-libs static) +} + +src_install() { + default + prune_libtool_files +} -- cgit v1.2.3-65-gdbad