diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-01-05 14:08:03 +0000 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-01-05 14:08:03 +0000 |
commit | eb36aa0c9803a6579fa4c7431c096120c85bc77d (patch) | |
tree | db303c15f5589080a0abdc462a6590f53c615f80 /rules/libpciaccess.make | |
parent | 6f3f202ceceba6bd2203321c9c6f4f468a1a1d5b (diff) | |
download | ptxdist-eb36aa0c9803a6579fa4c7431c096120c85bc77d.tar.gz ptxdist-eb36aa0c9803a6579fa4c7431c096120c85bc77d.tar.xz |
* patches/libpciaccess-0.10.3:
obsolete, mainline has been fixed
* rules/libpciaccess.make:
version bump to 0.10.5, due to builderror with recent new toolchain and kernel headers
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9387 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/libpciaccess.make')
-rw-r--r-- | rules/libpciaccess.make | 66 |
1 files changed, 7 insertions, 59 deletions
diff --git a/rules/libpciaccess.make b/rules/libpciaccess.make index 43922b0c8..e0c5cef73 100644 --- a/rules/libpciaccess.make +++ b/rules/libpciaccess.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_LIBPCIACCESS) += libpciaccess # # Paths and names # -LIBPCIACCESS_VERSION := 0.10.3 +LIBPCIACCESS_VERSION := 0.10.5 LIBPCIACCESS := libpciaccess-$(LIBPCIACCESS_VERSION) LIBPCIACCESS_SUFFIX := tar.bz2 LIBPCIACCESS_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(LIBPCIACCESS).$(LIBPCIACCESS_SUFFIX) @@ -27,42 +27,22 @@ LIBPCIACCESS_DIR := $(BUILDDIR)/$(LIBPCIACCESS) # Get # ---------------------------------------------------------------------------- -libpciaccess_get: $(STATEDIR)/libpciaccess.get - -$(STATEDIR)/libpciaccess.get: $(libpciaccess_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(LIBPCIACCESS_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, LIBPCIACCESS) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -libpciaccess_extract: $(STATEDIR)/libpciaccess.extract - -$(STATEDIR)/libpciaccess.extract: $(libpciaccess_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(LIBPCIACCESS_DIR)) - @$(call extract, LIBPCIACCESS) - @$(call patchin, LIBPCIACCESS) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -libpciaccess_prepare: $(STATEDIR)/libpciaccess.prepare - LIBPCIACCESS_PATH := PATH=$(CROSS_PATH) LIBPCIACCESS_ENV := $(CROSS_ENV) # # autoconf # -LIBPCIACCESS_AUTOCONF := $(CROSS_AUTOCONF_USR) \ +LIBPCIACCESS_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ --disable-dependency-tracking ifdef PTXCONF_LIBPCIACCESS_STATIC @@ -75,44 +55,12 @@ else LIBPCIACCESS_ENV += ac_cv_file__usr_include_asm_mtrr_h=no endif -$(STATEDIR)/libpciaccess.prepare: $(libpciaccess_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(LIBPCIACCESS_DIR)/config.cache) - cd $(LIBPCIACCESS_DIR) && \ - $(LIBPCIACCESS_PATH) $(LIBPCIACCESS_ENV) \ - ./configure $(LIBPCIACCESS_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -libpciaccess_compile: $(STATEDIR)/libpciaccess.compile - -$(STATEDIR)/libpciaccess.compile: $(libpciaccess_compile_deps_default) - @$(call targetinfo, $@) - cd $(LIBPCIACCESS_DIR) && $(LIBPCIACCESS_PATH) $(MAKE) $(PARALLELMFLAGS) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -libpciaccess_install: $(STATEDIR)/libpciaccess.install - -$(STATEDIR)/libpciaccess.install: $(libpciaccess_install_deps_default) - @$(call targetinfo, $@) - @$(call install, LIBPCIACCESS) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -libpciaccess_targetinstall: $(STATEDIR)/libpciaccess.targetinstall - -$(STATEDIR)/libpciaccess.targetinstall: $(libpciaccess_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/libpciaccess.targetinstall: + @$(call targetinfo) ifndef PTXCONF_LIBPCIACCESS_STATIC # only shared libraries are to be installed on the target @@ -136,7 +84,7 @@ ifndef PTXCONF_LIBPCIACCESS_STATIC @$(call install_finish, libpciaccess) endif - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |