The NetBSD Project

CVS log for pkgsrc/mk/db1.builtin.mk

[BACK] Up to [cvs.NetBSD.org] / pkgsrc / mk

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.23 / (download) - annotate - [select for diffs], Sat Nov 23 09:10:14 2013 UTC (5 years, 3 months ago) by obache
Branch: MAIN
CVS Tags: pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-, HEAD
Changes since 1.22: +3 -3 lines
Diff to previous 1.22 (colored)

Use find-headers instead of find-files to detect builtin header files.

Revision 1.22 / (download) - annotate - [select for diffs], Sun Feb 5 12:16:56 2012 UTC (7 years, 1 month ago) by obache
Branch: MAIN
CVS Tags: pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1
Changes since 1.21: +2 -2 lines
Diff to previous 1.21 (colored)

Don't set BUILDLINK_LIBS for db1, db2 and db3, same as db4.

It will add BDB libraries to LIBS, and may introduce unwanted linked against BDB
libraries, whether needed or not.

Revision 1.21 / (download) - annotate - [select for diffs], Fri Nov 16 08:14:20 2007 UTC (11 years, 4 months ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2, pkgsrc-2009Q1-base, pkgsrc-2009Q1, pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, pkgsrc-2008Q1-base, pkgsrc-2008Q1, pkgsrc-2007Q4-base, pkgsrc-2007Q4, cwrapper, cube-native-xorg-base, cube-native-xorg
Changes since 1.20: +2 -2 lines
Diff to previous 1.20 (colored)

Reverted all the recent changes to the BUILTIN_FIND_GREP variable. It
had been correct before, and I trusted the pkglint warning too much. Now
it is correct again, and the pkglint warning is fixed.

Revision 1.20 / (download) - annotate - [select for diffs], Fri Nov 16 05:44:56 2007 UTC (11 years, 4 months ago) by bjs
Branch: MAIN
Changes since 1.19: +2 -2 lines
Diff to previous 1.19 (colored)


Move backslash from last commit to second '$'; the test for a builtin
db1 was failing (on NetBSD-current 4.99.36) using rev. 1.19.

If this causes any issues, please do let me know; I committed
this because I didn't want this to be broken--and it definitely
seems less broken, i.e. it works, now than it was.

Revision 1.19 / (download) - annotate - [select for diffs], Thu Nov 15 12:15:43 2007 UTC (11 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.18: +3 -3 lines
Diff to previous 1.18 (colored)

Fixed some pkglint warnings. At any other position in a shell word, the
$$ would have to be escaped, so why should be leave it out just because
it is at the end of the word?

Revision 1.18 / (download) - annotate - [select for diffs], Wed Oct 17 10:43:37 2007 UTC (11 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.17: +2 -2 lines
Diff to previous 1.17 (colored)

Made the .include lines simpler.

Revision 1.17 / (download) - annotate - [select for diffs], Thu Feb 15 16:08:20 2007 UTC (12 years, 1 month ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2007Q3-base, pkgsrc-2007Q3, pkgsrc-2007Q2-base, pkgsrc-2007Q2, pkgsrc-2007Q1-base, pkgsrc-2007Q1, jlam-pkgviews-base, jlam-pkgviews
Changes since 1.16: +2 -2 lines
Diff to previous 1.16 (colored)

Reverted the last change, since it was wrong. In a single shell word, a
dollar character does not have to be quoted.

Thanks to joerg for pointing me to it.

Revision 1.16 / (download) - annotate - [select for diffs], Thu Feb 15 10:48:25 2007 UTC (12 years, 1 month ago) by rillig
Branch: MAIN
Changes since 1.15: +2 -2 lines
Diff to previous 1.15 (colored)

Fixed shell quoting, noted by pkglint.

Revision 1.5.2.5, Wed Jun 7 15:25:39 2006 UTC (12 years, 9 months ago) by tv
Branch: tv-derecurse
Changes since 1.5.2.4: +1 -1 lines
FILE REMOVED

EOL the tv-derecurse branch; it has become too outdated.  The last live
revision can be fetched at the tv-derecurse-eol tag.

Revision 1.15 / (download) - annotate - [select for diffs], Thu Apr 6 06:23:06 2006 UTC (12 years, 11 months ago) by reed
Branch: MAIN
CVS Tags: pkgsrc-2006Q4-base, pkgsrc-2006Q4, pkgsrc-2006Q3-base, pkgsrc-2006Q3, pkgsrc-2006Q2-base, pkgsrc-2006Q2
Changes since 1.14: +2 -2 lines
Diff to previous 1.14 (colored)

Over 1200 files touched but no revisions bumped :)

RECOMMENDED is removed. It becomes ABI_DEPENDS.

BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.

BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.

BUILDLINK_DEPENDS does not change.

IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".

Added to obsolete.mk checking for IGNORE_RECOMMENDED.

I did not manually go through and fix any aesthetic tab/spacing issues.

I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.

I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.

As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.

As discussed on tech-pkg.

I will commit to revbump, pkglint, pkg_install, createbuildlink separately.

Note that if you use wip, it will fail!  I will commit to pkgsrc-wip
later (within day).

Revision 1.14 / (download) - annotate - [select for diffs], Thu Aug 11 20:25:20 2005 UTC (13 years, 7 months ago) by cube
Branch: MAIN
CVS Tags: pkgsrc-2006Q1-base, pkgsrc-2006Q1, pkgsrc-2005Q4-base, pkgsrc-2005Q4, pkgsrc-2005Q3-base, pkgsrc-2005Q3
Changes since 1.13: +6 -6 lines
Diff to previous 1.13 (colored)

Change the order of libraries looked for, and start with libdb1 instead of
libdb.  A (obviously braindead) system might ship with a correct libdb1 and
a frivolous libdb.  I'm speaking of RedHat, of course.

But anyway, it makes more sense, libdb1 just can't be anything but a db1
library.

OK'd by jlam@.

Revision 1.13 / (download) - annotate - [select for diffs], Thu Jun 30 12:52:12 2005 UTC (13 years, 8 months ago) by adam
Branch: MAIN
Changes since 1.12: +2 -3 lines
Diff to previous 1.12 (colored)

Cosmetics (so pkglint does not complain)

Revision 1.12 / (download) - annotate - [select for diffs], Mon Jun 20 07:20:40 2005 UTC (13 years, 9 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2005Q2-base, pkgsrc-2005Q2
Changes since 1.11: +6 -1 lines
Diff to previous 1.11 (colored)

Until pkgsrc gets a databases/db1 package, we must always prefer the
native db1 package because the alternative doesn't yet exist.

Revision 1.11 / (download) - annotate - [select for diffs], Wed Jun 1 18:03:06 2005 UTC (13 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.10: +61 -60 lines
Diff to previous 1.10 (colored)

Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.
Several changes are involved since they are all interrelated.  These
changes affect about 1000 files.

The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk.  bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files.  Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred.  This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.

The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages.  Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc.  This modification is a nod toward LOCALBASE=/usr.  The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.

The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc.  The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.

The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files.  Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories.  These files are used as input
to imake since imake can't use stdin for that purpose.

The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead.  This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed.  Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries.  Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.

Revision 1.5.2.4 / (download) - annotate - [select for diffs], Fri Dec 31 20:25:30 2004 UTC (14 years, 2 months ago) by tv
Branch: tv-derecurse
CVS Tags: tv-derecurse-eol
Changes since 1.5.2.3: +1 -2 lines
Diff to previous 1.5.2.3 (colored)

sync with HEAD

Revision 1.10 / (download) - annotate - [select for diffs], Thu Dec 23 14:27:04 2004 UTC (14 years, 3 months ago) by jlam
Branch: MAIN
CVS Tags: tv-derecurse-merge, tv-derecurse-base, pkgsrc-2005Q1-base, pkgsrc-2005Q1
Changes since 1.9: +1 -2 lines
Diff to previous 1.9 (colored)

Don't remove library options from the command line quite so aggressively.
Allow the configure process a chance to detect on its own whether the
named library exists or not by allowing those library options to pass
through to the compiler on a test compile.  A package that *needs*
those library options to be removed can add the appropriate rm:
BUILDLINK_TRANSFORM command to its package Makefile.

Revision 1.5.2.3 / (download) - annotate - [select for diffs], Mon Dec 20 20:46:00 2004 UTC (14 years, 3 months ago) by tv
Branch: tv-derecurse
Changes since 1.5.2.2: +2 -1 lines
Diff to previous 1.5.2.2 (colored)

sync with HEAD

Revision 1.9 / (download) - annotate - [select for diffs], Sat Dec 11 00:32:16 2004 UTC (14 years, 3 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2004Q4-base, pkgsrc-2004Q4
Changes since 1.8: +2 -1 lines
Diff to previous 1.8 (colored)

Create directories before putting files in them.  This should fix
PR pkg/28480.

Revision 1.5.2.2 / (download) - annotate - [select for diffs], Fri Dec 3 19:15:00 2004 UTC (14 years, 3 months ago) by tv
Branch: tv-derecurse
Changes since 1.5.2.1: +16 -10 lines
Diff to previous 1.5.2.1 (colored)

sync with HEAD

Revision 1.8 / (download) - annotate - [select for diffs], Thu Dec 2 17:40:49 2004 UTC (14 years, 3 months ago) by jlam
Branch: MAIN
Changes since 1.7: +16 -10 lines
Diff to previous 1.7 (colored)

Don't hardcode /usr/include/db.h and /usr/include/db1/db.h all over the
place.  Also, modify the buildlink-db1-db185-h target to use symlinks
instead of include <db.h> since several bdb implementations might be
buildlinked, and we need to be more precise about exactly which db.h
header is being used.

Revision 1.5.2.1 / (download) - annotate - [select for diffs], Sun Nov 28 20:11:32 2004 UTC (14 years, 3 months ago) by tv
Branch: tv-derecurse
Changes since 1.5: +6 -6 lines
Diff to previous 1.5 (colored)

Merge from HEAD.

Revision 1.7 / (download) - annotate - [select for diffs], Sun Nov 28 05:44:34 2004 UTC (14 years, 3 months ago) by jlam
Branch: MAIN
Changes since 1.6: +6 -6 lines
Diff to previous 1.6 (colored)

Reverse the tests so that we actually check for the existence and not
the non-existence of the library -- this more accurately reflects what
we want to say.

Revision 1.6 / (download) - annotate - [select for diffs], Fri Nov 26 01:22:31 2004 UTC (14 years, 3 months ago) by jlam
Branch: MAIN
Changes since 1.5: +3 -3 lines
Diff to previous 1.5 (colored)

Add missing quotes.

Revision 1.5 / (download) - annotate - [select for diffs], Wed Nov 17 15:12:08 2004 UTC (14 years, 4 months ago) by jlam
Branch: MAIN
Branch point for: tv-derecurse
Changes since 1.4: +5 -3 lines
Diff to previous 1.4 (colored)

If we don't need to link against -ldb or -ldb1 (because the DB functions
are a part of libc), then remove "-ldb" altogether.  This should fix
GNU configure scripts that assume you need to at least link against
"-ldb".

Revision 1.4 / (download) - annotate - [select for diffs], Mon Nov 15 18:23:40 2004 UTC (14 years, 4 months ago) by jlam
Branch: MAIN
Changes since 1.3: +10 -1 lines
Diff to previous 1.3 (colored)

If we're using db1, the create a compatibility header db_185.h that is
in newer Berkeley DB packages.

Revision 1.3 / (download) - annotate - [select for diffs], Mon Nov 15 18:14:10 2004 UTC (14 years, 4 months ago) by jlam
Branch: MAIN
Changes since 1.2: +8 -8 lines
Diff to previous 1.2 (colored)

Whitespace nits.

Revision 1.2 / (download) - annotate - [select for diffs], Mon Nov 15 18:01:58 2004 UTC (14 years, 4 months ago) by jlam
Branch: MAIN
Changes since 1.1: +4 -3 lines
Diff to previous 1.1 (colored)

Store the actual library options in BUILDLINK_LDADD.db1 and append that
to BUILDLINK_LIBS.db1.  This ensures that BUILDLINK_LDADD.${BDB_TYPE}
always resolves to the correct library options.

Revision 1.1 / (download) - annotate - [select for diffs], Mon Nov 15 17:54:49 2004 UTC (14 years, 4 months ago) by jlam
Branch: MAIN

Rework the Berkeley DB detection in buildlink3:

  * Add a db1.builtin.mk file that detects whether DB-1.85 functionality
    exists in the base system, and remove the distinction between
    "native" and the other Berkeley DB packages -- we now refer to
    db[1234].  This paves the way for any future databases/db1 package.

  * USE_DB185 shouldn't need to be set by any packages -- its correct
    value is now automatically determined by bdb.buildlink3.mk depending
    on whether we explicitly request db1 or not.  By default, if you
    include bdb.buildlink3.mk, you want DB-1.85 functionality and
    USE_DB185 defaults to "yes", but if you explicitly remove db1 from
    the list of acceptable DBs, then USE_DB185 defaults to "no".

  * Set BDB_LIBS to the library options needed to link against the DB
    library when bdb.buildlink3.mk is included.

  * We only add the DB library to the linker command automatically if
    we want DB-1.85 functionality; otherwise assume that the package
    configure process can figure out how to probe for the correct
    headers and libraries.

Edit package Makefiles to nuke redundant settings of USE_DB185.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.




CVSweb <webmaster@jp.NetBSD.org>