Attachment 206786 Details for Bug 236603 – patch to integrate builtin boost to RStudio 1.2.1335

[patch] patch to integrate builtin boost to RStudio 1.2.1335

patch-RStudio_builtin-boost.diff (text/plain), 2.43 KB, created by Rainer Hurling on 2019-08-22 11:05:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2019-08-22 11:05:06 UTC

Size: 2.43 KB

patch

obsolete

>diff -urN RStudio/Makefile RStudio_patched-rstudio-boost/Makefile
>--- RStudio/Makefile	2019-08-22 08:01:17.969228000 +0200
>+++ RStudio_patched-rstudio-boost/Makefile	2019-08-22 12:58:06.702872000 +0200
>@@ -10,7 +10,8 @@
> CATEGORIES=	devel math java
> MASTER_SITES=	https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \
> 		https://s3.amazonaws.com/rstudio-buildtools/:buildtools
>-DISTFILES=	core-dictionaries.zip:dictionaries \
>+DISTFILES=	boost_1_63_0.tar.bz2:buildtools \
>+		core-dictionaries.zip:dictionaries \
> 		gin-${GIN_VERSION}.zip:buildtools \
> 		gwt-${GWT_VERSION}.zip:buildtools \
> 		mathjax-26.zip:buildtools
>@@ -21,7 +22,7 @@
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BROKEN=		fails to build with boost 1.70, see bug 236603
>+#BROKEN=		fails to build with boost 1.70, see bug 236603
> 
> BUILD_DEPENDS=	ant:devel/apache-ant \
> 		${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo \
>@@ -47,6 +48,7 @@
> 		-DFREEBSD_RSTUDIO_VERSION:STRING=${PORTVERSION} \
> 		-DFREEBSD_LIBDIR:STRING=${PREFIX}/lib
> CMAKE_ARGS+=	-DRSTUDIO_BOOST_SIGNALS_VERSION=2 # until Boost 1.69 or RStudio 1.3
>+CMKAE_ARGS+=	-DRSTUDIO_USE_SYSTEM_BOOST="Yes"
> CMAKE_ARGS+=    -DQT_QMAKE_EXECUTABLE:STRING=${QMAKE}
> MAKE_ENV=	HOME=${WRKDIR} \
> 		ANT_OPTS="-Duser.home=${WRKDIR}"
>@@ -74,6 +76,10 @@
> 		s|rHomePaths.push_back|//rHomePaths.push_back|; \
> 		s|//rHomePaths.push_back(FilePath("/usr/local/lib/|rHomePaths.push_back(FilePath("${PREFIX}/lib/|' \
> 		${WRKSRC}/src/cpp/core/r_util/RVersionsPosix.cpp
>+	@${REINPLACE_CMD} -e 's|/opt/rstudio-tools/boost/boost_1_63_0|${WRKDIR}/boost_1_63_0|g' \
>+		${WRKSRC}/src/cpp/CMakeLists.txt
>+	@${REINPLACE_CMD} -e 's|/opt/rstudio-tools/boost/|${STAGEDIR}${PREFIX}/lib/rstudio/resources/|g' \
>+		${WRKSRC}/dependencies/common/install-boost
> 
> pre-build:
> 	@${CP} ${FILESDIR}/global-setenv.h ${WRKSRC}/src/cpp/desktop/
>diff -urN RStudio/distinfo RStudio_patched-rstudio-boost/distinfo
>--- RStudio/distinfo	2019-03-31 10:54:08.829751000 +0200
>+++ RStudio_patched-rstudio-boost/distinfo	2019-08-21 15:06:01.167464000 +0200
>@@ -1,4 +1,6 @@
>-TIMESTAMP = 1553970166
>+TIMESTAMP = 1566392761
>+SHA256 (boost_1_63_0.tar.bz2) = beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0
>+SIZE (boost_1_63_0.tar.bz2) = 81984414
> SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
> SIZE (core-dictionaries.zip) = 876339
> SHA256 (gin-2.1.2.zip) = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a

Actions: View | Diff

Attachments on bug 236603: 206786