Date: Sat, 3 Nov 2018 06:04:08 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483877 - head/devel/RStudio Message-ID: <201811030604.wA3648fZ040350@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Sat Nov 3 06:04:08 2018 New Revision: 483877 URL: https://svnweb.freebsd.org/changeset/ports/483877 Log: devel/RStudio: Fix the gcc version in LD_PRELOAD to be based on GCC_DEFAULT PR: 232923 Reported by: jbeich Modified: head/devel/RStudio/Makefile Modified: head/devel/RStudio/Makefile ============================================================================== --- head/devel/RStudio/Makefile Sat Nov 3 05:41:43 2018 (r483876) +++ head/devel/RStudio/Makefile Sat Nov 3 06:04:08 2018 (r483877) @@ -6,7 +6,7 @@ PORTNAME= RStudio DISTVERSIONPREFIX= v DISTVERSION= 1.2.679 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel math java MASTER_SITES= https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \ https://s3.amazonaws.com/rstudio-buildtools/:buildtools @@ -84,7 +84,7 @@ post-install: echo "fi"; \ echo ""; \ echo "# workaround for the problem that RStudio passes /lib with LD_LIBRARY_PATH that causes the /lib/libgcc_s.so.1 conflict with gcc"; \ - echo "LD_PRELOAD=${PREFIX}/lib/gcc6/libgcc_s.so ${PREFIX}/lib/rstudio/bin/rstudio \"$$@\"" \ + echo "LD_PRELOAD=${PREFIX}/lib/gcc${GCC_DEFAULT}/libgcc_s.so ${PREFIX}/lib/rstudio/bin/rstudio \"$$@\"" \ ) > ${STAGEDIR}${PREFIX}/bin/rstudio @${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/rstudio @${REINPLACE_CMD} -e 's|^Exec=.*/rstudio|Exec=${PREFIX}/bin/rstudio|' ${STAGEDIR}${PREFIX}/share/applications/rstudio.desktop
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811030604.wA3648fZ040350>