diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-06-10 09:16:48 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-06-10 09:16:48 +0000 |
| commit | 07f6381c77a6b5ccb7ca8272c133231174bbaf38 (patch) | |
| tree | 2d1e3f07528dcb0909ca705f7f1a32216dee98c6 /pkgtools/pkg_comp | |
| parent | 129855e859cca88c3c5ddbd88cf12e55bc54e31b (diff) | |
| download | pkgsrc-07f6381c77a6b5ccb7ca8272c133231174bbaf38.tar.gz | |
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 (limited to 'pkgtools/pkg_comp')
| -rw-r--r-- | pkgtools/pkg_comp/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkg_comp/files/pkg_comp.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/pkg_comp/Makefile b/pkgtools/pkg_comp/Makefile index c4921b9b1bf..dfcee63d4d9 100644 --- a/pkgtools/pkg_comp/Makefile +++ b/pkgtools/pkg_comp/Makefile @@ -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 --git a/pkgtools/pkg_comp/files/pkg_comp.sh b/pkgtools/pkg_comp/files/pkg_comp.sh index 98d47a89a29..5bacc5d42f0 100644 --- a/pkgtools/pkg_comp/files/pkg_comp.sh +++ b/pkgtools/pkg_comp/files/pkg_comp.sh @@ -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> @@ -594,7 +594,7 @@ EOF # makeroot_digest() { - ( PKGSRC_COMPILER=; export PKGSRC_COMPILER; pkg_build pkgtools/digest ) + ( PKGSRC_COMPILER=gcc; export PKGSRC_COMPILER; pkg_build pkgtools/digest ) } # makeroot_libkver |