Commit graph

87 commits

Author SHA1 Message Date
tv
c487cb967a Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10
in the process.  (More information on tech-pkg.)

Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.

Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
2004-10-03 00:12:51 +00:00
jlam
1a280185e1 Mechanical changes to package PLISTs to make use of LIBTOOLIZE_PLIST.
All library names listed by *.la files no longer need to be listed
in the PLIST, e.g., instead of:

	lib/libfoo.a
	lib/libfoo.la
	lib/libfoo.so
	lib/libfoo.so.0
	lib/libfoo.so.0.1

one simply needs:

	lib/libfoo.la

and bsd.pkg.mk will automatically ensure that the additional library
names are listed in the installed package +CONTENTS file.

Also make LIBTOOLIZE_PLIST default to "yes".
2004-09-22 08:09:14 +00:00
reed
1f835283b3 Move including the ../../mk/bsd.prefs.mk and checking for Linux
to after GNU_CONFIGURE and USE_LIBTOOL being set.
This fixes the problem where the lt_cv_sys_max_cmd_len was not
added to the CONFIGURE_ENV.

Now that I think about it, I caused this problem when I added that
Linux check...
2004-08-31 19:24:42 +00:00
jlam
8d572feba3 Use the new BUILDLINK_TRANSFORM commands to more precisely state the
intended transformation: use "rm" to remove an option, "rmdir" to remove
all options containing a path starting with a given directory name, and
"rename" to rename options to something else.
2004-08-28 06:05:31 +00:00
wiz
60019e1e08 Unused. 2004-07-04 09:55:19 +00:00
reed
631e46a396 Fail if this package is to be built under Linux. This is normal
for Linux. Most (all?) Linux distros don't provide a libiconv
package, because GLIBC's iconv support is good enough.

At this time, using PKG_FAIL_REASON instead of PKG_SKIP_REASON
so we can catch examples of packages depending on this.

The builtin.mk was improved to help stop it from being used under
Linux.

This was okayed by Rene Hexel, the maintainer.

Todo: fix abiword build because it should not require this libiconv
package under Linux.
2004-06-04 05:25:38 +00:00
reed
d053f8cd8c By default, assume that the native iconv on Linux systems using
GLIBC supports GNU libiconv's API. So don't depend on pkgsrc's
libiconv for it. This is normal: most other Linux distros don't
provide a libiconv package.

This was discussed on tech-pkg list over past two months. It has
helped a few users under Linux where they had some problems with
conflicts with their working iconv() support provided with libc
and the libiconv package.

This was okayed by maintainer, Rene Hexel.

This still needs some improvement. Some packages still try to
force libiconv usage even though not needed.
2004-06-04 05:21:14 +00:00
danw
884bfb7d8d Revert the change to put -liconv into BUILDLINK_LDFLAGS.iconv (which
breaks some things on Darwin) and fix audio/musicpd so it doesn't need
it (by faking out a configure check that gets confused by the
iconv_open -> libiconv_open renaming)
2004-05-20 16:13:05 +00:00
seb
00cc0486ea Garbage collect BUILDLINK_PKGBASE.<pkg> from buildlink3: it is not anymore
used since revision 1.139 of mk/buildlink3/bsd.buildlink3.mk.
2004-05-17 21:32:33 +00:00
snj
5362f01ef1 Add ${BUILDLINK_LDADD.iconv} to BUILDLINK_LDFLAGS.iconv. 2004-05-03 02:22:24 +00:00
tv
faaed608d9 nb2: use $(INSTALL), not $(INSTALL_DATA), for a library in an autoconfiscated
package.
2004-04-28 15:19:04 +00:00
jlam
8da51b0fbe Do previous in a different way. We want USE_GNU_ICONV to always use
a GNU libiconv, whether it be builtin or not, and PREFER_{NATIVE,PKGSRC}
can be used to decide which iconv we use if USE_GNU_ICONV isn't defined.
On NetBSD, the native iconv implementation (if it exists) is considered
GNUish enough unless USE_GNU_ICONV is explicitly defined.
2004-04-26 04:53:23 +00:00
snj
a886bcf21f If USE_GNU_ICONV is defined, don't use builtin libiconv if ICONV_TYPE is
native.
2004-04-26 00:28:39 +00:00
jschauma
4c5fe4eef7 Apparently cp(1) under Irix does not like to overwrite symbolic links.
This causes the package to fail to install, as this section is executed
a second time.
Use pax instead and all's peachy.
2004-04-02 19:08:37 +00:00
jlam
6d92080aa2 Match the template builtin.mk file in bsd.builtin.mk, and make the two
packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links)
use the new format correctly.
2004-03-29 05:43:28 +00:00
jlam
426cc1ce72 Add a BUILDLINK_PKGBASE.<pkg> definition where it's not equal to <pkg>,
e.g. "BUILDLINK_PKGBASE.gtk?= gtk+".  This is mandated by the example
buildlink[23].mk files in bsd.buildlink[23].mk.
2004-03-29 05:05:32 +00:00
jlam
59bdf89739 If the ${PKGBASE} of a package doesn't match the token passed to
BUILDLINK_PACKAGES, then set BUILDLINK_PKGBASE.<pkg> explicitly so that
we can map from <pkg> to BUILDLINK_PKGBASE.<pkg>.
2004-03-16 18:23:26 +00:00
jlam
d0b4c54eb6 Split out the code that deals with checking whether the software is
built-in or not into a separate builtin.mk file.  The code to deal
checking for built-in software is much simpler to deal with in pkgsrc.

