Respect CFLAGS (CCASFLAGS) which compiling assembly files. Fixes building with portage-multilib.

Package-Manager: portage-2.2.0_alpha41-r1/cvs/Linux x86_64

4 files changed, 201 insertions, 2 deletions

diff --git a/dev-libs/ucl/ChangeLog b/dev-libs/ucl/ChangeLog
index 583bd771d191..61efb4fa03bb 100644
--- a/dev-libs/ucl/ChangeLog
+++ b/dev-libs/ucl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/ucl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucl/ChangeLog,v 1.31 2011/01/13 20:54:18 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucl/ChangeLog,v 1.32 2011/06/27 17:18:08 binki Exp $
+
+*ucl-1.03-r1 (27 Jun 2011)
+
+  27 Jun 2011; Nathan Phillip Brink <binki@gentoo.org> +ucl-1.03-r1.ebuild,
+  +files/ucl-1.03-CFLAGS.patch:
+  Respect CFLAGS (CCASFLAGS) which compiling assembly files. Fixes building
+  with portage-multilib.
 
   13 Jan 2011; Brent Baude <ranger@gentoo.org> ucl-1.03.ebuild:
   stable ppc, bug 350761
diff --git a/dev-libs/ucl/Manifest b/dev-libs/ucl/Manifest
index 5433aad31634..2bcccbfbe325 100644
--- a/dev-libs/ucl/Manifest
+++ b/dev-libs/ucl/Manifest
@@ -1,8 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX ucl-1.03-CFLAGS.patch 4187 RMD160 f18748b65c30972881c22649d114cb661a7ff89e SHA1 23dd3197f71a9632153ea8a53e953918f929bf57 SHA256 1d5eb9909db458548ab2671b65c14b3f162ec2e3e3d4a4aa451f80dc407b84ba
 DIST ucl-1.01.tar.gz 341562 RMD160 0b0e47f371435d3f5ef541b4cc763ebff5ce4e52 SHA1 eb5839c3397c3a84a107ef7bf0cb8c89addf6cca SHA256 0524aeff663fb21c8424269248e8e7486cb45bc5c5a7132f5cb23d6f959183cb
 DIST ucl-1.02.tar.gz 513433 RMD160 65cd002de65201c15c9a9f2c183989fb6a41912d SHA1 d9abe2ab87bd7186cf052c4a1160e1dbeadab54f SHA256 de287c4e3dded86c777917d36cf629df38c5677f661e06119c89359d841f8994
 DIST ucl-1.03.tar.gz 534881 RMD160 d1b50127d482481c125eabff9a9c157d491c4a6a SHA1 5847003d136fbbca1334dd5de10554c76c755f7c SHA256 b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348
 EBUILD ucl-1.01-r1.ebuild 755 RMD160 929223596c5d0f79155c95f71da374b81c81ec69 SHA1 63974fa4a31c8132da7fc96f3ee15965688f203c SHA256 7be1795f815fab6de97d89837195b90a53c8385ef4e465168e1a5f568f1675d5
 EBUILD ucl-1.02.ebuild 753 RMD160 5f6bb4da7495ef0d9a9e88b65222c44aa7163b39 SHA1 be8938b07462dedf17ed350c426cc97832f50b11 SHA256 c3cde2e7707b98df03a62f590e5f613804073d2730f38439e32f4fd2a49b65be
+EBUILD ucl-1.03-r1.ebuild 1058 RMD160 8158cbe3e5ee5577301ddf3cc71e3dff82117370 SHA1 7fb204fea53601e0001b6559d80135f7ffb82d0e SHA256 a09ebff40e7c2257282fc5b720fc865aeffc372109db065e41c30c7319c389df
 EBUILD ucl-1.03.ebuild 675 RMD160 02da630b2de4da7bc05ce823a0b18c00daa356dd SHA1 17806eea4d488248b7213d33113bab123b6313c3 SHA256 6fbfcc86976e6ea998f54fb7de0d00f034211cb2c7188b84f586a4b1079e1d50
