Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fb3e823a3bb46bdb4e20adf1492f6cc276d50be5
commit fb3e823a3bb46bdb4e20adf1492f6cc276d50be5
Author: Michel Hermier <herm...@frugalware.org>
Date: Mon Jul 5 14:09:25 2010 +0200
pacman-g2-3.7.7-4-i686
* Attempt to fix ccache when host don't have it.
* Add debug use flag.
diff --git a/source/base/pacman-g2/0002-fix-ccache.patch
b/source/base/pacman-g2/0002-fix-ccache.patch
new file mode 100644
index 0000000..dcc9074
--- /dev/null
+++ b/source/base/pacman-g2/0002-fix-ccache.patch
@@ -0,0 +1,36 @@
+commit 5a27136c9df7bb9e920c9f0bd91ed2af7b54c778
+Author: Michel Hermier <herm...@frugalware.org>
+Date: Mon Jul 5 13:50:37 2010 +0200
+
+ scripts/makepkg: Disable ccache when /var/cache/ccache is not writable.
+
+ * With the recent cache update, it now don't die silently when the cache
+ is writable. Don't export ccache environment in this case (so that
+ ccache is disabled).
+
+diff --git a/scripts/makepkg b/scripts/makepkg
+index 5988ccf..c177dd4 100755
+--- a/scripts/makepkg
++++ b/scripts/makepkg
+@@ -1537,13 +1537,14 @@ fi
+
+ # use ccache if it's available
+ if [ "$NOCCACHE" = "0" -a -d /usr/lib/ccache/bin ]; then
+- export PATH=/usr/lib/ccache/bin:$PATH
+- FCC="ccache $FCC"
+- install -d -m 2775 /var/cache/ccache/$pkgname
+- export CCACHE_DIR=/var/cache/ccache/$pkgname
+- export CCACHE_NOLINK=1
+- export CCACHE_UMASK=002
+- if [ ! -w /var/cache/ccache/ ]; then
++ if [ -w /var/cache/ccache/ ]; then
++ export PATH=/usr/lib/ccache/bin:$PATH
++ FCC="ccache $FCC"
++ install -d -m 2775 /var/cache/ccache/$pkgname
++ export CCACHE_DIR=/var/cache/ccache/$pkgname
++ export CCACHE_NOLINK=1
++ export CCACHE_UMASK=002
++ else
+ if [ "$INCHROOT" != "1" ]; then
+ error "You installed ccache but you are not in the
ccache group."
+ plain "Either add yourserlf to the ccache group or"
diff --git a/source/base/pacman-g2/FrugalBuild
b/source/base/pacman-g2/FrugalBuild
index bf20f7e..c69dbcb 100644
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@ -1,13 +1,14 @@
# Compiling Time: 0.39 SBU
# Maintainer: Miklos Vajna <vmik...@frugalware.org>
+USE_DEBUG=${USE_DEBUG:-"n"}
USE_DEVEL=${USE_DEVEL:-"n"}
USE_MINIMAL=${USE_MINIMAL:-"n"}
pkgname=pacman-g2
pkgver=3.7.7
Fuse $USE_DEVEL && pkgver=3.7.3.32.gedb838c
-pkgrel=3
+pkgrel=4
pkgdesc="A .tar.bz2 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})
@@ -26,8 +27,10 @@ _F_archive_nosort=y
up2date="Flasttar $url/releases/"
if ! Fuse $USE_DEVEL; then
source=($url/releases/$pkgname-$pkgver.tar.gz \
- http://git.frugalware.org/patches/pacman-g2/ab6bee9.patch
0001-fix-percent-calculation.patch)
- signatures=("$source.asc" '' '')
+ http://git.frugalware.org/patches/pacman-g2/ab6bee9.patch \
+ 0001-fix-percent-calculation.patch \
+ 0002-fix-ccache.patch)
+ signatures=("$source.asc" '' '' '')
else
_F_scm_type="git"
_F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2"
@@ -36,6 +39,12 @@ fi
if [ "$CARCH" == "ppc" ]; then
Fconfopts="$Fconfopts --disable-java"
fi
+if ! Fuse $USE_DEBUG; then
+ Fconfopts="$Fconfopts --disable-debug"
+else
+ Fconfopts="$Fconfopts --enable-debug"
+ options=("${optio...@]}" 'nostrip')
+fi
build()
{
@@ -50,7 +59,7 @@ build()
if Fuse $USE_MINIMAL; then
Fbuild
else
- Fbuild_mono --disable-debug
+ Fbuild_mono
fi
}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
