pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_comp Update to 1.19 (ok'ed by agc@, as we...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/addecf6e7bba
branches:  trunk
changeset: 476414:addecf6e7bba
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Thu Jun 10 09:16:48 2004 +0000

description:
Update to 1.19 (ok'ed by agc@, as we are in a freeze):

- Ensure that the first attempt to build pkgtools/digest inside the
  chroot works by explicitly setting PKGSRC_COMPILER to gcc (pkg_comp
  assumes NetBSD in lots of places, so this assumption is acceptable).

  It was failing because it set PKGSRC_COMPILER to the empty string in
  the environment, which breaks the build.

diffstat:

 pkgtools/pkg_comp/Makefile          |  4 ++--
 pkgtools/pkg_comp/files/pkg_comp.sh |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r bc563b48dcb2 -r addecf6e7bba pkgtools/pkg_comp/Makefile
--- a/pkgtools/pkg_comp/Makefile        Thu Jun 10 07:11:40 2004 +0000
+++ b/pkgtools/pkg_comp/Makefile        Thu Jun 10 09:16:48 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2004/04/02 18:03:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/06/10 09:16:48 jmmv Exp $
 
-DISTNAME=      pkg_comp-1.18
+DISTNAME=      pkg_comp-1.19
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r bc563b48dcb2 -r addecf6e7bba pkgtools/pkg_comp/files/pkg_comp.sh
--- a/pkgtools/pkg_comp/files/pkg_comp.sh       Thu Jun 10 07:11:40 2004 +0000
+++ b/pkgtools/pkg_comp/files/pkg_comp.sh       Thu Jun 10 09:16:48 2004 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pkg_comp.sh,v 1.20 2004/04/02 18:03:01 jmmv Exp $
+# $NetBSD: pkg_comp.sh,v 1.21 2004/06/10 09:16:48 jmmv Exp $
 #
 # pkg_comp - Build packages inside a clean chroot environment
 # Copyright (c) 2002, 2003, 2004 Julio M. Merino Vidal <jmmv%NetBSD.org@localhost>
@@ -594,7 +594,7 @@
 #
 makeroot_digest()
 {
-    ( PKGSRC_COMPILER=; export PKGSRC_COMPILER; pkg_build pkgtools/digest )
+    ( PKGSRC_COMPILER=gcc; export PKGSRC_COMPILER; pkg_build pkgtools/digest )
 }
 
 # makeroot_libkver



Home | Main Index | Thread Index | Old Index