xsettingsd: fix scons script to pass LDFLAGS

This commit is contained in:
Duncaen 2016-05-24 16:22:22 +02:00
parent 1b64c8f2fc
commit 10bf0ba049
2 changed files with 15 additions and 5 deletions

View File

@ -0,0 +1,14 @@
diff --git SConstruct SConstruct
index 4254271..c81e5ae 100644
--- SConstruct
+++ SConstruct
@@ -44,7 +44,8 @@ env = Environment(
env.Append(CPPFLAGS=os.environ.get('CPPFLAGS', ''),
CFLAGS=os.environ.get('CFLAGS', ''),
CXXFLAGS=os.environ.get('CXXFLAGS', ''),
- LDFLAGS=os.environ.get('LDFLAGS', ''))
+ LINKFLAGS=os.environ.get('LDFLAGS', ''))
+env.Replace(CXX=os.environ.get("CXX", ""))
env.Append(CCFLAGS='-Wall -Werror -Wno-narrowing')

View File

@ -1,6 +1,6 @@
# Template file for 'xsettingsd' # Template file for 'xsettingsd'
pkgname=xsettingsd pkgname=xsettingsd
version=0.0.20151712 version=0.0.20160524
revision=1 revision=1
_git_ref=b4999f5e9e99224caf97d09f25ee731774ecd7be _git_ref=b4999f5e9e99224caf97d09f25ee731774ecd7be
wrksrc=$pkgname-$_git_ref wrksrc=$pkgname-$_git_ref
@ -14,10 +14,6 @@ homepage="https://github.com/derat/xsettingsd"
distfiles="https://github.com/derat/xsettingsd/archive/${_git_ref}.tar.gz" distfiles="https://github.com/derat/xsettingsd/archive/${_git_ref}.tar.gz"
checksum=16c14ce201d71f5ca66477cfcc276874e3af8d1bc3bb01cd04059ca9757c4449 checksum=16c14ce201d71f5ca66477cfcc276874e3af8d1bc3bb01cd04059ca9757c4449
pre_configure() {
sed -i '48ienv.Replace(CXX=os.environ.get("CXX", ""))' SConstruct
}
do_install() { do_install() {
vbin xsettingsd vbin xsettingsd
vbin dump_xsettings vbin dump_xsettings