Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add missing boost include required for BOOST_PP_IF #2198

Closed
wants to merge 1 commit into from

Conversation

mhx
Copy link
Contributor

@mhx mhx commented May 12, 2024

No description provided.

@facebook-github-bot
Copy link
Contributor

@Orvid has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@donsbot
Copy link

donsbot commented May 14, 2024

This broke the Glean downstream build as well.

/usr/bin/c++ -DBOOST_ALL_NO_LIB -DBOOST_ATOMIC_DYN_LINK -DBOOST_CONTEXT_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_REGEX_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_THREAD_DYN_LINK -DFMT_SHARED -DFOLLY_XLOG_STRIP_PREFIXES=\"/tmp/fbcode_builder_getdeps-ZhomeZdonsZGleanZhsthriftZbuildZfbcode_builder/repos/github.com-facebook-folly.git:/tmp/fbcode_builder_getdeps-ZhomeZdonsZGleanZhsthriftZbuildZfbcode_builder/build/folly\" -DGFLAGS_IS_A_DLL=0 -D_GNU_SOURCE -D_REENTRANT -I/tmp/fbcode_builder_getdeps-ZhomeZdonsZGleanZhsthriftZbuildZfbcode_builder/repos/github.com-facebook-folly.git -I. -I/usr/include/libdwarf -I/usr/include/libiberty -I/home/dons/.hsthrift/include -fsized-deallocation -O2 -g -DNDEBUG -fPIC -g -finput-charset=UTF-8 -fsigned-char -Wall -Wno-deprecated -Wno-deprecated-declarations -Wno-sign-compare -Wno-unused -Wuninitialized -Wunused-label -Wunused-result -Wno-noexcept-type -Wno-nullability-completeness -Wno-inconsistent-missing-override -faligned-new -fopenmp -std=gnu++17 -MD -MT CMakeFiles/folly_base.dir/folly/io/async/AsyncSocket.cpp.o -MF CMakeFiles/folly_base.dir/folly/io/async/AsyncSocket.cpp.o.d -o CMakeFiles/folly_base.dir/folly/io/async/AsyncSocket.cpp.o -c /tmp/fbcode_builder_getdeps-ZhomeZdonsZGleanZhsthriftZbuildZfbcode_builder/repos/github.com-facebook-folly.git/folly/io/async/AsyncSocket.cpp
/tmp/fbcode_builder_getdeps-ZhomeZdonsZGleanZhsthriftZbuildZfbcode_builder/repos/github.com-facebook-folly.git/folly/io/async/AsyncSocket.cpp:1733:15: error: use of undeclared identifier 'BOOST_PP_IF'
    iovec vec[BOOST_PP_IF(FOLLY_HAVE_VLA_01, count, kSmallIoVecSize)];
              ^
/tmp/fbcode_builder_getdeps-ZhomeZdonsZGleanZhsthriftZbuildZfbcode_builder/repos/github.com-facebook-folly.git/folly/io/async/AsyncSocket.cpp:3774:18: error: use of undeclared identifier 'BOOST_PP_IF'
    iovec tmpVec[BOOST_PP_IF(FOLLY_HAVE_VLA_01, count, kSmallIoVecSize)];

@luislobo
Copy link

Watchman is failing I think because of this:

/repos/github.com-facebook-folly.git/folly/io/async/AsyncSocket.cpp:3783:9: error: ‘tmpVec’ was not declared in this scope
 3783 |         tmpVec,
      |         ^~~~~~
[11/152] Building CXX object CMakeFiles/folly_base.dir/folly/io/async/Request.cpp.o

@Orvid
Copy link
Contributor

Orvid commented May 14, 2024

I just need a stamp on the internal Diff and then I can land this and get things building again.

This was caused by some automated tooling not realizing that this include was in-fact used.

@luislobo
Copy link

I just tested it modifying the temporary clone watchman creates and it did continue, but now erroring on:

/tmp/fbcode_builder_getdeps-ZhomeZluis.lobo@epicio.comZDownloadsZwatchman-2024.05.13.00ZbuildZfbcode_builder/repos/github.com-facebook-folly.git/folly/FBString.h:444:20: error: ‘category’ was not declared in this scope
  444 |     ptr = (category() == Category::isSmall) ? small_ : ptr;
      |            ~~~~~~~~^~
ninja: build stopped: subcommand failed.
Command '['/usr/bin/cmake', '--build', '/tmp/fbcode_builder_getdeps-ZhomeZluis.lobo@epicio.comZDownloadsZwatchman-2024.05.13.00ZbuildZfbcode_builder/build/folly', '--target', 'install', '--config', 'RelWithDebInfo', '-j', '6']' returned non-zero exit status 1.
!! Failed

is it related?

@Orvid
Copy link
Contributor

Orvid commented May 22, 2024

Looks like I was too slow in landing the internal version of this, so someone else landed a6925ca, which does the same thing as this fix.

@Orvid Orvid closed this May 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants