Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f569a6c0c6e877c1a2cdfab20cd0ec535f55f35f
commit f569a6c0c6e877c1a2cdfab20cd0ec535f55f35f Author: James Buren <[email protected]> Date: Fri Jun 22 05:18:54 2012 -0500 pacman-g2-3.8.9-2-x86_64 * import patch from git diff --git a/source/base/pacman-g2/0001-makepkg.conf.in-march-is-x86-64-not-x86_64.patch b/source/base/pacman-g2/0001-makepkg.conf.in-march-is-x86-64-not-x86_64.patch new file mode 100644 index 0000000..e1c6fa0 --- /dev/null +++ b/source/base/pacman-g2/0001-makepkg.conf.in-march-is-x86-64-not-x86_64.patch @@ -0,0 +1,27 @@ +From 719695510d2174e69815c0a586a83b55b81da9aa Mon Sep 17 00:00:00 2001 +From: James Buren <[email protected]> +Date: Fri, 22 Jun 2012 05:14:50 -0500 +Subject: [PATCH] makepkg.conf.in: march is x86-64 not x86_64 + +--- + etc/makepkg.conf.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in +index 109ede7..4ea8e79 100644 +--- a/etc/makepkg.conf.in ++++ b/etc/makepkg.conf.in +@@ -20,8 +20,8 @@ case $(uname -m) in + x86_64) + CARCH="x86_64" + CHOST="x86_64-frugalware-linux" +- CFLAGS="-march=x86_64 -mtune=generic -O2 -pipe" +- CXXFLAGS="-march=x86_64 -mtune=generic -O2 -pipe" ++ CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe" ++ CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe" + ;; + arm*) + CARCH="arm" +-- +1.7.11 + diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index d801bd2..d9676b3 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -9,7 +9,7 @@ USE_MINIMAL=${USE_MINIMAL:-"n"} pkgname=pacman-g2 pkgver=3.8.9 Fuse $USE_DEVEL && pkgver=3.8.1.18.gc254053 -pkgrel=1 +pkgrel=2 pkgdesc="A .tar.xz based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/"; backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) @@ -34,8 +34,8 @@ archs=('i686' 'x86_64' 'arm') _F_archive_nosort=y up2date="Flasttar $url/releases/" if ! Fuse $USE_DEVEL; then - source=($url/releases/$pkgname-$pkgver.tar.gz 0001-Revert-libftp-set-SO_-TIMEO-on-sockets-to-avoid-bloc.patch) - signatures=("$source.asc" '') + source=($url/releases/$pkgname-$pkgver.tar.gz 0001-Revert-libftp-set-SO_-TIMEO-on-sockets-to-avoid-bloc.patch 0001-makepkg.conf.in-march-is-x86-64-not-x86_64.patch) + signatures=("$source.asc" '' '') else _F_scm_type="git" _F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
