skip unneeded patch; enable c++