Commit 96a11523 authored by Pierre Schmitz's avatar Pierre Schmitz
Browse files

Update default makepkg.conf and pacman.conf to match the ones from pacman 3.5

parent bdde6e5a

makepkg-i686.conf

+4 −5
Original line number Diff line number Diff line
@@ -39,15 +39,16 @@ LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed" 
# BUILD ENVIRONMENT

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

#

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

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

#  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

#

BUILDENV=(fakeroot !distcc color !ccache)

BUILDENV=(fakeroot !distcc color !ccache check)

#

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

#-- specify a space-delimited list of hosts running in the DistCC cluster.
@@ -61,7 +62,7 @@ BUILDENV=(fakeroot !distcc color !ccache) 
# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)

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

#

#-- strip:     Strip symbols from binaries/libraries in STRIP_DIRS

#-- strip:     Strip symbols from binaries/libraries

#-- docs:      Save doc directories specified by DOC_DIRS

#-- libtool:   Leave libtool (.la) files in packages

#-- emptydirs: Leave empty directories in packages
@@ -82,8 +83,6 @@ STRIP_STATIC="--strip-debug" 
MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})

#-- Doc directories to remove (if !docs is specified)

DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})

#-- Directories to be searched for the strip option (if strip is specified)

STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})

#-- Files to be removed from all packages (if purge is specified)

PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)

makepkg-x86_64.conf

+4 −5
Original line number Diff line number Diff line
@@ -39,15 +39,16 @@ LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed" 
# BUILD ENVIRONMENT

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

#

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

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

#  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

#

BUILDENV=(fakeroot !distcc color !ccache)

BUILDENV=(fakeroot !distcc color !ccache check)

#

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

#-- specify a space-delimited list of hosts running in the DistCC cluster.
@@ -61,7 +62,7 @@ BUILDENV=(fakeroot !distcc color !ccache) 
# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)

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

#

#-- strip:     Strip symbols from binaries/libraries in STRIP_DIRS

#-- strip:     Strip symbols from binaries/libraries

#-- docs:      Save doc directories specified by DOC_DIRS

#-- libtool:   Leave libtool (.la) files in packages

#-- emptydirs: Leave empty directories in packages
@@ -82,8 +83,6 @@ STRIP_STATIC="--strip-debug" 
MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})

#-- Doc directories to remove (if !docs is specified)

DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})

#-- Directories to be searched for the strip option (if strip is specified)

STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})

#-- Files to be removed from all packages (if purge is specified)

PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)

pacman-extra.conf

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ HoldPkg = pacman glibc 
# If upgrades are available for these packages they will be asked for first

SyncFirst   = pacman

#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u

#XferCommand = /usr/bin/curl -C - %u > %o

#XferCommand = /usr/bin/curl -C - -f %u > %o

#CleanMethod = KeepInstalled

Architecture = auto
@@ -33,6 +33,7 @@ Architecture = auto 
#ShowSize

#UseDelta

#TotalDownload

#CheckSpace



#

# REPOSITORIES

pacman-multilib-testing.conf

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ HoldPkg = pacman glibc 
# If upgrades are available for these packages they will be asked for first

SyncFirst   = pacman

#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u

#XferCommand = /usr/bin/curl -C - %u > %o

#XferCommand = /usr/bin/curl -C - -f %u > %o

#CleanMethod = KeepInstalled

Architecture = auto
@@ -33,6 +33,7 @@ Architecture = auto 
#ShowSize

#UseDelta

#TotalDownload

#CheckSpace



#

# REPOSITORIES

pacman-multilib.conf

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ HoldPkg = pacman glibc 
# If upgrades are available for these packages they will be asked for first

SyncFirst   = pacman

#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u

#XferCommand = /usr/bin/curl -C - %u > %o

#XferCommand = /usr/bin/curl -C - -f %u > %o

#CleanMethod = KeepInstalled

Architecture = auto
@@ -33,6 +33,7 @@ Architecture = auto 
#ShowSize

#UseDelta

#TotalDownload

#CheckSpace



#

# REPOSITORIES