summaryrefslogtreecommitdiff
path: root/mk/flavor
AgeCommit message (Collapse)AuthorFilesLines
2007-10-01Added CVS Id.rillig1-0/+2
2007-09-27Documented the used environment variables.rillig1-1/+7
2007-09-22revert previous; it has trouble in two many places and 1) a fix isn'tgdt1-5/+4
obvious 2) we're in freeze, so restore to working as quickly as possible.
2007-09-21When replacing, use the oldname as found in work/.replace_oldname togdt1-4/+5
tar up, instead of PKGBASE. This enables modifying that file to have a package that isn't automatically found be the replace target, e.g., "echo libglade2-2.6.2 > work/.replace_oldname" after make replace fails to find a package to tar up when doing make replace in libglade.
2007-09-21Instead of the overly verbose "Required installed package", the type ofrillig1-10/+13
dependency (bootstrap, build, full) is printed. When building a package that pulls in the basic tools as dependencies, it is good to know whether these are build or full dependencies, so the additional information is useful.
2007-09-20Replaced _PKG_SILENT _PKG_DEBUG with the shorter RUN.rillig1-51/+41
2007-09-07Replaced ${_PKG_SILENT}${_PKG_DEBUG} with ${RUN} and made the code simpler.rillig1-24/+14
2007-08-15Use the new pkg_add -m for cross-compiling instead of -f.joerg1-2/+2
2007-08-14Fix a number of bugs in the DESTDIR support:joerg1-1/+7
- check-perms.mk was not DESTDIR aware, prefix files before passing it to the directory extraction - PKG_FILELIST_CMD was calling pkg_info, which is fine for normal installation, but fails of course for DESTDIR. Just drop the @ lines from ${_DEPENDS_PLIST} and use that. - To make he former work, ensure that _flavor-generate-metadata is part of _INSTALL_ALL_TARGETS. It was normally a dependency of _flavor-register, but that is skipped for DESTDIR. - Remove ${_DEPENDS_PLIST} when running install-clean.
2007-08-14Don't remove the whole metadata directory in _flavor-clean-metadata...jlam1-3/+4
instead only remove the files generated by _flavor-generate-metadata. This should preserve the +INSTALL and +DEINSTALL scripts (which are created during the "build" phase") across a "make update" or a "make deinstall".
2007-08-13Factor out _REPLACE_NEWNAME_CMD.gdt1-17/+21
Use $$newname consistently rather than $PKGBASE and $PKGNAME. Rationalize @ with STEP_MSG. Ensure ${RUN} is used once, and all commands are included.
2007-08-13Made the code simpler:rillig1-40/+23
- Replaced ${_PKG_SILENT}${_PKG_DEBUG} with ${RUN}, - Moved the code to load oldname into a macro.
2007-08-11add missing \, reported my Mark Perkinsgdt1-2/+2
2007-08-10store +REQUIRED_BY and +INSTALLED_INFO in work/.replace-FOO rathergdt1-7/+12
than in work/.pkgdb, so as not to lose them in install-clean. Because of this, put them back explicitly. (Fixes 'make replace loses +REQUIRED_BY', and also the unreported 'make replace loses +INSTALLED_INFO'.)
2007-08-10Rename the generate-metadata and clean-metadata targets to _flavor- stylejlam2-14/+14
names to indicate that they are purely private to flavor/pkg.
2007-08-10Remove ${WRKDIR}/.pkgdb during "install-clean" as that directoryjlam1-1/+6
contains files that are generated during the "install" phase. This should fix the problem where PLIST modifications were ignored if the PLIST was modified between a "make deinstall" and a "make reinstall".
2007-08-08Skip blank lines in +REQUIRED_BY files so that we don't error out tryingjlam1-1/+2
to locate the +CONTENTS file for a "blank" package. Why are there blank lines at all in +REQUIRED_BY?
2007-08-08Need to also unset unsafe_depends_strict along with unsafe_depends here.tnn1-2/+2
2007-08-08Change the meaning of unsafe_depends to mean that a dependency hasgdt1-3/+9
been replaced which might have had an ABI change. In practice, a package is considered to maybe have had an ABI change if the version changes. Introduce a new tag unsafe_depends_strict, which is unconditionally set on depending packages whenever make replace is done. This will cut down considerably on the amount of rebuilding required with pkg_rolling-replace, while still guaranteing that packages are rebuilt if there was an ABI change in a dependency.
2007-08-08Improve previous: Per tnn@ suggestion, don't do pkg_admin unset unlessgdt1-6/+17
+INSTALLED_INFO is present, to avoid complaint from pkg_admin (see pkg/36741). Separate tag removal into a separate target, and use STEP_MSG and _PKG_DEBUG properly.
2007-08-07Remove unsafe_depends and rebuild tags from a package just beforegdt1-3/+6
fixing up the required-by file. The invariant on unsafe_depends (on which pkg_rolling-replace depends) is once again maintained, but now cleanly, rather than assuming that all tags are cleared. (proposed on tech-pkg with no objections, and concurrence from tnn@)
2007-08-04Use ${PKGTOOLS_VERSION} when detecting which version of pkg_install isadrianp1-3/+2
installed. Idea from one of joerg@'s patches.
2007-08-03Update _USE_DESTDIR=full handling to use the new -u/-g code andjoerg1-1/+4
require pkg_install-20070802 for using it. It is now considered to work correctly and ready for general consumption.
2007-08-02Preserve any existing +INSTALLED_INFO file from an installed packagejlam1-1/+19
before replacing it, and restore it when the new package is installed. This saves any state information that should be carried over to the new package, e.g. automatic=yes. XXX Still need to do the same when "un-replacing".
2007-08-02Add core of the infrastructure support for cross-compilation.joerg2-4/+16
- USE_CROSS_COMPILATION activates it, CROSS_DESTDIR specifies root of the target filesystem - derive _CROSS_DESTDIR from CROSS_DESTDIR or MAKEOBJDIR - buildlink3.mk prefixes the files to symlink with _CROSS_DESTDIR - compiler/gcc.mk knows about the target prefix (e.g. i386--netbsdelf) - PKG_DBDIR is prefixed with _CROSS_DESTDIR - package-install and bin-install are not called with su - install and strip are redirected to the tool version - links for the target specific ar, as, ld, nm, objdump, ranlib and strip are added - compiler wrapper detect if linking is requested or not - special command sinks for CPP and CC/CXX add the cross-compile magic: - modify include dirs to get the target /usr/include - modify linker dirs and runpath to use target /usr/lib at link time, but keep correct rpath entries Supported-by: Google SoC 2007 Basic tests by he@ on Sparc. Review from jlam@.
2007-07-14Add support for the upcoming pkg_install-20070714 which now includesadrianp1-35/+53
audit-packages.
2007-07-13Don't cd to PREFIX, it might not exist yet. bin-install doesn't dojoerg1-2/+2
that either.
2007-07-02Remove USE_MTREE support. Keep one copy (the NetBSD version) forjoerg1-7/+1
the purpose of print-PLIST in plist/common-dirs.mtree. Discussed with wiz@, no objections on tech-pkg@.
2007-06-15When a recursive make is run, stdin must be preserved. Otherwise su(1)rillig1-3/+5
cannot ask for a password and fails. Patch provided by OBATA Akio in http://mail-index.netbsd.org/pkgsrc-users/2007/04/23/0001.html
2007-06-10Alter the pattern to detect upper limits to actually match some realjoerg1-2/+2
patterns. Otherwise the upper bound would silently get dropped.
2007-06-07Back out previous and always define the shell variable $silentjlam1-2/+3
appropriately again based on the value of _BOOTSTRAP_VERBOSE. This code was lost in revision 1.27. This should again suppress the output during "mirror-distfiles" in the case where the bootstrap dependency is already installed.
2007-06-05The variable $silent may be undefined, not only empty.rillig1-2/+2
(This is needed for changing the "set -e" to "set -eu" in the ${RUN} macro.)
2007-06-04Avoid usage of modern kinds of parameter expansion (##, #, %%, %)heinz1-3/+4
because /bin/sh on Solaris doesn't understand this syntax and bmake uses this ancient shell. bmake should really be built with /bin/ksh or /usr/xpg4/bin/sh as the default shell.
2007-05-29* Move the meat of the bootstrap-depends target entirely within thejlam1-3/+12
lock, which I think is what was originally intended. * Avoid creating ${WRKDIR}/.depends when running the bootstrap-depends target, which is run as part of running the fetch target. We still create the .depends file later when we need it. XXX Note that there are still problems when locking occurs because locks XXX are created in ${WRKDIR}, so running "bootstrap-depends" as a source XXX for "fetch" will still cause the work directory to be created and XXX populated with files. This probably needs to be solved by using a XXX different location for the lockfile, e.g. ${TMPDIR}, for the XXX bootstrap-depends step.
2007-05-28In order to avoid incorrect information about needed shared libraries inheinz1-5/+5
+BUILD_INFO we must ensure that we only test valid lines from PLIST and not lines like "@unexec /bin/rmdir..." where "/bin/rmdir" is not a part of the resulting package. To achieve this, a stripped version of PLIST, called _PLIST_NOKEYWORDS, is introduced.
2007-05-28Remove trailing spaces.martti2-4/+4
2007-05-26Correct recording of provided shared libraries when using DESTDIR.heinz1-2/+2
Raised on tech-pkg 2007-05-16, no objections.
2007-05-25Remove stray done.joerg1-3/+2
2007-05-25Partly backout the commit and move install-dependencies back intojoerg2-92/+54
depends.mk. The quoting of arrays passed down is almost impossible to get right. For example, PKG_BUILD_OPTION.* variables can contain multiple space separated entries but have to be quoted twice. The original commit exposed two separate issues: - too many variables are passed down via MAKEFLAGS, including the above mentioned PKG_BUILD_OPTIONs. - x11/gtk2 used an invalid variable name that can't be assigned correctly via make command line. This is supposed to fix PR 36387.
2007-05-23Restore _REDUCE_DEPENDS_CMD for now as it is still used by show-depends.joerg1-1/+6
Noticed by rillig@
2007-05-22GNU make strongly dislikes it when MAKE is already set to bmake.joerg2-23/+15
So ensure that we don't pollute the environment at all and push down the arguments for install-dependencies via the command line. Thanks to seb@ for the problem report and test.
2007-05-22Remove an unused, just added internal target.joerg1-6/+1
2007-05-22Fix a small logic bug. When running install-dependencies for the firstjoerg2-11/+7
time for bootstrap-dependencies, only really only look at the bootstrap dependencies. Skip them in the second run. Confusion reported by xtraeme@
2007-05-22Make depends-cookie a flavor indendepent target. Before it was used tojoerg7-149/+302
trace the dependency information. This is computed and stored in .depends directly now before anything else is done. The output is locked and the locking is supposed to work before the bootstrap-depends are installed. Add a new hook for flavors after all dependencies are added and before the depends-cookie is created. Use this to compute which package is used to fulfill each dependency and store it in .rdepends. Adjust register-dependencies and some other places to use this information directly instead of recomputing it all the time. The code to list all dependencies and to recursively install missing ones is moved to a separate shell script. This makes it easier to understand what is going on and extend them later. Change the calling of pkg_create to prepend the dependencies directly to the passed-in PLIST and not via -P and -T. This is in preperation of changing the way they are stored in the packages. Discussed with, recieved minor disagreement about install-dependencies, but otherwise OKed by jlam.
2007-05-01Converted a load-time .for loop into a run-time one. This brings backrillig1-6/+3
the variables CONFIGURE_ARGS, _DISTFILES, _PATCHFILES and _PLIST_IGNORE_FILES to the +BUILD_INFO file. Fixes PR 36228.
2007-04-19Drop NO_MTREE by making it the default. Introduce USE_MTREE to get thejoerg1-3/+7
old behaviour back. Discussed on tech-pkg@.
2007-03-19When building the dependency lists, handle bootstrap dependencies likejoerg1-2/+2
normal build dependencies. That way digest can be recorded correctly.
2007-03-17XXX: "make replace" should be one transaction.rillig1-1/+6
2007-03-15Made show-depends a flavor-specific target.rillig2-4/+3
2007-03-15If the "Internal error #1" happens again, it will at least provide arillig1-2/+2
hint where to look for the cause of the message. Without that, it is next to useless.