-MISC ChangeLog 3521 RMD160 7e211f84a28b957550b4e73b9aa3f4cda535c98d SHA1 bc8329b1ea963a302065e3f29e7257778a0c159a SHA256 5b353a9a9fa5cde08db9262212c9d047930415d33de9feb9330857fc96f33bb3
+MISC ChangeLog 3758 RMD160 7a0c671d13ec9e7e44a870d8157761099a2c0c58 SHA1 3b297ebb6a44d637a89d397729013ea0ee33af7d SHA256 6f4039761fc0b3ad6761c94f5f346dd277e1afcbff2b9f7fbdedaaa8f952e8bc
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAEBCAAGBQJOCLuFAAoJEHQ6UuhrqBBQptkP/juZqnAAqLmio+VYS/E99gMq
+iS8PutOvffgXa6Q9C80fS70z1OcVByv8IfTBG4eDoDxd1/HDvxEz9tP3lyOSiJdr
+JGQwyUaChlMLkvIf2ATueQ3oB5V57KtJYmENA5DdQYxFgDNZYg1XtszjJiyUzpXG
+de+i9Uda+qetBZPgBIHyFuvOGWDvW9trDlexI15fe6BRZ63vyCf8LpfqIuQ8QZdp
+Ryhl+uFN5GcZa9z+yogiw/Dk/Kfquzaeb1bD4HTlQu21XleBq/Knpzn61wY7v7IF
+3JivN8WRfV1ifpn6ovfqa/IrL4cqX9824PKIGmCz9j1I+ozaeiQ/zkyjuh9U/QM/
+UdvsJVbJYMjAZv4uk53Bp+pplJgDmTaIGSOQaNWvDtYcizVAeEiLPpvLfREsitg2
+SRc1BLIm5hD/8UJeG0GTblAPTY6HgL+0gJP2P1dCgJkxUbPwdyyHoNV5PVW9+LaJ
+lvpbEcaYgDPOJxBEnu3hwm4MnsQ3h9aw209bec/QNFU9CPMBd93Os7zzJl+cEMpJ
+FTIL5Zd/HSTpU5emRYAYBn3RLe6E03NzywREzhzQxro7a0szK+C5J4YCke4BSJWP
+gbiKy804hoNTna2U5B+dHWQcs2T2iDGCKasonG1OaeWb+zx9A55JyfwuPu2Y4qY0
+CcMJ1/Liu3QdPGEWL2Pw
+=7TBM
+-----END PGP SIGNATURE-----
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 <binki@gentoo.org>
+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 <<EOF
+-#include "$ac_abs_top_srcdir/asm/i386/src_gas/crc_asm.S"
++#include "$srcdir/asm/i386/src_gas/crc_asm.S"
+ EOF
+ enable_asm=no
+ if AC_TRY_EVAL(mfx_compile_S); then
+     if AC_TRY_COMMAND([test -s conftest.$ac_objext]); then
+         enable_asm=yes
+-        UCL_ASM_VPATH=":$ac_abs_top_srcdir/asm/i386/src_gas"
++        UCL_ASM_VPATH=":\$(top_srcdir)/asm/i386/src_gas"
+     fi
+ fi
+ if test "X$enable_asm" = Xno; then
+@@ -160,11 +158,6 @@
+ AC_SUBST(UCL_CFLAGS)
+ AC_SUBST(UCL_EXTRA_CFLAGS)
+ 
+-configure_CPPFLAGS=$CPPFLAGS
+-configure_CFLAGS=$CFLAGS
+-AC_SUBST(configure_CPPFLAGS)
+-AC_SUBST(configure_CFLAGS)
+-
+ AC_CONFIG_FILES([Makefile examples/Makefile include/Makefile include/ucl/Makefile src/Makefile])
+ AC_OUTPUT
+ 
+diff -r c090ed619e90 src/Makefile.am
+--- a/src/Makefile.am	Sun Jun 26 16:00:09 2011 -0400
++++ b/src/Makefile.am	Sun Jun 26 20:52:01 2011 -0400
+@@ -4,11 +4,10 @@
+ #
+ 
+ VPATH = @srcdir@@UCL_ASM_VPATH@
+-SUFFIXES = .S
+ 
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
+-CPPFLAGS = $(UCL_CPPFLAGS) $(configure_CPPFLAGS) $(UCL_EXTRA_CPPFLAGS)
+-CFLAGS = $(UCL_CFLAGS) $(configure_CFLAGS) $(UCL_EXTRA_CFLAGS)
++AM_CPPFLAGS = $(UCL_CPPFLAGS) $(UCL_EXTRA_CPPFLAGS)
++AM_CFLAGS = $(UCL_CFLAGS) $(UCL_EXTRA_CFLAGS)
+ 
+ lib_LTLIBRARIES = libucl.la
+ 
+@@ -16,51 +15,37 @@
+ 
+ libucl_la_SOURCES = \
+ 	alloc.c \
++	getbit.h \
+ 	n2b_99.c n2b_d.c n2b_ds.c n2b_to.c \
+ 	n2d_99.c n2d_d.c n2d_ds.c n2d_to.c \
+ 	n2e_99.c n2e_d.c n2e_ds.c n2e_to.c \
++	ucl_conf.h \
+ 	ucl_crc.c \
+ 	ucl_init.c \
+-	ucl_ptr.c \
++	ucl_ptr.c ucl_ptr.h \
+ 	ucl_str.c \
+ 	ucl_util.c
+ 
+ EXTRA_DIST = \
+-	getbit.h \
+ 	n2_99.ch \
+-	ucl_conf.h \
+ 	ucl_dll.ch \
+ 	ucl_mchw.ch \
+-	ucl_ptr.h \
+ 	ucl_swd.ch
+ 
+-libucl_la_LIBADD = $(UCL_ASM_OBJECTS)
+-libucl_la_DEPENDENCIES = $(libucl_la_LIBADD)
+-
+-
+ # /***********************************************************************
+ # // assembler support
+ # ************************************************************************/
+ 
+ if UCL_USE_ASM
+-
+-UCL_ASM_OBJECTS = \
+-	cpuid.lo crc_asm.lo crcs_asm.lo rdtsc.lo rdtsca.lo \
+-	n2b_d_f1.lo n2b_d_f2.lo n2b_d_f3.lo n2b_d_f4.lo n2b_d_f5.lo n2b_d_f6.lo \
+-	n2b_d_n1.lo n2b_d_n2.lo n2b_d_n3.lo n2b_d_n4.lo n2b_d_n5.lo n2b_d_n6.lo \
+-	n2b_d_s1.lo n2b_d_s2.lo n2b_d_s3.lo n2b_d_s4.lo n2b_d_s5.lo n2b_d_s6.lo \
+-	n2d_d_f1.lo n2d_d_f2.lo n2d_d_f3.lo n2d_d_f4.lo n2d_d_f5.lo n2d_d_f6.lo \
+-	n2d_d_n1.lo n2d_d_n2.lo n2d_d_n3.lo n2d_d_n4.lo n2d_d_n5.lo n2d_d_n6.lo \
+-	n2d_d_s1.lo n2d_d_s2.lo n2d_d_s3.lo n2d_d_s4.lo n2d_d_s5.lo n2d_d_s6.lo \
+-	n2e_d_f1.lo n2e_d_f2.lo n2e_d_f3.lo n2e_d_f4.lo n2e_d_f5.lo n2e_d_f6.lo \
+-	n2e_d_n1.lo n2e_d_n2.lo n2e_d_n3.lo n2e_d_n4.lo n2e_d_n5.lo n2e_d_n6.lo \
+-	n2e_d_s1.lo n2e_d_s2.lo n2e_d_s3.lo n2e_d_s4.lo n2e_d_s5.lo n2e_d_s6.lo
+-
+-.S.o:
+-	$(CC) -c $<
+-
+-.S.lo:
+-	$(LIBTOOL) --mode=compile $(CC) -c $<
+-
++libucl_la_SOURCES += \
++	cpuid.S crc_asm.S crcs_asm.S rdtsc.S rdtsca.S \
++	n2b_d_f1.S n2b_d_f2.S n2b_d_f3.S n2b_d_f4.S n2b_d_f5.S n2b_d_f6.S \
++	n2b_d_n1.S n2b_d_n2.S n2b_d_n3.S n2b_d_n4.S n2b_d_n5.S n2b_d_n6.S \
++	n2b_d_s1.S n2b_d_s2.S n2b_d_s3.S n2b_d_s4.S n2b_d_s5.S n2b_d_s6.S \
++	n2d_d_f1.S n2d_d_f2.S n2d_d_f3.S n2d_d_f4.S n2d_d_f5.S n2d_d_f6.S \
++	n2d_d_n1.S n2d_d_n2.S n2d_d_n3.S n2d_d_n4.S n2d_d_n5.S n2d_d_n6.S \
++	n2d_d_s1.S n2d_d_s2.S n2d_d_s3.S n2d_d_s4.S n2d_d_s5.S n2d_d_s6.S \
++	n2e_d_f1.S n2e_d_f2.S n2e_d_f3.S n2e_d_f4.S n2e_d_f5.S n2e_d_f6.S \
++	n2e_d_n1.S n2e_d_n2.S n2e_d_n3.S n2e_d_n4.S n2e_d_n5.S n2e_d_n6.S \
++	n2e_d_s1.S n2e_d_s2.S n2e_d_s3.S n2e_d_s4.S n2e_d_s5.S n2e_d_s6.S
+ endif
+-
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..545f52ab97c6
--- /dev/null
+++ b/dev-libs/ucl/ucl-1.03-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucl/ucl-1.03-r1.ebuild,v 1.1 2011/06/27 17:18:08 binki Exp $
+
+EAPI=4
+
+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=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-CFLAGS.patch
+
+	# 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."
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-shared
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS NEWS README THANKS TODO
+}