Changeset - ddc273350932
Parent rev.
Child rev.
[Not reviewed]
default
1 3 1
Nathan Brink (binki) - 14 years ago 2011-03-25 01:31:11
ohnobinki@ohnopublishing.net
dev-libs/lzo: Add patch which fixes compilation of assembly source files for multilib-portage.

(Portage version: 2.2.0_alpha27-r1/hg/Linux x86_64, signed Manifest commit with key 6BA81050)
5 files changed with 87 insertions and 41 deletions:
dev-libs/lzo/ChangeLog
6
dev-libs/lzo/Manifest
16
16
dev-libs/lzo/files/lzo-2.02-exec-stack.patch
25
dev-libs/lzo/files/lzo-2.04-asm-makefile.patch
48
dev-libs/lzo/lzo-2.04.ebuild
17
0 comments (0 inline, 0 general)
dev-libs/lzo/ChangeLog
➞
Show inline comments
 
@@ -2,6 +2,12 @@
 
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 
# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/ChangeLog,v 1.56 2011/03/22 20:41:40 ranger Exp $
 

			




	
	
	
		
 
  25 Mar 2011; Nathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>

			




	
	
	
		
 
  -files/lzo-2.02-exec-stack.patch, lzo-2.04.ebuild,

			




	
	
	
		
 
  +files/lzo-2.04-asm-makefile.patch:

			




	
	
	
		
 
  Add patch which fixes compilation of assembly source files for

			




	
	
	
		
 
  multilib-portage.

			




	
	
	
		
 

			




	
	
	
		
 
  24 Mar 2011; Nathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>

			




	
	
	
		
 
  -lzo-2.02-r1.ebuild, -lzo-2.03.ebuild, lzo-2.04.ebuild:

			




	
	
	
		
 
  Fix keywords to reflect that my ebuild is unstable and drop old ebuilds.

			




        

    


    
    

    

        

                

                    dev-libs/lzo/Manifest
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
-----BEGIN PGP SIGNED MESSAGE-----

			




	
	
	
		
 
Hash: SHA256

			




	
	
	
		
 

			




	
	
	
		
 
AUX lzo-2.02-exec-stack.patch 734 RMD160 7829cff33854c8a64a234fed877c48b8bb623484 SHA1 9415301733b46b174faffd4814b4f18972dfd7f1 SHA256 1343ae6699542019b33bfb4a7eba3f8721bd09f6cfe3111b14a75c9b54d8ccbb

			




	
	
	
		
 
AUX lzo-2.04-asm-makefile.patch 1318 RMD160 d3055edd5b1f091db0aba3fbb8e20c72f1df09a7 SHA1 938a11339ad275557601ec4cb1d76ef9d58681c2 SHA256 47269caf22e8ba6d15f193440a28a9d37157e6a241d702690f166cf046d98bdf

			




	
	
	
		
 
DIST lzo-2.04.tar.gz 604424 RMD160 8fcfcd45144d63db397ef1e8b1bd5140e456fdaf SHA1 f5bf5c7ae4116e60513e5788d156ef78946677e7 SHA256 4ee3a040facf39561f13e4ef2ab99a886fd68251a35d612486ed0625cc6ab428

			




	
	
	
		
 
EBUILD lzo-2.04.ebuild 924 RMD160 5c5929832ab21296c202e10d93c92c4dee458e6e SHA1 89df7089c12a1908c9abdc90eb8415a0d90296c2 SHA256 47758b42450a71a9d4c0e5080a51cb42a00a536735e591fe6aa739f7cc10488e

			




	
	
	
		
 
MISC ChangeLog 6336 RMD160 11ffe23e369efd5a4f2e116fd7c52ad1f03c0d70 SHA1 a22bf1be4974a688f572213b8736f6de483f0d98 SHA256 02b49ef1285067bbd9f88b740998f328d15b52566cca893ed25188ad51827be9

			




	
	
	
		
 
EBUILD lzo-2.04.ebuild 1410 RMD160 91738c4636637d11173520b27951b6c6e56cfb8e SHA1 14e18526ae265f323b4632c4c75a83cc1d899f77 SHA256 12330bc471e82085ce30da788f1c08a7864964fc651692f90badab87b115ed9f

			




	
	
	
		
 
MISC ChangeLog 6588 RMD160 9992738c6487c398b8ae5649935e3029a4465c1e SHA1 142133ca18878c5729caf0e3ede87cf9faaa891c SHA256 ef901a4926de86d5f4cf4b15ce68933233ee48f64dbf30bb8bc74b2096615172

			




	
	
	
		
 
MISC metadata.xml 295 RMD160 c3fe4bdd973f1354cc7956e35f6947e5e33da29e SHA1 072a94e2ee7e3e2473a2a7fea5f0e539a26d185f SHA256 22070f0c10318b4441106d6fb0e6236ba8f9d7ee87b2d95cade264150e66d9e5

			




	
	
	
		
 
-----BEGIN PGP SIGNATURE-----

			




	
	
	
		
 
Version: GnuPG v2.0.14 (GNU/Linux)

			




	
	
	
		
 

			




	
	
	
		
 
iQIcBAEBCAAGBQJNisVvAAoJEHQ6UuhrqBBQ7UUP/ivNTJfa15vWAsp3rxfqpZJo

			




	
	
	
		
 
IMd2FM5UZYmdGYp5wCivH4eqHWXGwxxOCGQmgIt4Bs7fH7d9KXrfxEhxpXUuIlhQ

			




	
	
	
		
 
zfkvRSxzuL/bsWmHDMUhi/FvueToZkp5WtOCq/e4/q5j0PLcDoBhY1xd7S2AnEzB

			




	
	
	
		
 
eey5xi3CPLo5umvKMoBiQigeBnvsgL2MW7FypZIA9WGS5Uoy2qPu+En3c5YGj/VF

			




	
	
	
		
 
43HGjU86CAODsrVl8ymGbSsHk/ieLA7hotN5xa5vqRAeVEnmIifR7NEex7WkzvqZ

			




	
	
	
		
 
HX7VLQsPzracF0ZStboUp5TtKYNiBI+lwfi9d+mzY3JhYgQrafHi9SoOqKtuwBTK

			




	
	
	
		
 
xiWEoEhvSfeuxP3Vi+6u5+K5/PWMl2FLyOZE5seHrCzPIYutZWs0VhvdTUqb9nrx

			




	
	
	
		
 
O5sT9NVpMeSypdEa6e7BuG21Fz7oPKCuDOgR0n0CaUoEpO4bkEts1XgHwAiio4Ia

			




	
	
	
		
 
jHv9eFfto/yzi2guF8QYZoYwHDJ0VaF18SxIj9g9BLaMVDv9cf4I22ss+x3Kc2Vg

			




	
	
	
		
 
FGgopFjaNuUFZGgkG7pG+/Ibi5Xt7/f3hgvtkfOoL2U3Q+KWQqiNM0/+8QDl1un9

			




	
	
	
		
 
Q9NTygcVa7pVotvYQ2uksMBsBX6oVL8weD7qnx+e1FNsyxzFdIWd72okyo63SP5r

			




	
	
	
		
 
HgrmbFyp9aZUbiAgMW9R

			




	
	
	
		
 
=5B86

			




	
	
	
		
 
iQIcBAEBCAAGBQJNjCieAAoJEHQ6UuhrqBBQpBgP/1FppJRT8RdjbCSLou7uvP9K

			




	
	
	
		
 
gsc6l7jvm5jgyknTC+yNFCvFfwPN9srC+2Uws07BI7GxmpD20XJ/gEmBshcfcvy2

			




	
	
	
		
 
fek6acyLeG4fsKx9AvjT6QtsEWLQQvkJZvAq7xqkJX9oL1XW9UsfqJ7rfQ/mBKUE

			




	
	
	
		
 
S9YT52Y31mCmneHDAKTetpxh6HgNC6LhVd2AgONkx7122CpWZIGUaNVVmts5QtvF

			




	
	
	
		
 
j4gRPQ065QrIhR+9AiKWzoVlDKszhE8vv+bZV0lwHsqU+P7XOxxBs6psmVAwJ6YR

			




	
	
	
		
 
uA8E8x3Hh0dI3UYh0hjH9jJIiJRA1s30yrGLI/jKGWnoVDb/jufUgPOJZC+KFx7h

			




	
	
	
		
 
+38vAL/Y/ltnN12JeQt/slWlHNK3SRqUFz0DauWs/nGQGb9o22SFitMSsw+kJQg0

			




	
	
	
		
 
nTsLnclBbAHTWWmPypT/lNJEMUAkuC3hYiJcntWdOqw76Vmus9iC8j9n+mpWE/qp

			




	
	
	
		
 
0y4dYVWJ94Bk8qWLO1/YdW2IGQ53N7UymuyHzey8kYiPGD5NhkB1sp/ae6jDFMtA

			




	
	
	
		
 
kHM7XRPmu8XJEUdNd2vXeSt5YNEJ8bphUyCMC9q7Nwckir5z3jTgHtFU9rwSCVcj

			




	
	
	
		
 
i5Z6ML2wiKPdEWB9z0Ar3vvA46g0NrMclLrztwY4XUShCzD/VYSSheA/kNEWrrJq

			




	
	
	
		
 
2jIH1JjgfpzBP0k8bMbs

			




	
	
	
		
 
=h62I

			




	
	
	
		
 
-----END PGP SIGNATURE-----

			




        

    


    
    

    

        

                

                    dev-libs/lzo/files/lzo-2.02-exec-stack.patch
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
deleted file

			




        

    


    
    

    

        

                

                    dev-libs/lzo/files/lzo-2.04-asm-makefile.patch
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>

			




	
	
	
		
 

			




	
	
	
		
 
Subject: Fix compilation of lzo on portage-multilib by removing asm compilation rules which ignored ASFLAGS

			




	
	
	
		
 

			




	
	
	
		
 
--- a/configure.ac	x 

			




	
	
	
		
 
+++ b/configure.ac	x

			




	
	
	
		
 
@@ -60,2 +60,3 @@

			




	
	
	
		
 
 AC_PROG_CPP

			




	
	
	
		
 
