Date: Thursday, August 26, 2010 @ 09:25:57 Author: thomas Revision: 88931
Add a separate configuration file for x86_64 that has multilib included, but commented out. Added: pacman/trunk/pacman.conf.x86_64 (from rev 88927, pacman/trunk/pacman.conf) Modified: pacman/trunk/PKGBUILD --------------------+ PKGBUILD | 16 +++++++-- pacman.conf.x86_64 | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-08-26 13:25:42 UTC (rev 88930) +++ PKGBUILD 2010-08-26 13:25:57 UTC (rev 88931) @@ -17,14 +17,17 @@ options=(!libtool) source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf + pacman.conf.x86_64 makepkg.conf 0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch) md5sums=('50ad71be1faaad84842c576e239d1bb5' - '80f5bb2a606553512d0db857f78d9ac2' + 'eda9cbdb47f85fabda2e7e63801e3e16' + '9ba146b4fa7bcb3cc18204b06d1f6157' 'aef317285c7d16ac495b0e53deeb948d' 'f8c4a3cc7702a7a70d177659441495c5') sha256sums=('cd80e206ee653ce337555c73b7064088e672e9341245317fe09dc52d06bff3c3' - '97fb68536c1179a7de52dfb8a107c6e9bf3a71eaa6a98d6ae74dc224d4ca5838' + 'cc5b197d50739ecd5e757b95d19ba5936782f8b588260e3ec063f2ae383ff6a1' + '816655f858cf5d4950a284ed6ca5fc52ab3abc81f6618d3a8b3644f4f2d03242' '3a60e1f895c90c8e74f5ca389fa05fb3328745e9873c5452b8cd1b2e68bee418' '99f1d108f930b134cfb4c1ca8c86cd282fe9efb69de39cd747218f3d448dda44') @@ -44,7 +47,14 @@ # install Arch specific stuff mkdir -p $pkgdir/etc - install -m644 $srcdir/pacman.conf $pkgdir/etc/ + case "$CARCH" in + i686) + install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf + ;; + x86_64) + install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf + ;; + esac install -m644 $srcdir/makepkg.conf $pkgdir/etc/ # set things correctly in the default conf file case "$CARCH" in Copied: pacman/trunk/pacman.conf.x86_64 (from rev 88927, pacman/trunk/pacman.conf) =================================================================== --- pacman.conf.x86_64 (rev 0) +++ pacman.conf.x86_64 2010-08-26 13:25:57 UTC (rev 88931) @@ -0,0 +1,84 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +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 +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options (all disabled by default) +#UseSyslog +#ShowSize +#UseDelta +#TotalDownload + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repository here. +#[multilib] +#Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#Server = file:///home/custompkgs +