diff options
| author | jlam <jlam@pkgsrc.org> | 2004-11-12 05:20:01 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-11-12 05:20:01 +0000 |
| commit | 153b3f00b765cb8f2a28c7e20a4cd4ecf1b35404 (patch) | |
| tree | 0a8964127c35bd31bdaa467333e58d0b937914ab /mk/bsd.pkg.mk | |
| parent | e5817e65a2d360eb1089f384601e69ec0a54c16e (diff) | |
| download | pkgsrc-153b3f00b765cb8f2a28c7e20a4cd4ecf1b35404.tar.gz | |
(1) Split out the native (built-in) pthread detection in
pthread.buildlink3.mk into a separate file, pthread.builtin.mk,
that is handled using the usual builtin.mk logic.
(2) If pthread.buildlink3.mk is included by a package Makefile, then
automatically add the necessary compiler and linker flags to
compile and link pthread-enabled/reentrant code. For native
pthreads, this means passing -pthread to the compiler and linker.
For the userland pthread replacement, we pass -D_REENTRANT and
-lpthread instead.
(3) Add PTHREAD_{CFLAGS,LDFLAGS,LIBS} in both CONFIGURE_ENV and MAKE_ENV
when pthread.buildlink3.mk is included so that the configure and
build processes can use these values. Remove these definitions
from bsd.pkg.mk since PTHREAD_* variables are all declared within
pthread.buildlink3.mk.
XXX For now, PTHREAD_LDFLAGS is a superset of PTHREAD_LIBS until
XXX packages that use use PTHREAD_LDFLAGS can be fixed.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index efde626582f..1b45f4de652 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1534 2004/11/12 02:05:20 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1535 2004/11/12 05:20:01 jlam Exp $ # # This file is in the public domain. # @@ -475,10 +475,6 @@ MAKE_ENV+= CPP="${CPP}" MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" .endif -# export the flags needed to compile and link pthreaded code -MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" -MAKE_ENV+= PTHREAD_LDFLAGS="${PTHREAD_LDFLAGS}" - TOUCH_FLAGS?= -f # determine if we need a working patch(1). |