Fix fbthrift build in setup-*.sh (facebookincubator#9204)

assignUser · facebook-github-bot · commit 3aa020dff2dd · 2024-03-25T18:09:38.000-07:00
Summary: In the new fbthrift version from facebookincubator#8950 a command fails if `BUILD_SHARED_LIBS` is not explicitly set (because its empty by default). This PR explicitly sets BUILD_SHARED_LIBS when building fbthrift and also uses the correct flag to disable tests in addition to the default cmake one. Pull Request resolved: facebookincubator#9204 Reviewed By: kevinwilfong Differential Revision: D55337270 Pulled By: pedroerp fbshipit-source-id: 6d77d10e5a1ed0379f52177edf8753246b1e8a6e
diff --git a/scripts/setup-centos8.sh b/scripts/setup-centos8.sh
@@ -145,7 +145,7 @@ function install_fbthrift {
   wget_and_untar https://github.com/facebook/fbthrift/archive/refs/tags/${FB_OS_VERSION}.tar.gz fbthrift
   (
     cd fbthrift
-    cmake_install -Denable_tests=OFF
+    cmake_install -Denable_tests=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF
   )
 }
 
diff --git a/scripts/setup-macos.sh b/scripts/setup-macos.sh
@@ -97,7 +97,7 @@ function install_mvfst {
 
 function install_fbthrift {
   github_checkout facebook/fbthrift "${FB_OS_VERSION}"
-  cmake_install -DBUILD_TESTS=OFF
+  cmake_install -Denable_tests=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF
 }
 
 function install_double_conversion {
diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
@@ -102,7 +102,7 @@ function install_mvfst {
 
 function install_fbthrift {
   github_checkout facebook/fbthrift "${FB_OS_VERSION}"
-  cmake_install -DBUILD_TESTS=OFF
+  cmake_install -Denable_tests=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF
 }
 
 function install_conda {

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ function install_fbthrift {`
`145`	`145`	`wget_and_untar https://github.com/facebook/fbthrift/archive/refs/tags/${FB_OS_VERSION}.tar.gz fbthrift`
`146`	`146`	`(`
`147`	`147`	`cd fbthrift`
`148`		`- cmake_install -Denable_tests=OFF`
	`148`	`+ cmake_install -Denable_tests=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF`
`149`	`149`	`)`
`150`	`150`	`}`
`151`	`151`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ function install_mvfst {`
`97`	`97`
`98`	`98`	`function install_fbthrift {`
`99`	`99`	`github_checkout facebook/fbthrift "${FB_OS_VERSION}"`
`100`		`- cmake_install -DBUILD_TESTS=OFF`
	`100`	`+ cmake_install -Denable_tests=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`function install_double_conversion {`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ function install_mvfst {`
`102`	`102`
`103`	`103`	`function install_fbthrift {`
`104`	`104`	`github_checkout facebook/fbthrift "${FB_OS_VERSION}"`
`105`		`- cmake_install -DBUILD_TESTS=OFF`
	`105`	`+ cmake_install -Denable_tests=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`function install_conda {`