On Mon, Apr 11, 2016 at 8:40 PM, Steven Chamberlain <ste...@pyro.eu.org> wrote:
> Tobias Frost wrote:
> I notice there is already a patch for this called
> kfreebsd_no_machine_cpufunc.h.patch
> although, you still had it applied for that build:
That's correct and previously it worked. Please see that 2.4.26 built
on kfreebsd-i386 and on kfreebsd-amd64 already. Only when it was
binNMUed failed on kfreebsd-i386.
> It patches vice-2.3.dfsg/configure.proto (what is that?) and not
> configure.ac; and I imagine the latter one is being used now.
Please see Makefile.am:
-- cut --
$(top_srcdir)/configure.ac: $(top_srcdir)/configure.proto
$(am__cd) $(srcdir) && $(SHELL) autogen.sh
-- cut --
As such, for configure.ac autogen.sh is used, which contains this:
-- cut --
if test x"$configure_needs_ac" = "xyes"; then
sed s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g
<configure.proto >configure.ac
else
cp configure.proto configure.ac
fi
-- cut --
This means configure.proto just copied over configure.ac or 'sed' is
used for substitution to generate configure.ac from the former. This
means any patching of configure.ac will be lost and thus not needed.
The patch is used to prevent the header error, on kFreeBSD
architectures it has an empty case (skip that header); on other
architectures it looks for that cpufunc.h header:
-- cut --
- AC_CHECK_HEADERS(unistd.h sys/io.h machine/pio.h machine/cpufunc.h)
+ AC_CHECK_HEADERS(unistd.h sys/io.h machine/pio.h)
+ case "$host_os" in
+ *kfreebsd*)
+ ;;
+ *)
+ AC_CHECK_HEADERS(machine/cpufunc.h)
+ ;;
+ esac
-- cut --
Still seems to be the correct way for me.
Regards,
Laszlo/GCS
