Commit graph

331 commits

Author SHA1 Message Date
abs
4ef034af5a Fix build on 64bit linux platforms. When buildlinking directories we
want ${BUILDLINK_DIR}/lib not ${BUILDLINK_DIR}/lib${LIBABISUFFIX}
Tested on Linux x86_64 (Centos 5) and NetBSD
2010-12-03 18:59:20 +00:00
obache
b7c70e106c Support builtin library detection for Haiku.
A half of PR#43399.
2010-08-21 05:07:51 +00:00
schwarz
f4f34bfcb4 Analogously to the case of modular xorg, do not use imake if it is not
available on the system (e.g. on MacOS 10.6). This prevents a circular
dependency on such systems involving x11-links and imake.
2010-06-16 20:23:05 +00:00
sbd
0ae82b5fa9 Add BUILTIN_PKGS with the "builtin" package names to the build information.
E.g if readline 6.0 and ncurses 5.7 are part of the system we get:
BUILTIN_PKGS=readline-6.0 ncurses-5.7
2010-05-19 09:12:15 +00:00
obache
2a02c4bb2b Revert addition of support for Haiku OS (BEINCLUDES and BELIBRARIES).
Improve a port is not better than break others, and current BUILDLINK3
dose not fit such a environment.
Thanks for tests and reviews after commit.
2010-05-03 06:58:27 +00:00
wiz
47b9279d13 Indent. 2010-05-03 05:54:18 +00:00
obache
1cd6a5a99e Replace __noexistent__ with __nonexistent__ to avoid possibilty of another confusion. 2010-05-03 05:52:59 +00:00
obache
07183bf380 Fixes r1.3, and recommit.
Assign with expansion to avoid confusion if this file is included multiply.
2010-05-02 23:59:29 +00:00
wiz
f015dcf3f6 Revert v1.3.
It broke expat detection/usage on NetBSD with native X.
See thread "intltool not building (expat problem)" on tech-pkg,
started on May 1.
2010-05-02 20:26:13 +00:00
wiz
6b03559b87 Fix typo in comment. 2010-05-02 18:32:29 +00:00
wiz
918c8ae3ea Fix typo that changes behaviour (was this tested?) 2010-05-02 18:32:09 +00:00
obache
db85cdfb31 Use /boot/common as default BUILDLINK_PREFIX if /usr does not exist.
It's default location of posix packages for Haiku OS.
2010-04-28 08:15:55 +00:00
obache
86570aa0ff Use BEINCLUDES and BELIBRARIES to find header files and libs additionally.
They point to the location of builtin header files and libraries for Haiku OS.

No objection over two and a half months in tech-pkg@.
2010-04-28 08:02:18 +00:00
joerg
100fb96324 Do not second guess the libtool mode if it was explicitly specified.
For --mode=execute, it could result in incorrect dropping of arguments,
which breaks mono.
2010-01-20 14:29:46 +00:00
obache
d81a6402d6 Fix indentation of show-buildlink3, came from a typo. 2009-10-05 02:40:06 +00:00
rillig
0280fc4e23 Reformatted and extended the comment so that it can be found by
"make help".
2009-07-11 07:56:25 +00:00
joerg
a1a6399f39 Restore duplication check for _BLNK_PACKAGES that got lost with earlier
versions and was not fatal.
2009-03-20 20:10:15 +00:00
joerg
2d1ba244e9 Simply and speed up buildlink3.mk files and processing.
This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.
2009-03-20 19:23:50 +00:00
joerg
37221332dd Move _SYS_VARS processing to a point where BUILDLINK_PACKAGES is
finalised.
2009-03-16 18:37:07 +00:00
obache
6f8cd07b1f Fixes typo, able to detect builtin libiconv again. 2008-12-15 10:58:53 +00:00
jmcneill
49a9b9816d Add /usr/lib${LIBABISUFFIX} to the search path 2008-12-14 16:34:24 +00:00
cube
78e303b61d Complete previous, by entering the package version definition if the file
looked up is not a pkgconfig one, at the condition that the version
script is defined.
2008-10-06 13:19:11 +00:00
cube
74f785d01f Allow the caller to override the script that extracts the version of the
built-in package.  That means pkgconfig-builtin.mk can be used in even
more situations now.
2008-10-06 13:08:16 +00:00
cube
403e256ff6 Merge cube-native-xorg, so that pkgsrc-current can be used with the native
X.Org found in NetBSD-current.

Thanks a lot to all who helped, especially Matthias Scheler who did
repeated tests on Mac OS X and older versions of NetBSD to make sure the
support for those platforms wouldn't be broken (or at least, not fatally,
as I would still expect a few hiccups here and there, because there is
only so much one can test in such limited time).

On the infrastructure side, this branch brings pkgconfig-builtin.mk, in
order to write very easily new builtin.mk files.  It can actually handle
more than just pkgconfig files, but it will provide a version if it finds
such a file.  x11.builtin.mk has also been made more useful and now all
existing (and future!) native-X11-related builtin.mk files should include
it.
2008-10-05 21:36:32 +00:00
dholland
826ee26538 When bombing out because the package we need isn't installed, print
the full requirement rather than just the package name. This message
should never be seen (after all, the package we need is supposed to
*get* installed) but sometimes if things are screwed up in one way or
another it does show up. Since often what's wrong is that the package
that's installed is the wrong version, not that it's missing entirely,
this way the error message makes a lot more sense.

