| 1 |
mgorny 13/05/21 14:05:31 |
| 2 |
|
| 3 |
Modified: ChangeLog eutils.eclass |
| 4 |
Log: |
| 5 |
Replace the .la sanity check by one used in libtool itself. Fixes removing qmake-generated .la files, bug #470206. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.834 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.834&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.834&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.833&r2=1.834 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.833 |
| 18 |
retrieving revision 1.834 |
| 19 |
diff -u -r1.833 -r1.834 |
| 20 |
--- ChangeLog 21 May 2013 01:31:02 -0000 1.833 |
| 21 |
+++ ChangeLog 21 May 2013 14:05:31 -0000 1.834 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.833 2013/05/21 01:31:02 floppym Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.834 2013/05/21 14:05:31 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 21 May 2013; Michał Górny <mgorny@g.o> eutils.eclass: |
| 29 |
+ Replace the .la sanity check by one used in libtool itself. Fixes removing |
| 30 |
+ qmake-generated .la files, bug #470206. |
| 31 |
|
| 32 |
21 May 2013; Mike Gilbert <floppym@g.o> distutils-r1.eclass, |
| 33 |
python-r1.eclass, python-single-r1.eclass: |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.420 eclass/eutils.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.420&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.420&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.419&r2=1.420 |
| 42 |
|
| 43 |
Index: eutils.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v |
| 46 |
retrieving revision 1.419 |
| 47 |
retrieving revision 1.420 |
| 48 |
diff -u -r1.419 -r1.420 |
| 49 |
--- eutils.eclass 21 May 2013 02:57:22 -0000 1.419 |
| 50 |
+++ eutils.eclass 21 May 2013 14:05:31 -0000 1.420 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2013 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.419 2013/05/21 02:57:22 vapier Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.420 2013/05/21 14:05:31 mgorny Exp $ |
| 56 |
|
| 57 |
# @ECLASS: eutils.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -1462,6 +1462,13 @@ |
| 60 |
while IFS= read -r -d '' f; do # for all .la files |
| 61 |
local archivefile=${f/%.la/.a} |
| 62 |
|
| 63 |
+ # The following check is done by libtool itself. |
| 64 |
+ # It helps us avoid removing random files which match '*.la', |
| 65 |
+ # see bug #468380. |
| 66 |
+ if ! sed -n -e '/^# Generated by .*libtool/q0;4q1'; then |
| 67 |
+ continue |
| 68 |
+ fi |
| 69 |
+ |
| 70 |
[[ ${f} != ${archivefile} ]] || die 'regex sanity check failed' |
| 71 |
local reason pkgconfig_scanned |
| 72 |
local snotlink=$(sed -n -e 's:^shouldnotlink=::p' "${f}") |
| 73 |
@@ -1480,11 +1487,7 @@ |
| 74 |
reason='module' |
| 75 |
fi |
| 76 |
|
| 77 |
- elif [[ ${snotlink} == no ]]; then |
| 78 |
- |
| 79 |
- # A valid .la file must have a valid 'shouldnotlink='. |
| 80 |
- # That assumption helps us avoid removing random files |
| 81 |
- # which match '*.la', see bug #468380. |
| 82 |
+ else |
| 83 |
|
| 84 |
# Remove .la files when: |
| 85 |
# - user explicitly wants us to remove all .la files, |
Archives