+AM_PROG_AS

			




	
	
	
		
 
 mfx_PROG_CPPFLAGS

			




	
	
	
		
 

			




	
	
	
		
 
--- a/src/Makefile.am	Sun Oct 31 13:21:28 2010

			




	
	
	
		
 
+++ b/src/Makefile.am	Thu Mar 24 00:07:45 2011

			




	
	
	
		
 
@@ -42,27 +42,14 @@

			




	
	
	
		
 
     lzo1a_de.h lzo1b_cc.h lzo1b_de.h lzo1c_cc.h lzo_conf.h lzo_dict.h \

			




	
	
	
		
 
     lzo_ptr.h stats1a.h stats1b.h stats1c.h miniacc.h

			




	
	
	
		
 
 

			




	
	
	
		
 
-liblzo2_la_LIBADD = $(LZO_ASM_OBJECTS)

			




	
	
	
		
 
-liblzo2_la_DEPENDENCIES = $(liblzo2_la_LIBADD)

			




	
	
	
		
 
-

			




	
	
	
		
 
-

			




	
	
	
		
 
 # /***********************************************************************

			




	
	
	
		
 
 # // assembler support

			




	
	
	
		
 
 # ************************************************************************/

			




	
	
	
		
 
 

			




	
	
	
		
 
 if LZO_USE_ASM

			




	
	
	
		
 