The buildlink3.mk file for a package will be of the usual format
regardless of the package, which makes it simpler for packagers to
update a package.

The builtin.mk file for a package must define a single yes/no variable
USE_BUILTIN.<pkg> that is used by bsd.buildlink3.mk to decide whether
to use the built-in software or to use the pkgsrc software.
2004-03-10 17:57:14 +00:00
snj
e26c9c6b59 Use ${CP} instead of cp. From Georg Schwarz in PR pkg/24634. 2004-03-02 05:01:38 +00:00
jlam
bf6e059da4 Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
environment overrides all other settings.
2004-02-18 16:35:27 +00:00
jlam
ec993afa1a LIBTOOL_OVERRIDE and SHLIBTOOL_OVERRIDE are now lists of shell globs
relative to ${WRKSRC}.  Remove redundant LIBTOOL_OVERRIDE settings that
are automatically handled by the default setting in bsd.pkg.mk.
2004-02-14 17:21:32 +00:00
jlam
d2b62c66fb Create a new variable PREFER_NATIVE that has the opposite semantics
as PREFER_PKGSRC.  Preferences are determined by the most specific
instance of the package in either PREFER_PKGSRC or PREFER_NATIVE.  If
a package is specified in neither or in both variables, then PREFER_PKGSRC
has precedence over PREFER_NATIVE.
2004-02-12 02:35:06 +00:00
jlam
1edfa505ed Reorganize code so that any dependencies are checked as part of deciding
whether the software is built-in or not.  This facilitates implementing
the forthcoming PKGSRC_NATIVE variable.
2004-02-12 01:59:37 +00:00
jlam
74747843b7 Replace ICONV_IS_GNU with ICONV_TYPE, which can be checked to be either
"gnu" or "native".
2004-02-11 12:17:58 +00:00
jlam
7c68eb548f Move the INCOMPAT_FOO checks to a more natural location within the
block that decides whether package FOO is built-in or not.  If the
platform is listed in IMCOMPAT_FOO, then treat FOO as being not
built-in.
2004-02-11 11:30:49 +00:00
jlam
7699290f10 If we're passing through MAKEFLAGS variables whose values may contain
spaces, use the :Q modifier instead of double-quoting the value.  This
avoids breakage when executing the just-in-time su targets.
2004-02-06 19:04:24 +00:00
jlam
317cc72791 Make PREFER_PKGSRC just yes/no or a list of packages. This makes it
simpler to understand.
2004-02-05 07:17:14 +00:00
jlam
e7133cac25 Rename BUILDLINK_PREFER_PKGSRC to PREFER_PKGSRC so that we can use its
value outside of buildlink-related files.
2004-02-05 07:06:15 +00:00
jlam
07a9d8dfb2 Support a new global variable:
BUILDLINK_PREFER_PKGSRC
	This variable determines whether or not to prefer the pkgsrc
	versions of software that is also present in the base system.

	This variable is multi-state:
		defined, or "yes"	always prefer the pkgsrc versions
		not defined, or "no"	only use the pkgsrc versions if
					needed by dependency requirements

	This can also take a list of packages for which to prefer the
	pkgsrc-installed software.  The package names may be found by
	consulting the value added to BUILDLINK_PACKAGES in the
	buildlink[23].mk files for that package.
