Attachment 183205 Details for Bug 219776 – SONAME fix

[patch] SONAME fix

libR-soname.diff (text/plain), 5.19 KB, created by Pawel Pekala on 2017-06-04 14:52:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Pekala

Created: 2017-06-04 14:52:06 UTC

Size: 5.19 KB

patch

obsolete

>Index: math/R/Makefile
>===================================================================
>--- math/R/Makefile	(wersja 442184)
>+++ math/R/Makefile	(kopia robocza)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=		R
> PORTVERSION=		3.4.0
>-PORTREVISION=		0
>+PORTREVISION=		1
> CATEGORIES=		math lang
> MASTER_SITES=		CRAN/src/base/R-${PORTVERSION:C|\..*||}
> 
>@@ -26,6 +26,7 @@
> 			perl5 readline
> 
> USE_PERL5=		build
>+USE_LDCONFIG=		${PREFIX}/lib/R/lib
> 
> OPTIONS_DEFINE=		ICU INFO LDOUBLE LETTER LIBR MEMPROF NLS RPROF X11
> OPTIONS_GROUP=		NEEDGCC NEEDX11
>@@ -120,6 +121,12 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure
>+	@${REINPLACE_CMD} "s|@LIBR_LDFLAGS@|-Wl,-soname,libR.so|" \
>+		${WRKSRC}/src/main/Makefile.in
>+	@${REINPLACE_CMD} "/LIBADD/ s|@RBLAS_LDFLAGS@|-Wl,-soname,libRblas.so|" \
>+		${WRKSRC}/src/extra/blas/Makefile.in
>+	@${REINPLACE_CMD} "s|@RLAPACK_LDFLAGS@|-Wl,-soname,libRlapack.so|" \
>+		${WRKSRC}/src/modules/lapack/Makefile.in
> 
> .include <bsd.port.pre.mk>
> .include "compiler.mk"
>Index: math/cantor/Makefile
>===================================================================
>--- math/cantor/Makefile	(wersja 442184)
>+++ math/cantor/Makefile	(kopia robocza)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	cantor
> PORTVERSION=	${KDE4_VERSION}
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	math kde kde-kde4
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -32,8 +32,7 @@
> OCTAVE_RUN_DEPENDS=	octave:math/octave
> 
> R_DESC=		Build R backend and install R
>-R_BUILD_DEPENDS=	R:math/R
>-R_RUN_DEPENDS=		R:math/R
>+R_LIB_DEPENDS=	libR.so:math/R
> # Required to set CFLAGS for -lgfortran.
> R_USES=		fortran
> R_CMAKE_OFF=	-DWITH_R:BOOL=FALSE
>Index: math/rkward-kde4/Makefile
>===================================================================
>--- math/rkward-kde4/Makefile	(wersja 442184)
>+++ math/rkward-kde4/Makefile	(kopia robocza)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	rkward
> PORTVERSION=	0.6.5
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	math
> MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
> PKGNAMESUFFIX=	-kde4
>@@ -13,10 +13,9 @@
> 
> LICENSE=	GPLv2
> 
>-BUILD_DEPENDS=	${LOCALBASE}/bin/R:math/R
>-LIB_DEPENDS=	libsoprano.so:textproc/soprano
>-RUN_DEPENDS=	${LOCALBASE}/bin/R:math/R \
>-		${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate
>+LIB_DEPENDS=	libR.so:math/R \
>+		libsoprano.so:textproc/soprano
>+RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/katepart.so:editors/kate
> 
> USES=		cmake gettext fortran kde:4 php:cli shared-mime-info
> USE_QT4=	corelib dbus gui qmake_build moc_build network phonon rcc_build	\
>Index: math/rkward-kde4/pkg-plist
>===================================================================
>--- math/rkward-kde4/pkg-plist	(wersja 442184)
>+++ math/rkward-kde4/pkg-plist	(kopia robocza)
>@@ -3,6 +3,7 @@
> lib/R/library/rkward/DESCRIPTION
> lib/R/library/rkward/INDEX
> lib/R/library/rkward/Meta/Rd.rds
>+lib/R/library/rkward/Meta/features.rds
> lib/R/library/rkward/Meta/hsearch.rds
> lib/R/library/rkward/Meta/links.rds
> lib/R/library/rkward/Meta/nsInfo.rds
>@@ -22,6 +23,7 @@
> lib/R/library/rkwardtests/DESCRIPTION
> lib/R/library/rkwardtests/INDEX
> lib/R/library/rkwardtests/Meta/Rd.rds
>+lib/R/library/rkwardtests/Meta/features.rds
> lib/R/library/rkwardtests/Meta/hsearch.rds
> lib/R/library/rkwardtests/Meta/links.rds
> lib/R/library/rkwardtests/Meta/nsInfo.rds
>Index: math/rpy/Makefile
>===================================================================
>--- math/rpy/Makefile	(wersja 442184)
>+++ math/rpy/Makefile	(kopia robocza)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	rpy
> PORTVERSION=	1.0.3
>-PORTREVISION=	35
>+PORTREVISION=	36
> CATEGORIES=	math
> MASTER_SITES=	SF
> 
>@@ -13,10 +13,9 @@
> LICENSE=	GPLv2 LGPL21 MPL
> LICENSE_COMB=	dual
> 
>-BUILD_DEPENDS=	${PYNUMPY} \
>-		R:math/R
>-RUN_DEPENDS=	${PYNUMPY} \
>-		R:math/R
>+BUILD_DEPENDS=	${PYNUMPY}
>+LIB_DEPENDS=	libR.so:math/R
>+RUN_DEPENDS=	${PYNUMPY}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: math/rpy2/Makefile
>===================================================================
>--- math/rpy2/Makefile	(wersja 442184)
>+++ math/rpy2/Makefile	(kopia robocza)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	rpy2
> PORTVERSION=	2.7.8
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	math
> MASTER_SITES=	CHEESESHOP
> 
>@@ -12,10 +12,9 @@
> 
> LICENSE=	GPLv2+
> 
>-BUILD_DEPENDS=	${PYNUMPY} \
>-		R:math/R
>-RUN_DEPENDS=	${PYNUMPY} \
>-		R:math/R
>+BUILD_DEPENDS=	${PYNUMPY}
>+LIB_DEPENDS=	libR.so:math/R
>+RUN_DEPENDS=	${PYNUMPY}
> 
> USES=		fortran python readline
> USE_PYTHON=	distutils autoplist
>Index: science/afni/Makefile
>===================================================================
>--- science/afni/Makefile	(wersja 442184)
>+++ science/afni/Makefile	(kopia robocza)
>@@ -11,7 +11,7 @@
> 
> PORTNAME=	afni
> PORTVERSION=	2015.11.13
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	science biology graphics
> MASTER_SITES=	http://www.acadix.biz/Ports/distfiles/
> 
>@@ -20,10 +20,10 @@
> 
> LICENSE=	GPLv2
> 
>-BUILD_DEPENDS=	gm4:devel/m4 \
>-		R:math/R
>+BUILD_DEPENDS=	gm4:devel/m4
> LIB_DEPENDS=	libexpat.so:textproc/expat2 \
> 		libf2c.so:lang/f2c \
>+		libR.so:math/R \
> 		libgsl.so:math/gsl \
> 		libnetcdff.so:science/netcdf-fortran \
> 		libxml2.so:textproc/libxml2 \
>@@ -31,8 +31,7 @@
> RUN_DEPENDS=	endian:sysutils/endian \
> 		mpeg_encode:multimedia/mpeg_encode \
> 		ppmtogif:graphics/netpbm \
>-		qhull:math/qhull5 \
>-		R:math/R
>+		qhull:math/qhull5
> 
> CONFLICTS=	im-[0-9]* \
> 		nifticlib-[0-9]* \

Actions: View | Diff

Attachments on bug 219776: 183205 | 184385