diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-08-02 21:32:15 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-08-02 21:32:15 +0200 |
| commit | b5292d9d225c3496a45e076fbc6ea8b2b3065e1f (patch) | |
| tree | 9908e176f173246752d7f3b4f2b6895d1abc6456 | |
| parent | 37a50b2dc55022e2bbe3118a84c6be6badb649ef (diff) | |
| parent | feb44bc3ab5f5843847f6d2e58c2519b8367aa96 (diff) | |
| download | ptxdist-b5292d9d225c3496a45e076fbc6ea8b2b3065e1f.tar.gz ptxdist-b5292d9d225c3496a45e076fbc6ea8b2b3065e1f.tar.xz | |
Merge branch 'stable/ptxdist-2010.03.x' of git://git.pengutronix.de/git/ptxdist into stable/ptxdist-2010.06.xstable/ptxdist-2010.06.x
Conflicts:
configure.ac
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | rules/expat.make | 2 | ||||
| -rw-r--r-- | rules/host-xorg-lib-Xfont.make | 3 | ||||
| -rw-r--r-- | rules/sdl.make | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/rules/expat.make b/rules/expat.make index 13401924b..0b788d6b3 100644 --- a/rules/expat.make +++ b/rules/expat.make @@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_EXPAT) += expat # EXPAT_VERSION := 2.0.1 EXPAT := expat-$(EXPAT_VERSION) -EXPAT_SUFFIX := tar.gz +EXPAT_SUFFIX := tar.bz2 EXPAT_URL := $(PTXCONF_SETUP_SFMIRROR)/expat/$(EXPAT).$(EXPAT_SUFFIX) EXPAT_SOURCE := $(SRCDIR)/$(EXPAT).$(EXPAT_SUFFIX) EXPAT_DIR := $(BUILDDIR)/$(EXPAT) diff --git a/rules/host-xorg-lib-Xfont.make b/rules/host-xorg-lib-Xfont.make index 7bd072d4c..d903cf95c 100644 --- a/rules/host-xorg-lib-Xfont.make +++ b/rules/host-xorg-lib-Xfont.make @@ -31,6 +31,7 @@ HOST_XORG_LIB_XFONT_ENV := $(HOST_ENV) # HOST_XORG_LIB_XFONT_AUTOCONF := \ $(HOST_AUTOCONF) \ - --disable-freetype + --disable-freetype \ + --without-xmlto # vim: syntax=make diff --git a/rules/sdl.make b/rules/sdl.make index 89fdef52a..cfde07beb 100644 --- a/rules/sdl.make +++ b/rules/sdl.make @@ -118,7 +118,7 @@ SDL_AUTOCONF += --enable-audio endif else -SDL_LIB_AUTOCONF += --disable-audio +SDL_AUTOCONF += --disable-audio endif ifdef PTXCONF_SDL_VIDEO |