moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

makepkg: Add CPPFLAGS support 

Add CPPFLAGS support in addition to the current CFLAGS and CXXFLAGS.
This keeps compiler flags split up in the same logical way done
everywhere else.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Allan McRae 2011-12-22 20:19:18 +10:00 committed by Dan McGee
parent c4ea4e017f
commit 8abef73ba9
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/PKGBUILD.5.txt
View File

@ -254,10 +254,10 @@ A normal sync or upgrade will not use its value.
with distcc.
*buildflags*;;
Allow the use of user-specific buildflags (CFLAGS, CXXFLAGS, LDFLAGS)
during build as specified in linkman:makepkg.conf[5]. More useful in
its negative form `!buildflags` with select packages that have problems
building with custom buildflags.
Allow the use of user-specific buildflags (CPPFLAGS, CFLAGS, CXXFLAGS,
LDFLAGS) during build as specified in linkman:makepkg.conf[5]. More
useful in its negative form `!buildflags` with select packages that
have problems building with custom buildflags.
*makeflags*;;
Allow the use of user-specific makeflags during build as specified

3
doc/makepkg.conf.5.txt
View File

@ -51,6 +51,9 @@ Options
A string such as ``i686-pc-linux-gnu'', do not touch unless you know what
you are doing. This can be commented out by most users if desired.
**CPPFLAGS=**"cppflags"::
Flags used for the C preprocessor; see CFLAGS for more info.
**CFLAGS=**"cflags"::
Flags used for the C compiler. This is a key part to the use of makepkg.
Usually several options are specified, and the most common string resembles

1
etc/makepkg.conf.in
View File

@ -27,6 +27,7 @@ CARCH="@CARCH@"
CHOST="@CHOST@"
#-- Compiler and Linker Flags
#CPPFLAGS=""
#CFLAGS="-O2 -pipe"
#CXXFLAGS="-O2 -pipe"
#LDFLAGS=""

4
scripts/makepkg.sh.in
View File

@ -955,7 +955,7 @@ run_function() {
# clear user-specified buildflags if requested
if check_option "buildflags" "n"; then
unset CFLAGS CXXFLAGS LDFLAGS
unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
fi
# clear user-specified makeflags if requested
@ -967,7 +967,7 @@ run_function() {
cd_safe "$srcdir"
# ensure all necessary build variables are exported
export CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST
export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST
# save our shell options so pkgfunc() can't override what we need
local shellopts=$(shopt -p)