mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-02 09:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: always build wayland-scanner

Browse source 
The previous idiom for building a cross-compiled Wayland is to build once for
the build host (with --enable-scanner --disable-libraries) to get a
wayland-scanner binary that can then be used in a cross-compile (with
--disable-scanner).  The problem with this is that the cross wayland is missing
a wayland-scanner binary, which means you then can't do any Wayland development
on the target.

Instead, always build wayland-scanner for the target and change
--enable/disable-scanner to --with/without-host-scanner.  Normal builds use the
default of --without-host-scanner and run the wayland-scanner it just built, and
cross-compiled builds pass --with-host-scanner to use a previously built host
scanner but still get a wayland-scanner to install.

(a theoretically neater solution would be to build two scanners if required (one
to run and one to install), but automake makes this overly complicated)

[daniels: Bikeshedded naming with Ross's OK.]

Signed-off-by: Ross Burton <ross.burton@intel.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Ross Burton 2015-07-01 22:51:01 +01:00 • committed by Daniel Stone
parent ba731f951c
commit 21f80b8982
2 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Makefile.am
View file

@ -22,16 +22,17 @@ dist_pkgdata_DATA = \
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = pkgconfig_DATA =
if ENABLE_SCANNER
wayland_scanner = $(top_builddir)/wayland-scanner
bin_PROGRAMS = wayland-scanner bin_PROGRAMS = wayland-scanner
wayland_scanner_SOURCES = src/scanner.c wayland_scanner_SOURCES = src/scanner.c
wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(AM_CFLAGS) wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(AM_CFLAGS)
wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
$(BUILT_SOURCES) : wayland-scanner
pkgconfig_DATA += src/wayland-scanner.pc pkgconfig_DATA += src/wayland-scanner.pc
else
if USE_HOST_SCANNER
wayland_scanner = wayland-scanner wayland_scanner = wayland-scanner
else
$(BUILT_SOURCES) : wayland-scanner
wayland_scanner = $(top_builddir)/wayland-scanner
endif endif
libwayland_util_la_CFLAGS = $(AM_CFLAGS) libwayland_util_la_CFLAGS = $(AM_CFLAGS)

32
configure.ac
View file

@ -59,11 +59,11 @@ AC_ARG_ENABLE([libraries],
[], [],
[enable_libraries=yes]) [enable_libraries=yes])
AC_ARG_ENABLE([scanner], AC_ARG_WITH([host-scanner],
[AC_HELP_STRING([--disable-scanner], [AC_HELP_STRING([--with-host-scanner],
[Disable compilation of wayland-scanner])], [Use installed wayland-scanner from host PATH during build])],
[], [],
[enable_scanner=yes]) [with_host_scanner=no])
AC_ARG_ENABLE([documentation], AC_ARG_ENABLE([documentation],
[AC_HELP_STRING([--disable-documentation], [AC_HELP_STRING([--disable-documentation],
@ -71,7 +71,7 @@ AC_ARG_ENABLE([documentation],
[], [],
[enable_documentation=yes]) [enable_documentation=yes])
AM_CONDITIONAL(ENABLE_SCANNER, test "x$enable_scanner" = xyes) AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes) AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes)
@ -94,18 +94,16 @@ if test "x$enable_libraries" = "xyes"; then
AC_CHECK_HEADERS([execinfo.h]) AC_CHECK_HEADERS([execinfo.h])
fi fi
if test "x$enable_scanner" = "xyes"; then PKG_CHECK_MODULES(EXPAT, [expat], [],
PKG_CHECK_MODULES(EXPAT, [expat], [], [AC_CHECK_HEADERS(expat.h, [],
[AC_CHECK_HEADERS(expat.h, [], [AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
[AC_MSG_ERROR([Can't find expat.h. Please install expat.])]) SAVE_LIBS="$LIBS"
SAVE_LIBS="$LIBS" AC_SEARCH_LIBS(XML_ParserCreate, expat, [],
AC_SEARCH_LIBS(XML_ParserCreate, expat, [], [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
[AC_MSG_ERROR([Can't find expat library. Please install expat.])]) EXPAT_LIBS="$LIBS"
EXPAT_LIBS="$LIBS" LIBS="$SAVE_LIBS"
LIBS="$SAVE_LIBS" AC_SUBST(EXPAT_LIBS)
AC_SUBST(EXPAT_LIBS) ])
])
fi
AC_PATH_PROG(XSLTPROC, xsltproc) AC_PATH_PROG(XSLTPROC, xsltproc)
AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"]) AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"])