-

			




	
	
	
		
 
-LZO_ASM_OBJECTS = \

			




	
	
	
		
 
-	lzo1c_s1.lo lzo1c_s2.lo \

			




	
	
	
		
 
-	lzo1f_f1.lo lzo1f_f2.lo \

			




	
	
	
		
 
-	lzo1x_f1.lo lzo1x_f2.lo lzo1x_s1.lo lzo1x_s2.lo \

			




	
	
	
		
 
-	lzo1y_f1.lo lzo1y_f2.lo lzo1y_s1.lo lzo1y_s2.lo

			




	
	
	
		
 
-

			




	
	
	
		
 
-.S.o:

			




	
	
	
		
 
-	$(AM_V_CC)$(CC) -c $<

			




	
	
	
		
 
-

			




	
	
	
		
 
-.S.lo:

			




	
	
	
		
 
-	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) -c $<

			




	
	
	
		
 
-

			




	
	
	
		
 
+liblzo2_la_SOURCES += \

			




	
	
	
		
 
+	lzo1c_s1.S lzo1c_s2.S \

			




	
	
	
		
 
+	lzo1f_f1.S lzo1f_f2.S \

			




	
	
	
		
 
+	lzo1x_f1.S lzo1x_f2.S lzo1x_s1.S lzo1x_s2.S \

			




	
	
	
		
 
+	lzo1y_f1.S lzo1y_f2.S lzo1y_s1.S lzo1y_s2.S

			




	
	
	
		
 
 endif

			




	
	
	
		
 
-

			




	
	
	
		
 

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    dev-libs/lzo/lzo-2.04.ebuild
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -4,6 +4,10 @@

			




	
	
	
		
 

			




	
	
	
		
 
EAPI=2

			




	
	
	
		
 

			




	
	
	
		
 
WANT_AUTOCONF=2.5

			




	
	
	
		
 

			




	
	
	
		
 
inherit autotools eutils

			




	
	
	
		
 

			




	
	
	
		
 
DESCRIPTION="An extremely fast compression and decompression library"

			




	
	
	
		
 
HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"

			




	
	
	
		
 
SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"

			




	
	
		
 
@@ -13,6 +17,19 @@ SLOT="2"

			




	
	
	
		
 
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"

			




	
	
	
		
 
IUSE="examples static-libs"

			




	
	
	
		
 

			




	
	
	
		
 
RDEPEND=""

			




	
	
	
		
 
DEPEND=">=sys-devel/autoconf-2.67"

			




	
	
	
		
 

			




	
	
	
		
 
src_prepare() {

			




	
	
	
		
 
	epatch "${FILESDIR}"/${P}-asm-makefile.patch

			




	
	
	
		
 

			




	
	
	
		
 
	# lzo has 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 \

			




	
	
	
		
 
		--disable-dependency-tracking \

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-26437
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support