Revision: 2553
Author: gavlee
Date: 2013-03-18 20:08:11 +0100 (Mon, 18 Mar 2013)
Log Message:
-----------
media-sound/Voice2MIDI: update 0.3.10-r1 for scons-utils, cleanup
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/Voice2MIDI/ChangeLog
trunk/overlays/proaudio/media-sound/Voice2MIDI/Manifest
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.10-r1.ebuild
trunk/overlays/proaudio/media-sound/Voice2MIDI/files/Voice2MIDI-0.3.10/
trunk/overlays/proaudio/media-sound/Voice2MIDI/files/Voice2MIDI-0.3.10/0001-create-prefix-dir-for-installation.patch
trunk/overlays/proaudio/media-sound/Voice2MIDI/files/Voice2MIDI-0.3.10/0002-honour-toolchain-environment.patch
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.10.ebuild
trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.7.ebuild
trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.8.ebuild
Modified: trunk/overlays/proaudio/media-sound/Voice2MIDI/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/Voice2MIDI/ChangeLog 2013-03-18
18:51:47 UTC (rev 2552)
+++ trunk/overlays/proaudio/media-sound/Voice2MIDI/ChangeLog 2013-03-18
19:08:11 UTC (rev 2553)
@@ -1,7 +1,18 @@
# ChangeLog for media-sound/Voice2MIDI
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*Voice2MIDI-0.3.10-r1 (18 Mar 2013)
+
+ 18 Mar 2013; Gavin Pryke (gavlee) <[email protected]>
+ -Voice2MIDI-0.3.7.ebuild, -Voice2MIDI-0.3.8.ebuild,
+ -Voice2MIDI-0.3.10.ebuild, +Voice2MIDI-0.3.10-r1.ebuild,
+ +files/Voice2MIDI-0.3.10/0001-create-prefix-dir-for-installation.patch,
+ +files/Voice2MIDI-0.3.10/0002-honour-toolchain-environment.patch,
+ metadata.xml:
+ update for 0.3.10-r1: build with escons from scons-utils.eclass. update EAPI.
+ add patches for failure creating install dir. cflags, ldflags etc. cleanup.
+
09 Mar 2013; Dominique Michel <[email protected]>
Moved QT depends to dev-qt/* in all ebuilds; cleanup
Modified: trunk/overlays/proaudio/media-sound/Voice2MIDI/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/Voice2MIDI/Manifest 2013-03-18
18:51:47 UTC (rev 2552)
+++ trunk/overlays/proaudio/media-sound/Voice2MIDI/Manifest 2013-03-18
19:08:11 UTC (rev 2553)
@@ -1,9 +1,7 @@
+AUX Voice2MIDI-0.3.10/0001-create-prefix-dir-for-installation.patch 1000
SHA256 b9d9a0b2a557d6f88de68c9fb8f92e332343cfcab5f66a001df73ac8f3f6294e SHA512
19c5266fc339e20a9e92a45cb2e69880d3a7ec64b8495c2f93205313e5c591601cafaddd7b693e30bb177599a9b9a1fb0cf066a0ed66e4b055b3a128c3aa1de8
WHIRLPOOL
e9d6489d32b3c05a1f281222d1fd0671fc05fd86c7eafeaec6d11cac624b1d8ea450943aecbd57bb5ba350e912efe25fbc99c5a91ff83f43dc40303a23c4fb77
+AUX Voice2MIDI-0.3.10/0002-honour-toolchain-environment.patch 1811 SHA256
2b1676ee5119058700fd735441cc010d1437d24cbbff6bc922298d52813892a5 SHA512
b63ea22db9793ae1cd95d32b6f91d98f085ed6e4707fbe68ac675c28d28707d3359e45103bd9e7f122d9559b5f7c2d4cf0a04acc0fad6dc3786103af71aa4510
WHIRLPOOL
19f96aa19e1e781c7a6c3b00b8fde43cdb9828e3ebe49b5b746acb64ccebeac112db3b9fe32e61a1cb860a0412655581b7de85bd6654018121748abd6b6d05ae
DIST Voice2MIDI-0.3.10.tar.gz 1073726 SHA256
660b7a77dc5e57767a2d0111361db057be18ae069146a950c1ccdffb3ddf6139 SHA512
8b428088647e69f74426975b265c88e73e7774be93b1b2b8a1d0e47d177a426328f86d53d3230b99196516634323b6eb0c2213aad0d15bdc32bd29362cfec67e
WHIRLPOOL
0d326d37251fbb4e71a22e40a19bf1a23f27b0983a7ad3fc5a5acc11715d3176d04ce9b019009cb5490aeeceec93edcf5ff2fa487e66735212faad7bb8bd4ab5
-DIST Voice2MIDI-0.3.7.tar.gz 1084204 SHA256
9be072c2d1208f1f9128ec5d86c60afb4d8c0039e81150e72ef90320c3686898
-DIST Voice2MIDI-0.3.8.tar.gz 1074298 SHA256
81c4dc440b3d7b6236116028ebf496cc5f3e649fc4fe6526c0c585c33aada6cf
-EBUILD Voice2MIDI-0.3.10.ebuild 1569 SHA256
4c4f66ed2f953955ca3f4cf577e2661a5fb868cb59878cd53da6ab13fa99adee SHA512
5cf2e61b290a5940c369b3288a9d8738b8c684a753e929a0524de7649d6e2e38e7b1836030f9a7a2a869c73cfcd756accc99358117f2eac4f49cdf96bf284431
WHIRLPOOL
a8ddaf9ffd0c055ebf9e6da42a31383531da0e6a97ef13a2079234a7467829179d9583bfc4b5f92f6487f00e342c661e81b7bca2db45e235168dc90f2ea66ed2
-EBUILD Voice2MIDI-0.3.7.ebuild 1564 SHA256
53dab791b9e2c92dfaa34b3a0b2ba189f7950b1eb7e8dbb195087f4c8b78e6bd SHA512
614828bd91c1c3f5f9d4026a785d1697fd6f33fb5fbbcbb82e8d978d19bae2c18404716e88b687a3907415b1e370765efe432f7c86938b25920b7216ffb567ad
WHIRLPOOL
6a186e8ef196a0fca36ecc7a482c6387b642d4e24cbca0c06bb431f9f18a66469ae24193acc3282e7036dcb4f8a6a3f80822af80f0a99e0537871a884084866c
-EBUILD Voice2MIDI-0.3.8.ebuild 1624 SHA256
9c8c05a145f6e87aee75c0469ea439d63608b96f4d9d6d51ecf53c1b1be1f30e SHA512
2508f7e2db6a5cea861c276c2e5611fafbfc927b4a266ae86727252dc94b43776c5911e14352b33ec226e9ed6dbd844ad7c43b4a126be7e2d078719daa5f0fb5
WHIRLPOOL
bf309880310ad0d4532cfdc8827f3718009d116ed44b9dda3703b1c35294588e5c87622c427a49b0573ce3b1173222a2060ec33563cedde7ceab410c38c7eb7e
+EBUILD Voice2MIDI-0.3.10-r1.ebuild 1068 SHA256
5e79140581ee7f614ebeb33f6e6ef162095a6212de3659309ef6fdc09d514efa SHA512
199062ae39e4553a52939dbff797f11d3ec20019db423908b454c872cad69e860dc1b0add9018af3cf4cbdf05374e6c68ec6a1116707306dfc486a4de78153df
WHIRLPOOL
6a8898076cc5dee533d27bfb3b2cfb7a43f901414e6541a222834ca7db91a18228869c5a5152f297b465be81242fcfcf240e27682a90abe22f4cde63f2d84049
EBUILD Voice2MIDI-9999.ebuild 1754 SHA256
75010e91e6ba4247433a8ed6da21e154ce11784430e536bb0505c2ea8803d4a8 SHA512
177bb89e4ecc3b2ebd706eb13d6b84fee056131dec945bb063408cf212e73d444ff98b452a5947b4d67b89bd9387db62285f57573d449ccfa398dee67e8f0aee
WHIRLPOOL
d46e7d448990e066bfd21649e7cb0002be8a9ab80e8c2fe908a350887fb0fc03f9269ea4f375f808d9941472aaa3cdd893d72cb0f4ae9a12b303496eb0e6bff2
-MISC ChangeLog 1266 SHA256
c04f3a5146c8add6db2549566e255f3e1393fe46cb59b7835d28c4dd7571f77d SHA512
04b34d0a628b9f029573a173060a81c53b130d094a270cd1ea3ce98f586f48836f4bdc6e84b9c8443289f151e7c19ad6b9edcc1e83cd99592553a03e8c85ae53
WHIRLPOOL
a9a44862aa2f5c31d972c79088bb1ab712a370e54ea115a63c3b0c5e8a13db491b2f0567869bec555ea8dce81848567a98256cc7c4878d82bc95f14c495ea1bb
+MISC ChangeLog 1798 SHA256
00090158cf4776a6bfce8f3e98b29149d3c9b2c64611fadab581d9ac4ee9ab8a SHA512
2ad62878c5dfac5b02c5a4dd6efeed81ec5513ca85e82e92b58f3cb303360b780d6912f20bb8ba35bab2d8625027ca890a3c0a692e1e65fe32aa6d8e2c567d87
WHIRLPOOL
5b4324168c96d6c4917c560269f03403568e2c78cbbd1d643ad50bb6e83394cdddf2d5d1b3365e7a931e98b659bacf1f83497caf06cb5afca13e50c9d1e6bb93
MISC metadata.xml 246 SHA256
f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512
327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4
WHIRLPOOL
e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f
Added:
trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.10-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.10-r1.ebuild
(rev 0)
+++ trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.10-r1.ebuild
2013-03-18 19:08:11 UTC (rev 2553)
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+inherit eutils scons-utils toolchain-funcs python-any-r1
+
+DESCRIPTION="CLAM Voice2MIDI extracts the melody as a MIDI or XML file from
monophonic audio files"
+HOMEPAGE="http://clam-project.org/index.html";
+SRC_URI="http://clam-project.org/download/src/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libclam-1.4.0-r1
+ <media-libs/libclam-9999
+ dev-qt/qtcore
+ dev-qt/qtgui
+ dev-qt/qt3support
+ dev-qt/qtopengl"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig"
+
+RESTRICT="mirror"
+
+pkg_setup() {
+ tc-export CC CXX
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}/*.patch
+}
+
+src_compile() {
+ QTDIR="${EPREFIX}/usr" escons clam_prefix="${EPREFIX}/usr" \
+ prefix="${ED}/usr" verbose=1
+}
+
+src_install() {
+ QTDIR="${EPREFIX}/usr" escons install
+
+ dodoc CHANGES README
+
+ make_desktop_entry ${PN} Voice2MIDI ${PN} "AudioVideo;Audio;Midi;"
+}
Deleted: trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.10.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.10.ebuild
2013-03-18 18:51:47 UTC (rev 2552)
+++ trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.10.ebuild
2013-03-18 19:08:11 UTC (rev 2553)
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils qt4-r2
-
-DESCRIPTION="CLAM Voice2MIDI extracts the melody as a MIDI or XML file from
monophonic audio files"
-HOMEPAGE="http://clam-project.org/index.html";
-
-SRC_URI="http://clam-project.org/download/src/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND=">=media-libs/libclam-1.4.0
- <media-libs/libclam-9999
- dev-qt/qtcore
- dev-qt/qtgui
- dev-qt/qt3support
- dev-qt/qtopengl"
-
-RDEPEND="${DEPEND}"
-
-QTDIR=""
-
-#pkg_setup() {
-# if ! has_version dev-qt/qtopengl && ! built_with_use =dev-qt/qtopengl;
then
-# eerror "You need to build qt4 with opengl support to have it in
${PN}"
-# die "Enabling opengl for $PN requires qt4 to be built with
opengl support"
-# fi
-# if ! has_version dev-qt/qt3support && ! built_with_use
=dev-qt/qt3support; then
-# eerror "You need to build qt4 with qt3support support to have
it in ${PN}"
-# die "Enabling qt3support for $PN requires qt4 to be built with
qt3support support"
-# fi
-#}
-
-src_compile() {
- # required for scons to "see" intermediate install location
- mkdir -p "${D}"/usr
- addpredict /usr/share/clam/sconstools
-
- scons clam_prefix=/usr DESTDIR="${D}/usr" prefix="${D}/usr" release=yes
|| die "Build failed."
-}
-
-src_install() {
- dodir /usr
- addpredict /usr/share/clam/sconstools
-
- scons install || die "scons install failed"
-
- dodoc CHANGES README || die "dodoc failed"
-
- make_desktop_entry ${PN} Voice2MIDI ${PN} \
- "AudioVideo;Audio;Midi;"
-
-}
Deleted: trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.7.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.7.ebuild
2013-03-18 18:51:47 UTC (rev 2552)
+++ trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.7.ebuild
2013-03-18 19:08:11 UTC (rev 2553)
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils qt4-r2
-
-DESCRIPTION="CLAM Voice2MIDI extracts the melody as a MIDI or XML file from
monophonic audio files"
-HOMEPAGE="http://clam-project.org/index.html";
-
-SRC_URI="http://clam-project.org/download/src/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND=">=media-libs/libclam-1.0.0
- <media-libs/libclam-9999
- dev-qt/qtcore
- dev-qt/qtgui
- dev-qt/qt3support
- dev-qt/qtopengl"
-
-RDEPEND="${DEPEND}"
-
-QTDIR=""
-
-#pkg_setup() {
-# if ! has_version dev-qt/qtopengl && ! built_with_use =dev-qt/qtopengl;
then
-# eerror "You need to build qt4 with opengl support to have it in
${PN}"
-# die "Enabling opengl for $PN requires qt4 to be built with
opengl support"
-# fi
-# if ! has_version dev-qt/qt3support && ! built_with_use
=dev-qt/qt3support; then
-# eerror "You need to build qt4 with qt3support support to have
it in ${PN}"
-# die "Enabling qt3support for $PN requires qt4 to be built with
opengl support"
-# fi
-#}
-
-src_compile() {
- # required for scons to "see" intermediate install location
- mkdir -p "${D}"/usr
- addpredict /usr/share/clam/sconstools
-
- scons clam_prefix=/usr DESTDIR="${D}/usr" prefix="${D}/usr" release=yes
|| die "Build failed."
-}
-
-src_install() {
- dodir /usr
- addpredict /usr/share/clam/sconstools
-
- scons install || die "scons install failed"
-
- dodoc CHANGES README || die "dodoc failed"
-
- make_desktop_entry ${PN} Voice2MIDI ${PN} \
- "AudioVideo;Audio;Midi;"
-
-}
Deleted: trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.8.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.8.ebuild
2013-03-18 18:51:47 UTC (rev 2552)
+++ trunk/overlays/proaudio/media-sound/Voice2MIDI/Voice2MIDI-0.3.8.ebuild
2013-03-18 19:08:11 UTC (rev 2553)
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils python qt4-r2
-
-DESCRIPTION="CLAM Voice2MIDI extracts the melody as a MIDI or XML file from
monophonic audio files"
-HOMEPAGE="http://clam-project.org/index.html";
-
-SRC_URI="http://clam-project.org/download/src/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-RESTRICT="mirror"
-
-PYTHON_DEPEND="2:7"
-
-DEPEND=">=media-libs/libclam-1.2.0
- <media-libs/libclam-9999
- dev-qt/qtcore
- dev-qt/qtgui
- dev-qt/qt3support
- dev-qt/qtopengl"
-
-RDEPEND="${DEPEND}"
-
-QTDIR=""
-
-pkg_setup() {
-# if ! has_version dev-qt/qtopengl && ! built_with_use =dev-qt/qtopengl;
then
-# eerror "You need to build qt4 with opengl support to have it in
${PN}"
-# die "Enabling opengl for $PN requires qt4 to be built with
opengl support"
-# fi
-# if ! has_version dev-qt/qt3support && ! built_with_use
=dev-qt/qt3support; then
-# eerror "You need to build qt4 with qt3support support to have
it in ${PN}"
-# die "Enabling qt3support for $PN requires qt4 to be built with
qt3support support"
-# fi
-
- python_set_active_version 2
-}
-
-src_compile() {
- # required for scons to "see" intermediate install location
- mkdir -p "${D}"/usr
- addpredict /usr/share/clam/sconstools
-
- scons clam_prefix=/usr DESTDIR="${D}/usr" prefix="${D}/usr" release=yes
|| die "Build failed."
-}
-
-src_install() {
- dodir /usr
- addpredict /usr/share/clam/sconstools
-
- scons install || die "scons install failed"
-
- dodoc CHANGES README || die "dodoc failed"
-
- make_desktop_entry ${PN} Voice2MIDI ${PN} \
- "AudioVideo;Audio;Midi;"
-
-}
Added:
trunk/overlays/proaudio/media-sound/Voice2MIDI/files/Voice2MIDI-0.3.10/0001-create-prefix-dir-for-installation.patch
===================================================================
---
trunk/overlays/proaudio/media-sound/Voice2MIDI/files/Voice2MIDI-0.3.10/0001-create-prefix-dir-for-installation.patch
(rev 0)
+++
trunk/overlays/proaudio/media-sound/Voice2MIDI/files/Voice2MIDI-0.3.10/0001-create-prefix-dir-for-installation.patch
2013-03-18 19:08:11 UTC (rev 2553)
@@ -0,0 +1,25 @@
+From ee9377f283b00e7cfcf2755389202b56bf2bab75 Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <[email protected]>
+Date: Mon, 18 Mar 2013 17:50:31 +0000
+Subject: [PATCH 1/2] create prefix dir for installation
+
+---
+ SConstruct | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index 53dca65..75f499f 100755
+--- a/SConstruct
++++ b/SConstruct
+@@ -4,7 +4,7 @@ import glob
+ import sys
+
+ options = Variables('options.cache', ARGUMENTS)
+-options.Add(PathVariable('prefix', 'The prefix where the application will be
installed', ''))
++options.Add(PathVariable('prefix', 'The prefix where the application will be
installed', '', PathVariable.PathIsDirCreate))
+ options.Add(PathVariable('clam_prefix', 'The prefix where CLAM was
installed', ''))
+ options.Add(BoolVariable('release', 'Enabling compiler optimizations', 'no') )
+ options.Add(BoolVariable('verbose', 'Display the full command line instead a
short command description', 'no') )
+--
+1.7.12.4
+
Added:
trunk/overlays/proaudio/media-sound/Voice2MIDI/files/Voice2MIDI-0.3.10/0002-honour-toolchain-environment.patch
===================================================================
---
trunk/overlays/proaudio/media-sound/Voice2MIDI/files/Voice2MIDI-0.3.10/0002-honour-toolchain-environment.patch
(rev 0)
+++
trunk/overlays/proaudio/media-sound/Voice2MIDI/files/Voice2MIDI-0.3.10/0002-honour-toolchain-environment.patch
2013-03-18 19:08:11 UTC (rev 2553)
@@ -0,0 +1,55 @@
+From 6d6db1d9c8ea6ae0f3e6a386e17c6c92e824e95d Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <[email protected]>
+Date: Mon, 18 Mar 2013 18:17:31 +0000
+Subject: [PATCH 2/2] honour toolchain environment
+
+---
+ SConstruct | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index 75f499f..a8f1a15 100755
+--- a/SConstruct
++++ b/SConstruct
+@@ -2,6 +2,7 @@
+ import os
+ import glob
+ import sys
++import SCons.Util
+
+ options = Variables('options.cache', ARGUMENTS)
+ options.Add(PathVariable('prefix', 'The prefix where the application will be
installed', '', PathVariable.PathIsDirCreate))
+@@ -55,6 +56,18 @@ print "Package version: ", fullVersion
+ versionInfo.generateVersionSources(os.path.join('src','Voice2MIDIVersion'),
"Voice2MIDI", version, fullVersion)
+
+
++# from http://dev.gentoo.org/~vapier/scons-blows.txt
++if os.environ.has_key('CC'):
++ env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++ env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('CPPFLAGS'):
++ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
++
+
+ env['CXXFILESUFFIX'] = '.cxx'
+ env['QT4_UICDECLSUFFIX'] = '.hxx'
+@@ -162,7 +175,10 @@ if sys.platform=='linux2' :
+ # env.Append( LINKFLAGS=['-rdynamic'] ) # TODO: Is it needed?
+
+ extralinkFlags = []
+-if sys.platform == 'darwin' :
++if sys.platform=='linux2':
++ if os.environ.has_key('LDFLAGS'):
++ extralinkFlags = SCons.Util.CLVar(os.environ['LDFLAGS'])
++elif sys.platform == 'darwin':
+ extralinkFlags=['-dynamic','-bind_at_load']
+
+ programs = []
+--
+1.7.12.4
+
