summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2005-06-18 14:32:38 +0000
committerjmmv <jmmv@pkgsrc.org>2005-06-18 14:32:38 +0000
commitee24fabd83a32b4b99d2eef8b0ca8f3ca2b21278 (patch)
tree6a70448858aeada473cf42eb351a4136773bd83f /devel
parente162d8156b2a0debedca27d585ea5f7f031def1f (diff)
downloadpkgsrc-ee24fabd83a32b4b99d2eef8b0ca8f3ca2b21278.tar.gz
Enable sonames under DragonFly, FreeBSD and NetBSD. The default build
infrastructure only uses them under Linux and OpenBSD (eww, hardcoded logic based on OS names). Aside making installations more consistent across systems, this lets Boost work correctly on the systems where sonames were previously used. Otherwise, they are unable to find the correct libraries at runtime and we get PLIST errors (more files installed than expected). The problem exposes itself when building software that needs Boost (e.g. monotone). This also means that we can't rename the installed libraries any more as we were doing until now, because programs linked against them will be looking for their respective sonames. Therefore, keep the default names produced by a --layout=system build. Bump PKGREVISION of boost, boost-libs and boost-python to 1.
Diffstat (limited to 'devel')
-rw-r--r--devel/boost-libs/Makefile4
-rw-r--r--devel/boost-libs/PLIST47
-rw-r--r--devel/boost-libs/buildlink3.mk4
-rw-r--r--devel/boost-python/Makefile4
-rw-r--r--devel/boost-python/PLIST7
5 files changed, 40 insertions, 26 deletions
diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile
index 381267a9ab9..418bf236259 100644
--- a/devel/boost-libs/Makefile
+++ b/devel/boost-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2005/02/26 22:48:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2005/06/18 14:32:38 jmmv Exp $
#
BOOST_PACKAGE= libs
@@ -6,6 +6,8 @@ BOOST_COMMENT= (binary libraries)
BOOST_CONFIG= installed
BOOST_INSTALL_LIBS= yes
+PKGREVISION= 1
+
.include "../../meta-pkgs/boost/Makefile.common"
BJAM_ARGS+= --without-python
diff --git a/devel/boost-libs/PLIST b/devel/boost-libs/PLIST
index a9e1d993f99..5a64aaaae27 100644
--- a/devel/boost-libs/PLIST
+++ b/devel/boost-libs/PLIST
@@ -1,19 +1,28 @@
-@comment $NetBSD: PLIST,v 1.1 2005/02/26 22:48:35 jmmv Exp $
-lib/libboost_date_time.a
-lib/libboost_date_time.so
-lib/libboost_filesystem.a
-lib/libboost_filesystem.so
-lib/libboost_prg_exec_monitor.a
-lib/libboost_prg_exec_monitor.so
-lib/libboost_program_options.a
-lib/libboost_program_options.so
-lib/libboost_regex.a
-lib/libboost_regex.so
-lib/libboost_signals.a
-lib/libboost_signals.so
-lib/libboost_test_exec_monitor.a
-lib/libboost_test_exec_monitor.so
-lib/libboost_thread.a
-lib/libboost_thread.so
-lib/libboost_unit_test_framework.a
-lib/libboost_unit_test_framework.so
+@comment $NetBSD: PLIST,v 1.2 2005/06/18 14:32:38 jmmv Exp $
+lib/libboost_date_time-mt.a
+lib/libboost_date_time-mt.so
+lib/libboost_date_time-mt.so.${PKGVERSION}
+lib/libboost_filesystem-mt.a
+lib/libboost_filesystem-mt.so
+lib/libboost_filesystem-mt.so.${PKGVERSION}
+lib/libboost_prg_exec_monitor-mt.a
+lib/libboost_prg_exec_monitor-mt.so
+lib/libboost_prg_exec_monitor-mt.so.${PKGVERSION}
+lib/libboost_program_options-mt.a
+lib/libboost_program_options-mt.so
+lib/libboost_program_options-mt.so.${PKGVERSION}
+lib/libboost_regex-mt.a
+lib/libboost_regex-mt.so
+lib/libboost_regex-mt.so.${PKGVERSION}
+lib/libboost_signals-mt.a
+lib/libboost_signals-mt.so
+lib/libboost_signals-mt.so.${PKGVERSION}
+lib/libboost_test_exec_monitor-mt.a
+lib/libboost_test_exec_monitor-mt.so
+lib/libboost_test_exec_monitor-mt.so.${PKGVERSION}
+lib/libboost_thread-mt-s.a
+lib/libboost_thread-mt.so
+lib/libboost_thread-mt.so.${PKGVERSION}
+lib/libboost_unit_test_framework-mt.a
+lib/libboost_unit_test_framework-mt.so
+lib/libboost_unit_test_framework-mt.so.${PKGVERSION}
diff --git a/devel/boost-libs/buildlink3.mk b/devel/boost-libs/buildlink3.mk
index 5e2c91a3f15..de8c002220e 100644
--- a/devel/boost-libs/buildlink3.mk
+++ b/devel/boost-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/02/28 01:44:17 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/06/18 14:32:38 jmmv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BOOST_LIBS_BUILDLINK3_MK:= ${BOOST_LIBS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= boost-libs
.if !empty(BOOST_LIBS_BUILDLINK3_MK:M+)
# Use a dependency pattern that guarantees the proper ABI.
-BUILDLINK_DEPENDS.boost-libs+= boost-libs-1.32.*
+BUILDLINK_DEPENDS.boost-libs+= boost-libs-1.32.*nb*
BUILDLINK_PKGSRCDIR.boost-libs?= ../../devel/boost-libs
.endif # BOOST_LIBS_BUILDLINK3_MK
diff --git a/devel/boost-python/Makefile b/devel/boost-python/Makefile
index 142ede1cadb..7ddc20a0b18 100644
--- a/devel/boost-python/Makefile
+++ b/devel/boost-python/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2005/02/26 22:48:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/18 14:32:39 jmmv Exp $
#
BOOST_PACKAGE= python
BOOST_COMMENT= (Boost.Python binary library)
BOOST_CONFIG= installed
+PKGREVISION= 1
+
.include "../../meta-pkgs/boost/Makefile.common"
BJAM_ARGS+= --with-python
diff --git a/devel/boost-python/PLIST b/devel/boost-python/PLIST
index d02dfb782fc..914bbd8e094 100644
--- a/devel/boost-python/PLIST
+++ b/devel/boost-python/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/26 22:48:35 jmmv Exp $
-lib/libboost_python.a
-lib/libboost_python.so
+@comment $NetBSD: PLIST,v 1.3 2005/06/18 14:32:39 jmmv Exp $
+lib/libboost_python-mt.a
+lib/libboost_python-mt.so
+lib/libboost_python-mt.so.${PKGVERSION}