2004-02-05 06:58:02 +00:00
jlam
01a5abff01 Support BUILDLINK_DEPENDS.<pkg> being a list of values. 2004-01-24 03:12:31 +00:00
tron
1c3192189f Don't use "-Wl" on platforms which define "_USE_RPATH" to "no". This
fixes build problems under Darwin.
2004-01-15 23:04:00 +00:00
grant
1bd16c080f kill leading whitespace, s/Libiconv/libiconv/ 2004-01-13 09:42:05 +00:00
jlam
27458276fc Use l:foo: instead of S:...: to remove a library. 2004-01-06 19:13:13 +00:00
jlam
2c03f435c8 bl3ify 2004-01-05 11:17:10 +00:00
jlam
d279e6f535 Use S/+$// instead of C/\+$// to save a backslash. Very highly
recommended by seb :)
2004-01-05 11:05:44 +00:00
jlam
c9ff27d270 Sow BUILDLINK_USE_BUILTIN.<pkg> and reap _NEED_<PKG> variables. 2004-01-05 09:31:31 +00:00
jlam
47bb2aae5f Re-arrange to match example buildlink3.mk file in bsd.buildlink3.mk. 2004-01-04 23:34:04 +00:00
jlam
339cd13cb2 Initial sprinkling of work-in-progress buildlink3.mk files for using the
buildlink3 framework.
2004-01-03 23:06:43 +00:00
dmcmahill
88f53da752 add a "ICONV_IS_GNU" variable which is set to "YES" when the logic here
says we need the pkgsrc libiconv.  This will let pkgs who need to know
deal appropriately.
2003-10-31 02:09:19 +00:00
xtraeme
b8947ef00d Don't try to link to -liconv in the install process, it fixes build in
FreeBSD. Closes my own PR pkg/22346.
2003-09-16 13:57:18 +00:00
seb
4167694355 NetBSD/sparc64 1.6.1_STABLE's f771 -at least- leaves a nice coredump
in directory conftest during configire run.
So then 'rmdir conftest' fails, then all 'cc -o conftest ...' tests fail,
then ...

So clean up a bit before rmdir'ing conftest hence fix compilation
on said platform.
2003-09-12 13:52:02 +00:00
seb
529e68e4f1 NetBSD-current provide iconv(3) functionality in libc not
libiconv. Some packages insist on adding '-liconv' during link
or assumes the existent of it with they found iconv.h.

BUILDLINK_TRANSFORM can handle that.
Put it in in libiconv/buildlink2.mk for systematic coverage and
remove it from package "Makefile".

BTW this fix the build of chat/centericq - and probably others - on
-current.

Okayed by jlam@.
2003-09-02 18:20:33 +00:00
jmc
dfa0d698ad Export proper link flags to LDFLAGS based on overall config (i.e. whether
libiconv exists/is needed and whether to link it in). This means packages
can avoid hardcoding LDFLAGS+=-liconv and breaking on -current.
Fixes gnomeicu for -current and 1.6.x
2003-08-18 03:37:47 +00:00
jmmv
e794dd2538 Handle installation and removal of the charset.alias file properly in binary
packages, using SUPPORT_FILES from bsd.pkg.install.mk.  Bump PKGREVISION to 1.
2003-07-28 10:11:45 +00:00
martti
e69ab8c365 COMMENT should start with a capital letter. 2003-07-21 16:35:12 +00:00
grant
91f00f1cbc s/netbsd.org/NetBSD.org/ 2003-07-17 21:21:03 +00:00
wiz
9a290ed0df Update to 1.9.1.
* Many more transliterations.
* New configuration option --enable-relocatable.
2003-07-13 13:32:29 +00:00
dillo
9d47c6ba38 use TEST_TARGET instead of custom test target 2003-07-12 13:13:46 +00:00
jlam
342ad4c6f6 Back out previous change and institute another fix for the reported
problem.  The symptoms appear to match the situation where a library exists
in /usr/lib that matches the name of the pkgsrc-installed library, but the
corresponding .la file doesn't exist in /usr/lib.  Fix this by using
building a fake libtool archive if we use the system library.
2003-06-29 19:43:58 +00:00
wiz
7bf4c1f7ad Check for existence of /usr/lib/libiconv.so too, not only for the header
file. Needed for some broken (Linux) installs.
From Sebastian P. on tech-pkg.
2003-06-29 11:19:09 +00:00