summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-02-03 00:07:48 +0300
committerAndrei Karas <akaras@inbox.ru>2017-02-03 00:07:48 +0300
commit8dc0d6e175aeadb00def65f00f049445dabc738d (patch)
treead220782073fce7cf91983af9a57794bf64cf867 /scripts
parent31ce259791affb84bd1bfc81bf64cd69edc80d1e (diff)
downloadspm-8dc0d6e175aeadb00def65f00f049445dabc738d.tar.gz
spm-8dc0d6e175aeadb00def65f00f049445dabc738d.tar.bz2
spm-8dc0d6e175aeadb00def65f00f049445dabc738d.tar.xz
spm-8dc0d6e175aeadb00def65f00f049445dabc738d.zip
Add support for CPPFLAGS in packages.
New function env_cppflags_path New variable ENV_CPPFLAGS_PATH
Diffstat (limited to 'scripts')
-rw-r--r--scripts/include/common.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index 3df470a..d57879b 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -93,6 +93,11 @@ function env_ldflags_path {
check_error $?
}
+function env_cppflags_path {
+ echo "export CPPFLAGS=${bindir}/$1 \$CPPFLAGS" >>"${envfile}"
+ check_error $?
+}
+
function env_pkg_config_path {
echo "export PKG_CONFIG_PATH=${bindir}/$1:\$PKG_CONFIG_PATH" >>"${envfile}"
check_error $?
@@ -261,7 +266,7 @@ function repack_flags {
packedpaths=""
for var in $1
do
- packedpaths="${3}${packedpaths}${bindir}/$var "
+ packedpaths="${packedpaths}${3}${bindir}/$var "
done
unset IFS
echo "export $2=\"${packedpaths}\$$2\"" >>"${envfile}"
@@ -276,6 +281,7 @@ function package_use {
repack_paths "$ENV_MANPATH" "MANPATH"
repack_paths "$ENV_ACLOCAL_PATH" "ACLOCAL_PATH"
repack_flags "$ENV_LDFLAGS_PATH" "LDFLAGS" "-L"
+ repack_flags "$ENV_CPPFLAGS_PATH" "CPPFLAGS" "-I"
}
function common_use_package {