status/workaround for “error: undef’d ref to ‘CPlatform::CreateInstance()'”?

I’m building kodi/master on linux/64,

Code:
    git log | head
        commit af8af7ca1031282f20260362985138249b5acf14
        Merge: fd00a12 241b148
        Author: Martijn Kaijser <[email protected]>
        Date:   Sun Nov 6 22:18:15 2016 +0100

            Merge pull request #10876 from phil65/reset_videocodecinfo

            [videoplayer] reset VideoCodecInfo in CProcessInfo constructor

        commit fd00a12a838810e1575cfd8861dc3039e5dbfdf5

configure + build looks ok, until late linking steps.

currently fails at

Code:
    ...
    [100%] Linking CXX executable kodi.bin
    /usr/bin/cmake -E cmake_link_script CMakeFiles/kodi.dir/link.txt --verbose=1
    /dev/src/kodi/build/build/ffmpeg-link-wrapper /usr/bin/g++  -O3 -Wall -fstack-protector -funwind-tables -fasynchronous-unwind-tables -fmessage-length=0 -grecord-gcc-switches -march=native -mtune=native -std=c++11 -I/usr/include/freetype2 -I/usr/local/include -O3 -DNDEBUG -s  -L/usr/local/lib64 -Wl,-rpath,/usr/local/lib64 -fuse-ld=gold CMakeFiles/kodi.dir/dev/src/kodi/xbmc/platform/posix/main.cpp.o -o kodi.bin -rdynamic -Wl,--whole-archive build/upnp/libupnp.a build/unrarxlib/libunrarxlib.a build/swig/libpython_binding.a -Wl,--no-whole-archive libkodi.a build/upnp/libupnp.a build/unrarxlib/libunrarxlib.a build/swig/libpython_binding.a -lpthread -lsqlite3 -lfreetype /usr/local/lib64/libpcrecpp.so /usr/local/lib64/libpcre.so build/libdvd/lib/libdvdnav.a build/libdvd/lib/libdvdread.a build/libdvd/lib/libdvdcss.a -ltinyxml -lpython2.7 -lyajl -llzo2 -lfribidi -ltag build/lib/libcrossguid.a -luuid -lz /usr/local/lib64/libmicrohttpd.so -lgcrypt -lgpg-error -lrt /usr/local/mariadb/lib64/libmysqlclient.so /usr/local/lib64/libssh.so -lxslt -lxml2 -lasound -ludev -ldbus-1 /usr/local/lib64/libvdpau.so -lva -lva-x11 /usr/local/ssl/lib64/libssl.so /usr/local/ssl/lib64/libcrypto.so -lcdio -lGL -lGLU -lX11 -lXext -ldrm -lXrandr -lEGL -ldl -Wl,-rpath,/usr/local/lib64:/usr/local/mariadb/lib64:/usr/local/ssl/lib64
    libkodi.a(ServiceManager.cpp.o):ServiceManager.cpp:function CServiceManager::Init1(): error: undefined reference to 'CPlatform::CreateInstance()'
    collect2: error: ld returned 1 exit status
    CMakeFiles/kodi.dir/build.make:142: recipe for target 'kodi.bin' failed
    gmake[2]: *** [kodi.bin] Error 1
    gmake[2]: Leaving directory '/dev/src/kodi/build'
    CMakeFiles/Makefile2:423: recipe for target 'CMakeFiles/kodi.dir/all' failed
    gmake[1]: *** [CMakeFiles/kodi.dir/all] Error 2
    gmake[1]: Leaving directory '/dev/src/kodi/build'
    Makefile:130: recipe for target 'all' failed
    gmake: *** [all] Error 2

Digging around re:

Code:
    CServiceManager::Init1(): error: undefined reference to 'CPlatform::CreateInstance()'

I think this is causing my issue

Code:
    [platform] - add unique hardware identifier as info label #10543
     https://github.com/xbmc/xbmc/pull/10543#issuecomment-249412529

That thread ends,

Code:
    https://github.com/xbmc/xbmc/pull/10543#issuecomment-255586521
        "... This code is not merged and likely will not be merged until both a team consensus on scope and size and a public involvement on the forum has taken place.  ..."

Assuming that’s the relevant issue here (is it?), until it’s resolved, what’s the workaround for now?

IS there a cmd-line config, or manual edit, that’ll fix this?

Or do I need to drop back to a particular source rev?