diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2013-03-05 19:06:19 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2013-03-05 19:06:19 +0000 |
| commit | f871ea8919b3e517a1760fb66d64629d8635f4d8 (patch) | |
| tree | 48d9be269413947416ec30feef3948bb58e33cdf /eclass | |
| parent | Version bump. (diff) | |
| download | historical-f871ea8919b3e517a1760fb66d64629d8635f4d8.tar.gz historical-f871ea8919b3e517a1760fb66d64629d8635f4d8.tar.bz2 historical-f871ea8919b3e517a1760fb66d64629d8635f4d8.zip | |
eqmake4: override also QMAKE_LINK_C, used by packages with "CONFIG+=use_c_linker". Fixes bug #460420.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/qt4-r2.eclass | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index df76fcfe47a4..612b670a526b 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.714 2013/03/05 09:09:17 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.715 2013/03/05 19:06:19 pesa Exp $ + + 05 Mar 2013; Davide Pesavento <pesa@gentoo.org> qt4-r2.eclass: + eqmake4: override also QMAKE_LINK_C, used by packages with + "CONFIG+=use_c_linker". Fixes bug #460420. 05 Mar 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass: vdr-plugin-2.eclass, adapted to the new plugin makefile handling; cleanup for diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass index 4b1c54436eb3..88a63c00897d 100644 --- a/eclass/qt4-r2.eclass +++ b/eclass/qt4-r2.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.24 2012/11/08 09:42:51 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.25 2013/03/05 19:06:19 pesa Exp $ # @ECLASS: qt4-r2.eclass # @MAINTAINER: @@ -235,6 +235,7 @@ eqmake4() { QMAKE_CC="$(tc-getCC)" \ QMAKE_CXX="$(tc-getCXX)" \ QMAKE_LINK="$(tc-getCXX)" \ + QMAKE_LINK_C="$(tc-getCC)" \ QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \ QMAKE_RANLIB= \ QMAKE_STRIP= \ |