Date: Mon, 26 Feb 2018 08:16:59 +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: r462995 - head/devel/RStudio Message-ID: <201802260816.w1Q8GxD9071797@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Mon Feb 26 08:16:59 2018 New Revision: 462995 URL: https://svnweb.freebsd.org/changeset/ports/462995 Log: devel/RStudio: Unbroke the port; Updated to 1.1.434 It was broken because due to the internally set LD_LIBRARY_PATH containing /lib /lib/libgcc_s.so.1 was loading and causing conflict with the gcc's libgcc_s.so library. Fixed by LD_PRELOAD of the gcc's libgcc_s.so library. Approved by: tcberner (mentor, implicit) Modified: head/devel/RStudio/Makefile head/devel/RStudio/distinfo Modified: head/devel/RStudio/Makefile ============================================================================== --- head/devel/RStudio/Makefile Mon Feb 26 07:23:53 2018 (r462994) +++ head/devel/RStudio/Makefile Mon Feb 26 08:16:59 2018 (r462995) @@ -5,8 +5,7 @@ PORTNAME= RStudio DISTVERSIONPREFIX= v -DISTVERSION= 1.1.409 -PORTREVISION= 1 +DISTVERSION= 1.1.434 CATEGORIES= devel math java MASTER_SITES= https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \ https://s3.amazonaws.com/rstudio-buildtools/:buildtools @@ -73,7 +72,11 @@ pre-build: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cpp/desktop/global-setenv.h post-install: - @${LN} -s ${PREFIX}/lib/rstudio/bin/rstudio ${STAGEDIR}${PREFIX}/bin/rstudio + @(echo "#!/bin/sh"; \ + 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 \"$@\"" \ + ) > ${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 # There is a variability in .js file names due to the use of random numbers, so we use the automatic plist. @${SETENV} ${CO_ENV} ${SH} ${SCRIPTSDIR}/check-stagedir.sh makeplist | ${GREP} -v ^\/ | ${SED} -e 's|%%WWWDIR%%|www/rstudio|' > ${TMPPLIST} Modified: head/devel/RStudio/distinfo ============================================================================== --- head/devel/RStudio/distinfo Mon Feb 26 07:23:53 2018 (r462994) +++ head/devel/RStudio/distinfo Mon Feb 26 08:16:59 2018 (r462995) @@ -1,4 +1,4 @@ -TIMESTAMP = 1514973738 +TIMESTAMP = 1519621145 SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494 SIZE (core-dictionaries.zip) = 876339 SHA256 (gin-1.5.zip) = f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94 @@ -7,8 +7,8 @@ SHA256 (gwt-2.7.0.zip) = aa65061b73836190410720bea422e SIZE (gwt-2.7.0.zip) = 108818328 SHA256 (mathjax-26.zip) = 939a2d7f37e26287970be942df70f3e8f272bac2eb868ce1de18bb95d3c26c71 SIZE (mathjax-26.zip) = 3061588 -SHA256 (RStudio-rstudio-v1.1.409_GH0.tar.gz) = fc5773d128665d28674c540051437515c8eb49bb4f4ce000435bd4094acbfb3e -SIZE (RStudio-rstudio-v1.1.409_GH0.tar.gz) = 20195673 +SHA256 (RStudio-rstudio-v1.1.434_GH0.tar.gz) = 0c78c2ac1072b4e3dbc3397e84a2f2cb20bd78a96d484d18868d9778f3198e07 +SIZE (RStudio-rstudio-v1.1.434_GH0.tar.gz) = 20197399 SHA256 (rstudio-rmarkdown-aed26ac_GH0.tar.gz) = b6f6f48dd9930514204739d8957c2737f0b1d110aebf9f89fa31de10598cb29b SIZE (rstudio-rmarkdown-aed26ac_GH0.tar.gz) = 2087615 SHA256 (rstudio-rsconnect-03c379b_GH0.tar.gz) = d24b6ee49f32f650f6d10bbfc7b2f61aee258f2fbf45a43c006f9e0a726bcea6
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802260816.w1Q8GxD9071797>