Package: pbuilder
Version: 0.127.1
Severity: wishlist

Here's a simple patch that adds a --preserve-envpath to pbuilder which
prevents the PATH from being clobbered.

diff -urN pbuilder-0.127/debian/changelog pbuilder-0.127.1/debian/changelog
--- pbuilder-0.127/debian/changelog	2005-04-21 15:38:16.000000000 -0700
+++ pbuilder-0.127.1/debian/changelog	2005-04-25 23:24:55.000000000 -0700
@@ -1,3 +1,9 @@
+pbuilder (0.127.1) unstable; urgency=low
+
+  * Patched to support a --preserve-envpath option
+
+ -- Brian Nelson <[EMAIL PROTECTED]>  Mon, 25 Apr 2005 23:24:11 -0700
+
 pbuilder (0.127) unstable; urgency=low
 
   * pdebuild.1, pdebuild-user-mode-linux.1: --debsign-k requires key-id.
diff -urN pbuilder-0.127/pbuilder-buildpackage pbuilder-0.127.1/pbuilder-buildpackage
--- pbuilder-0.127/pbuilder-buildpackage	2005-04-21 15:36:41.000000000 -0700
+++ pbuilder-0.127.1/pbuilder-buildpackage	2005-04-25 23:24:53.000000000 -0700
@@ -87,7 +87,9 @@
 fi
 
 echo " -> Building the package"
-export PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
+if [ "$PRESERVE_ENVPATH" != "yes" ]; then
+    export PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
+fi
 
 executehooks "A"
 
diff -urN pbuilder-0.127/pbuilder-checkparams pbuilder-0.127.1/pbuilder-checkparams
--- pbuilder-0.127/pbuilder-checkparams	2005-04-15 21:14:48.000000000 -0700
+++ pbuilder-0.127.1/pbuilder-checkparams	2005-04-25 23:24:53.000000000 -0700
@@ -169,6 +169,10 @@
 	    PRESERVE_BUILDPLACE="yes"
 	    shift;
 	    ;;
+	--preserve-envpath)
+	    PRESERVE_ENVPATH="yes"
+	    shift;
+	    ;;
 	--bindmounts)
 	    BINDMOUNTS="${BINDMOUNTS} $2"
 	    shift; shift;
I need this in order to make use of ccache inside the pbuilder chroot
for certain build systems (like qmake) which don't honor variables like
CC and CXX.  To work around these broken systems, I add /usr/lib/ccache
to the PATH.

If there's a way to accomplish this without the patch (e.g. through
hooks), let me know.  I wasn't able to figure out any other way...

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.10-ac12
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)

Versions of packages pbuilder depends on:
ii  coreutils                     5.2.1-2    The GNU core utilities
ii  debianutils                   2.13.2     Miscellaneous utilities specific t
ii  debootstrap                   0.2.45-0.2 Bootstrap a basic Debian system
ii  gcc                           4:3.3.5-3  The GNU C compiler
ii  wget                          1.9.1-10   retrieves files from the web

-- no debconf information

Reply via email to