diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-02-25 18:17:08 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-02-26 21:04:11 +0100 |
| commit | 5a39b605c77fd01f3bffe0218c6d8de45b1ee353 (patch) | |
| tree | 156e56e6ab76402c7a25be30b86302e4b0ff0d5d /rules/host-xorg-server.make | |
| parent | c08e373c50c27238dbbf4d40fab226ed24eb4f2e (diff) | |
| download | ptxdist-5a39b605c77fd01f3bffe0218c6d8de45b1ee353.tar.gz ptxdist-5a39b605c77fd01f3bffe0218c6d8de45b1ee353.tar.xz | |
[host-xorg-server] better fix to avoid patching
This is a improved version of 79c90508b9749b5bcd7d33ed461c6dad46615d40.
By defining "HOST_XORG_SERVER = host-$(XORG_SERVER)" patching and
autogen_gen will look for patches in "..../patches/host-$(XORG_SERVER)" as
we don't have that directory we're not patched and the autogen_gen
script woudn'd create a dependency.
That dependency would cause a circular dep loop, because host-xorg-server
provides m4 files and this is a dependee for "$(STATEDIR)/autogen-tools".
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'rules/host-xorg-server.make')
| -rw-r--r-- | rules/host-xorg-server.make | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/rules/host-xorg-server.make b/rules/host-xorg-server.make index 2600c3c2e..252ca42c5 100644 --- a/rules/host-xorg-server.make +++ b/rules/host-xorg-server.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2009 by Michael Olbrich <m.olbrich@pengutronix.de> +# 2010 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -18,25 +19,19 @@ HOST_PACKAGES-$(PTXCONF_HOST_XORG_SERVER) += host-xorg-server # HOST_XORG_SERVER_DIR = $(HOST_BUILDDIR)/$(XORG_SERVER) +# +# well, well, what can I say: HACK-warning +# +# this way we fool the patching not to patch us +# and the autogen_dep script, not to run autogen on us +# +HOST_XORG_SERVER = host-$(XORG_SERVER) + ifdef PTXCONF_HOST_XORG_SERVER $(STATEDIR)/autogen-tools: $(STATEDIR)/host-xorg-server.install endif # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -# -# special extract stage without patchin, we don't need the patches and -# cannot autoreconf, because the autotools are not build yet -# -$(STATEDIR)/host-xorg-server.extract: - @$(call targetinfo) - @$(call clean, $(HOST_XORG_SERVER_DIR)) - @$(call extract, HOST_XORG_SERVER, $(HOST_BUILDDIR)) - @$(call touch) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- |