The soname needs to match the filename in order for the libs to be

usable.  Noticed by Tero Koskinen, thanks.

Simplify the install by using an undocumented jam rule.

Ok wilfried@.
This commit is contained in:
deanna 2007-01-07 22:20:20 +00:00
parent 904dde58bf
commit be9ffdf7ad
2 changed files with 14 additions and 12 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.6 2006/12/28 10:46:20 deanna Exp $
# $OpenBSD: Makefile,v 1.7 2007/01/07 22:20:20 deanna Exp $
COMMENT-main= "free peer-reviewed portable C++ source libraries (headers)"
COMMENT-libs= "free peer-reviewed portable C++ source libraries (libraries)"
PKGNAME-main= boost-headers-${VERSION}p2
PKGNAME-libs= boost-libs-${VERSION}p1
PKGNAME-libs= boost-libs-${VERSION}p2
VERSION= 1.33.1
DISTNAME= boost_${VERSION:S/./_/g}
@ -67,14 +67,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/tools/build/jam_src/bin.*/bjam \
${PREFIX}/bin
find ${WRKSRC}/bin/boost/libs -name "libboost*" -type f \
-exec ${INSTALL_DATA} \{\} ${PREFIX}/lib \;
cd ${PREFIX}/lib && \
for LIBS in libboost*; do \
mv $$LIBS \
`echo $$LIBS | perl -pi -e "s,-gcc(-mt)?(-d)?-${VERSION:S/./_/g},\1\2,"`; \
done
${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
@cd ${WRKSRC} && \
find boost -type d -exec ${INSTALL_DATA_DIR} ${PREFIX}/include/{} \;

View File

@ -1,6 +1,15 @@
$OpenBSD: patch-Jamfile,v 1.1.1.1 2006/11/05 19:20:43 wilfried Exp $
$OpenBSD: patch-Jamfile,v 1.2 2007/01/07 22:20:21 deanna Exp $
--- Jamfile.orig Tue Nov 8 05:39:45 2005
+++ Jamfile Thu Oct 26 08:17:42 2006
+++ Jamfile Fri Jan 5 14:35:53 2007
@@ -103,7 +103,7 @@ if stage in $(ARGV)
# what kind of layout are we doing?
local layout = [ MATCH "^--layout=(.*)" : $(ARGV) ] ;
-layout ?= versioned ;
+layout = system ;
layout-$(layout) = true ;
# possible stage only location
@@ -204,7 +204,7 @@ if $(lib-sources)
local gUNVERSIONED_VARIANT_TAG = [ cond $(layout-system) : TRUE ] ;