On 3 Mar 2017, at 18:27, Oleg V. Nauman <o...@opentransfer.com> wrote: > > On Thursday 02 March 2017 20:49:44 Dimitry Andric wrote: >> Author: dim > > Hello Dimitry, > >> Date: Thu Mar 2 20:49:40 2017 >> New Revision: 314564 >> URL: https://svnweb.freebsd.org/changeset/base/314564 >> >> Log: >> Upgrade our copies of clang, llvm, lld, lldb, compiler-rt and libc++ to >> 4.0.0 (branches/release_40 296509). The release will follow soon. >> > > [skip] > >> Modified: head/ObsoleteFiles.inc >> ============================================================================ >> == --- head/ObsoleteFiles.inc Thu Mar 2 18:07:19 2017 >> (r314563) >> +++ head/ObsoleteFiles.inc Thu Mar 2 20:49:40 2017 (r314564) >> @@ -38,6 +38,119 @@ >> # xargs -n1 | sort | uniq -d; >> # done >> >> +# 20170302: new libc++ import which bumps version from 3.9.1 to 4.0.0. >> +OLD_FILES+=usr/include/c++/v1/__undef___deallocate >> +OLD_FILES+=usr/include/c++/v1/tr1/__undef___deallocate > > Is it was intenional? > www/firefox-esr fails to configure then : > > configure:10508: checking whether the C++ compiler (c++ -O2 -pipe -march=core2 > -O3 -DLIBICONV_PLUG -fstack-protector -fno-strict-aliasing -DLIBICONV_PLUG - > fno-exceptions -fno-strict-aliasing -fno-rtti -L/usr/local/lib -Wl,- > rpath,/usr/local/lib/firefox -Wl,--as-needed -fstack-protector -Wl,- > z,noexecstack -Wl,-z,text) actually is a C++ compiler > configure:10527: c++ -o conftest -O2 -pipe -march=core2 -O3 -DLIBICONV_PLUG - > fstack-protector -fno-strict-aliasing -DLIBICONV_PLUG -fno-exceptions -fno- > strict-aliasing -fno-rtti -Qunused-arguments -isystem/usr/local/include - > DLIBICONV_PLUG -L/usr/local/lib -Wl,-rpath,/usr/local/lib/firefox -Wl,--as- > needed -fstack-protector -Wl,-z,noexecstack -Wl,-z,text conftest.C 1>&5 > In file included from configure:10521: > /usr/include/c++/v1/new:73:10: fatal error: '__undef___deallocate' file not > found > #include <__undef___deallocate> > ^ > 1 error generated.
Did you actually install the new world before running "make delete-old"? In the libc++ 4.0.0 version of /usr/include/c++/v1/new, there is no "#include <__undef___deallocate>" statement at line 73 [1]. The header was removed upstream here: https://reviews.llvm.org/rL291332 -Dimitry [1] https://svnweb.freebsd.org/base/head/contrib/libc%2B%2B/include/new?revision=314564&view=markup#l73
signature.asc
Description: Message signed with OpenPGP