Coping with unfinished upstream package split for unixODBC