From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-libs/ucl/Manifest | 7 ++ 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 | 5 + dev-libs/ucl/ucl-1.03-r1.ebuild | 45 ++++++++ 5 files changed, 364 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..1314055f7754 --- /dev/null +++ b/dev-libs/ucl/Manifest @@ -0,0 +1,7 @@ +AUX ucl-1.03-CFLAGS.patch 4187 SHA256 1d5eb9909db458548ab2671b65c14b3f162ec2e3e3d4a4aa451f80dc407b84ba SHA512 4d9b608b2b19cecc6693beb73c5f775b6f1ffbe1e1138dfe77a1318891705a10319e4e728f193f68555bff55a3a24871ec58c2823c487442559987dcb392a890 WHIRLPOOL 19469d4daa147f639ac6ba60dead7720b1a1102c9fe3412fafdd12a7c19e4405303d98e634f4328c3e8321ad92d54a83fa660150411b21f5aed29e4cee00be7a +AUX ucl-1.03-x32.patch 6437 SHA256 384e4d6f5c3c59515bd9cac879c784ed49e753122c5b110c581947b53940e710 SHA512 e6a481c12255c7756d424eded3de923a971c8ebb440776556d467ab950ed0944f3468b1f875f1ae835edfe47b44a6f738d5cb16bd8c49c085f6239685528a6ef WHIRLPOOL c848a114fadd9a8b19f19e5ec25198ba8a3825991e0b4516768dcd1a512387515adc879f55822dedfda40c5f7e277e4017ae21d505636cff96c2298c53a6dc8c +DIST ucl-1.03.tar.gz 534881 SHA256 b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348 SHA512 7dd1824d01b4bb41ee03bbceddc634a9f7f910d235e5cca163d783680d6743f0f3cc309bbbcc1e094d897d549d3805a555f9093b4d77805443d896dd1862aa34 WHIRLPOOL 64b9124cf863248e74c97c45631a0fca7337fa6a99bd08dfbd5e7ca65d8fd509ba6a331059f87472d7dbcd56f9f354359d0c2da412224f9f4fda8ff3c8b6d2a6 +EBUILD ucl-1.03-r1.ebuild 1147 SHA256 def561aacf075f6cecfa3843313125f19bfc42c9b156c8cf7f1c5997d29d03a7 SHA512 2f374cf021f973d745894e401837665e5d50c5e05fe750c7a101c3653d400567db8c3f547a0ec099601fd15f0cfc1a8568cca65663b4e59a6d1593e4d23efaa1 WHIRLPOOL a82cf25e766821de927e1983bc587c6e2b21d6d3e60cb3eeaaf3d348f25975e087e3d452fafb3e187187f547aab25d1b8df2cdce8366ed35a7af54a0ad5e4870 +MISC ChangeLog 3116 SHA256 6d8ad37b2fea9fa4fdc6b6b3afcf1d7defca2b71813c24d4e52e2334ec7dc47a SHA512 aab42a40db079ab60de4ca38759ef8b450a70026bf232786dae2fbe372fc0fe7e3fde4246e95940b9d56c268f2fbe6929b90a4ba9dc0c3b4cbfc64df8e6f2c93 WHIRLPOOL 93868f282a7e4720b28e8216831d3777527e4407ecf8ad3ba292f0027138019c37857a4a6f2a0502577f81c54be1f99ccc7572e1aac5e25f3a81b1f5052e807b +MISC ChangeLog-2015 4898 SHA256 317dd78db9dfc9ccae7238122fbcb5a7f5b65869fa30af4d6e954e8e60cf28df SHA512 ecb75d07d9ac102c7971123aa57752ea6c4b6a6fffbb97ee7b99c895a94f84ae852f014a30b0194d00d5007d50ce6efc11c197c547c4640dfd09ab6452d68a4a WHIRLPOOL 946dc5ff01f1cb7b72370221862791524c7c5464717c1f99cfcad880de60ce8361ae9b2ebb7073b4e5288b371547a1daf4eaa3280c45b1d115f89f564d04c8c5 +MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968 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..6f49eba8f496 --- /dev/null +++ b/dev-libs/ucl/metadata.xml @@ -0,0 +1,5 @@ + + + + + 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..38a7acb307b6 --- /dev/null +++ b/dev-libs/ucl/ucl-1.03-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit autotools eutils flag-o-matic + +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" + +DEPEND="!!dev-libs/libucl" + +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() { + # bug #585632 + append-cflags -std=c90 + + econf \ + --enable-shared \ + $(use_enable static-libs static) +} + +src_install() { + default + prune_libtool_files +} -- cgit v1.2.3