diff options
| author | obache <obache@pkgsrc.org> | 2007-05-18 07:50:11 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2007-05-18 07:50:11 +0000 |
| commit | 798967652422c6ea14bd768a7df361a40a8b9889 (patch) | |
| tree | 423e9bd6bbbfde8169df39ebdf43a87d9623b0e2 | |
| parent | 32c3c2b3a31cb3416c0da876ac914594a714dce2 (diff) | |
| download | pkgsrc-798967652422c6ea14bd768a7df361a40a8b9889.tar.gz | |
Avoid to relink in install phase, because relink remove RPATH.
Bump PKGREVISION.
| -rw-r--r-- | graphics/vtk/Makefile | 4 | ||||
| -rw-r--r-- | graphics/vtk/Makefile.vtkdist | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/graphics/vtk/Makefile b/graphics/vtk/Makefile index 88baa724334..048271b84ba 100644 --- a/graphics/vtk/Makefile +++ b/graphics/vtk/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2007/03/12 06:46:42 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2007/05/18 07:50:11 obache Exp $ # PKGNAME= vtk-${VTKDIST_VERSION} -PKGREVISION= 3 +PKGREVISION= 4 COMMENT= Visualization toolkit diff --git a/graphics/vtk/Makefile.vtkdist b/graphics/vtk/Makefile.vtkdist index e8ba88419af..22dc32d0d9f 100644 --- a/graphics/vtk/Makefile.vtkdist +++ b/graphics/vtk/Makefile.vtkdist @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.vtkdist,v 1.8 2007/02/22 19:26:36 wiz Exp $ +# $NetBSD: Makefile.vtkdist,v 1.9 2007/05/18 07:50:11 obache Exp $ .include "../../graphics/vtk/Makefile.common" @@ -13,9 +13,11 @@ PATCHDIR= ${.CURDIR}/../vtk/patches VTK_LIBDIR= ${PREFIX}/lib/vtk -VTK_CMAKE_OPT+= -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} \ - -DCMAKE_SHARED_LINKER_FLAGS:STRING=${COMPILER_RPATH_FLAG}${VTK_LIBDIR} \ - -DCMAKE_MODULE_LINKER_FLAGS:STRING=${COMPILER_RPATH_FLAG}${VTK_LIBDIR} \ +VTK_CMAKE_OPT+= -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX:Q} \ + -DCMAKE_INSTALL_RPATH:STRING=${PREFIX:Q}/lib:${X11BASE:Q}/lib${LIBABISUFFIX:Q}:${VTK_LIBDIR:Q} \ + -DCMAKE_SKIP_BUILD_RPATH:BOOL=ON \ + -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \ + -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON \ -DVTK_USE_HYBRID:BOOL=ON do-configure: |