Attachment 211200 Details for Bug 243736 – grass with SONAME

[patch] grass with SONAME

grass.diff (text/plain), 2.59 KB, created by Loïc Bartoletti on 2020-01-30 17:48:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2020-01-30 17:48:08 UTC

Size: 2.59 KB

patch

obsolete

>diff --git a/databases/grass7/Makefile b/databases/grass7/Makefile
>index ac9b96b8450f..23aa0408b7de 100644
>--- a/databases/grass7/Makefile
>+++ b/databases/grass7/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	grass
> PORTVERSION=	7.6.1
>-PORTREVISION=	9
>+PORTREVISION=	10
> CATEGORIES=	databases geography
> MASTER_SITES=	https://grass.osgeo.org/%SUBDIR%/ \
> 		http://grass.cict.fr/%SUBDIR%/ \
>@@ -98,7 +98,7 @@ LAS_DESC=		Enable LiDAR modules
> PDAL_DESC=		Enable points cloud data modules
> DB_DESC=		Database support
> NLS_CONFIGURE_WITH=	nls
>-NLS_USES=		gettext	
>+NLS_USES=		gettext
> LAS_CONFIGURE_ON=	--with-liblas=yes
> LAS_LIB_DEPENDS=	liblas.so:devel/liblas \
> 			libboost_program_options.so:devel/boost-libs \
>@@ -190,10 +190,7 @@ post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/${i}
> .endfor
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/lister/*
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/lib/libgrass_*.so
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/tools/g.echo
> 	${LN} -sf ${PORTNAME}${VER} \
> 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
>-	${LN} -s ${PORTNAME}${VER} \
>-		${STAGEDIR}${PREFIX}/${PORTNAME}-${PORTVERSION}
> .include <bsd.port.mk>
>diff --git a/databases/grass7/files/patch-aclocal.m4 b/databases/grass7/files/patch-aclocal.m4
>new file mode 100644
>index 000000000000..c3fc06183ca0
>--- /dev/null
>+++ b/databases/grass7/files/patch-aclocal.m4
>@@ -0,0 +1,10 @@
>+--- aclocal.m4.orig	2020-01-25 14:44:25 UTC
>++++ aclocal.m4
>+@@ -560,6 +560,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
>+ 	    # FreeBSD 3.* and greater have ELF.
>+ 	    SHLIB_CFLAGS="-fPIC"
>+ 	    #SHLIB_LD="ld -Bshareable -x"
>++            SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$[@])"
>+ 	    SHLIB_LD="${CC} -shared"
>+ 	    SHLIB_SUFFIX=".so"
>+ 	    LDFLAGS="-export-dynamic"
>diff --git a/databases/grass7/files/patch-configure b/databases/grass7/files/patch-configure
>new file mode 100644
>index 000000000000..fe7efd87db60
>--- /dev/null
>+++ b/databases/grass7/files/patch-configure
>@@ -0,0 +1,10 @@
>+--- configure.orig	2020-01-25 14:44:16 UTC
>++++ configure
>+@@ -1591,6 +1591,7 @@ EOF
>+ 	    # FreeBSD 3.* and greater have ELF.
>+ 	    SHLIB_CFLAGS="-fPIC"
>+ 	    #SHLIB_LD="ld -Bshareable -x"
>++            SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$@)"
>+ 	    SHLIB_LD="${CC} -shared"
>+ 	    SHLIB_SUFFIX=".so"
>+ 	    LDFLAGS="-export-dynamic"
>diff --git a/databases/grass7/pkg-plist b/databases/grass7/pkg-plist
>index 144f61c9ef25..841bad51cb60 100644
>--- a/databases/grass7/pkg-plist
>+++ b/databases/grass7/pkg-plist
>@@ -1,4 +1,3 @@
>-grass-%%VERSION%%
> bin/grass%%MAJVER%%
> bin/grass%%VER%%
> %%GRASS_INST_DIR%%/AUTHORS

Flags:

lbartoletti: maintainer-approval+

Actions: View | Diff

Attachments on bug 243736: 211200 | 211201 | 211202