Commit 393b9757 authored by Evangelos Foutras's avatar Evangelos Foutras
Browse files

Sync makepkg.conf files with pacman 4.2.1-4

parent 3231cf8c

makepkg-i686.conf

+5 −6
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o % 
# /usr/bin/lftpget -c

# /usr/bin/wget



#-- The the package required by makepkg to download VCS sources

#-- The package required by makepkg to download VCS sources

#  Format: 'protocol::package'

VCSCLIENTS=('bzr::bzr'

            'git::git'
@@ -37,8 +37,8 @@ CHOST="i686-pc-linux-gnu" 
# -march (or -mcpu) builds exclusively for an architecture

# -mtune optimizes for an architecture, but builds for whole processor family

CPPFLAGS="-D_FORTIFY_SOURCE=2"

CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"

CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"

CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"

CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"

LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"

#-- Make Flags: change this for DistCC/SMP systems

#MAKEFLAGS="-j2"
@@ -50,17 +50,16 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" 
# BUILD ENVIRONMENT

#########################################################################

#

# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)

# Defaults: BUILDENV=(!distcc color !ccache check !sign)

#  A negated environment option will do the opposite of the comments below.

#

#-- fakeroot: Allow building packages as a non-root user

#-- distcc:   Use the Distributed C/C++/ObjC compiler

#-- color:    Colorize output messages

#-- ccache:   Use ccache to cache compilation

#-- check:    Run the check() function if present in the PKGBUILD

#-- sign:     Generate PGP signature file

#

BUILDENV=(fakeroot !distcc color !ccache check !sign)

BUILDENV=(!distcc color !ccache check !sign)

#

#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,

#-- specify a space-delimited list of hosts running in the DistCC cluster.

makepkg-x86_64.conf

+5 −6
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o % 
# /usr/bin/lftpget -c

# /usr/bin/wget



#-- The the package required by makepkg to download VCS sources

#-- The package required by makepkg to download VCS sources

#  Format: 'protocol::package'

VCSCLIENTS=('bzr::bzr'

            'git::git'
@@ -37,8 +37,8 @@ CHOST="x86_64-unknown-linux-gnu" 
# -march (or -mcpu) builds exclusively for an architecture

# -mtune optimizes for an architecture, but builds for whole processor family

CPPFLAGS="-D_FORTIFY_SOURCE=2"

CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"

CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"

CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"

CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"

LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"

#-- Make Flags: change this for DistCC/SMP systems

#MAKEFLAGS="-j2"
@@ -50,17 +50,16 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" 
# BUILD ENVIRONMENT

#########################################################################

#

# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)

# Defaults: BUILDENV=(!distcc color !ccache check !sign)

#  A negated environment option will do the opposite of the comments below.

#

#-- fakeroot: Allow building packages as a non-root user

#-- distcc:   Use the Distributed C/C++/ObjC compiler

#-- color:    Colorize output messages

#-- ccache:   Use ccache to cache compilation

#-- check:    Run the check() function if present in the PKGBUILD

#-- sign:     Generate PGP signature file

#

BUILDENV=(fakeroot !distcc color !ccache check !sign)

BUILDENV=(!distcc color !ccache check !sign)

#

#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,

#-- specify a space-delimited list of hosts running in the DistCC cluster.