E.g. http://mail-index.netbsd.org/tech-pkg/2008/06/12/msg001126.html et seq.

ok dillo@
2008-06-22 23:54:06 +00:00
joerg
053f4aa0ea Replace "pkg_admin -S lsbest" usage with pkg_info -E. The base stripping
in bsd.buildlink3.mk was broken with pkg_install-20080309 was it
returned a relative path. It would have failed before e.g. with symbolic
links in the path. pkg_info -E is simpler and was added exactly for this
purpose. Fixes PR 38213 and PR 38211.
2008-03-10 20:05:59 +00:00
xtraeme
5af55181db Check if BUILDLINK_AUTO_VARS.${_pkg_} is defined before testing it
via !empty. This fixes a problem with gnome-panel and db1.
2008-02-19 11:12:51 +00:00
rillig
66736dde43 Replaced _PKG_SILENT and _PKG_DEBUG with RUN. 2008-02-07 21:36:13 +00:00
tnn
4a325fa592 Use bsd.fast.prefs.mk in some very commonly included locations. 2008-01-23 17:35:20 +00:00
tron
66d2de41c9 Escape colons in preprocessor, compiler or linker flags while checking
their existances in other variables. This avoids parsing errors if
e.g. "BUILDLINK_LDFLAGS.<pkg>" contains a colon.
2007-12-05 21:36:43 +00:00
rillig
8f225edbcd Made the code a bit more readable by elimination common subexpressions. 2007-11-27 23:06:43 +00:00
kano
abdb54b351 fix obsolete URLs for www.NetBSD.org
close PR pkg/37071
reviewd by xtraeme@
2007-10-07 12:59:11 +00:00
rillig
bedf33485e Why don't we use pkg_info -qL instead of pkg_info -f? 2007-10-01 06:46:37 +00:00
joerg
005620851f Add core of the infrastructure support for cross-compilation.
- 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-08-02 18:19:31 +00:00
tnn
bd630c4f6f If using X11_TYPE=modular this means we have imake(1) from pkgsrc.
We can't use our own imake to check for builtin packages so disable the
check and always report that no builtin implementation exists.
No objections on tech-pkg@
2007-07-27 17:44:43 +00:00
joerg
1181f7164e Remove remaining traces of BUILDLINK_TRANSFORM.${pkg}. 2007-07-27 13:15:41 +00:00
joerg
de82d7fa12 *blush* One variable was missing for the !modular case. 2007-07-23 15:25:20 +00:00
joerg
a3551a9262 More aggressively conditionalize X11BASE handling. Only one case
is left now and that is hidden by LOCALBASE=X11BASE for modular Xorg.
2007-07-23 13:22:11 +00:00
rillig
fc0688ff52 Added _VARGROUPS. 2007-06-06 09:29:53 +00:00
tron
aef83eee53 Remove special treatment of "DynaLoader.a" completely. It's not necessary
with current libtool version and breaks the build under Darwin 8.x and
NetBSD 4.0_BETA2.
2007-04-09 22:33:26 +00:00
tron
f2c3793d4d Don't handle Perl's "DynaLoader.a" specially under Mac OS X. It is not
necessary and doing so causes build problems.

This fixes PR pkg/35990.
2007-03-12 19:19:45 +00:00
joerg
cb3b0ff71b Absolute never use .x11-buildlink. Some cases get nasty to fix, so
back to this.
2007-01-25 15:37:12 +00:00
rillig
5acfb0b6ca Renamed BUILDLINK_TRANSFORM.* to BUILDLINK_FNAME_TRANSFORM.*, to make
clear that these variables are completely unrelated to
BUILDLINK_TRANSFORM.

Added a legacy check that catches appearances of BUILDLINK_TRANSFORM.*.

XXX: Where should incompatible changes in pkgsrc be documented?
2007-01-17 03:11:18 +00:00
joerg
79c5c99c4d For modular Xorg disable xpkgwedge (will be made a hard error later).
Don't add ${X11BASE}/bin to PATH, don't include mk/x11.buildlink3.mk
when USE_X11BASE is set and don't use BUILDLINK_X11_DIR and related
magic.

OKed by wiz@
2006-12-20 01:04:46 +00:00
martti
e2610fb8c8 Remove trailing tabs. 2006-12-15 13:15:06 +00:00
martti
2cc4216d5e Remove trailing spaces. 2006-12-15 12:46:23 +00:00
rillig
98b52d5edd Added a check for whether X11BASE is set correctly. Currently the error
message is

    Syntax error: word unexpected (expecting ")")

which is not helpful at all.
2006-11-17 09:19:37 +00:00
rillig
9855d392a6 Fixed two scripts so that they also run when "set -u" is in effect. 2006-11-09 02:07:59 +00:00
joerg
ca28d631e8 Special case LOCALBASE before X11BASE, as they can be identical in
the case of modular Xorg and the latter is more specific.
2006-11-05 14:39:11 +00:00
schwarz
94201593d3 ensure that -I and -L paths are correctly rewritten even if ${LOCALBASE}
contains ${X11BASE} (e.g. ${LOCALBASE} being /usr/local and ${X11BASE} being
/usr)
2006-09-10 19:49:53 +00:00