diff options
| author | tron <tron@pkgsrc.org> | 2008-06-17 14:58:14 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2008-06-17 14:58:14 +0000 |
| commit | 59c59a98bcf71e69bd8a8d445c181fde2ae43a96 (patch) | |
| tree | ea00f4d7389d92cadb2a2b0e9ef36a13f8efa617 | |
| parent | 0286007778216f67c4ad45cebb47dc9f0fd6d59e (diff) | |
| download | pkgsrc-59c59a98bcf71e69bd8a8d445c181fde2ae43a96.tar.gz | |
Pullup ticket #2421 - requested by he
Fix old-style bulk builds
Revisions pulled up:
- mk/bulk/build 1.104
- pkgtools/pkg_install/Makefile 1.154
---
Module Name: pkgsrc
Committed By: he
Date: Sun Jun 8 21:04:30 UTC 2008
Modified Files:
pkgsrc/mk/bulk: build
pkgsrc/pkgtools/pkg_install: Makefile
Log Message:
Commit two fixes which at least for me appear to be required when
doing an old-style bulk build on 4.0 or older systems:
- in mk/bulk/build, do "make update" instead of "make install + clean"
when installing a new pkg_install
- in pkgtools/pkg_install/Makefile, don't try to use our own
executables (${WORKDIR}/pkg_add/pkg_add etc.) if they don't exist
Discussed with joerg, and even though he's not entirely happy
with the latter change, he didn't appear to have a better suggestion.
This, and putting /usr/pkg/sbin earlier than /usr/sbin in the $PATH
appears to be required to get an old-style bulk build going.
| -rw-r--r-- | mk/bulk/build | 5 | ||||
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mk/bulk/build b/mk/bulk/build index a85a2db0e9c..d91c1c7dacf 100644 --- a/mk/bulk/build +++ b/mk/bulk/build @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: build,v 1.103 2008/01/04 15:49:07 rillig Exp $ +# $NetBSD: build,v 1.103.2.1 2008/06/17 14:58:14 tron Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -232,8 +232,7 @@ check_tools () { echo "build> Updating pkgtools" ( cd "${pkgsrc_dir}/pkgtools/pkg_install" \ && ${BMAKE} clean \ - && ${BMAKE} install \ - && ${BMAKE} clean + && ${BMAKE} update ) || die "Could not update the package tools." } } diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 15f141d1cae..ffea48dd615 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.149 2008/04/03 14:22:26 jlam Exp $ +# $NetBSD: Makefile,v 1.149.2.1 2008/06/17 14:58:14 tron Exp $ # Notes to package maintainers: # @@ -53,10 +53,12 @@ CHECK_PERMS= no # from an older pkg_install might required features of the new program. # USE_NATIVE_GCC= yes +.if exists(${WRKSRC}/add/pkg_add) PKG_ADD_CMD= ${WRKSRC}/add/pkg_add PKG_CREATE_CMD= ${WRKSRC}/create/pkg_create PKG_DELETE_CMD= ${WRKSRC}/delete/pkg_delete PKG_INFO_CMD= ${WRKSRC}/info/pkg_info +.endif CPPFLAGS+= -D_LARGEFILE_SOURCE -D_LARGE_FILES CPPFLAGS+= -D_FILE_OFFSET_BITS=64 |