summaryrefslogtreecommitdiffstats
path: root/rules/libpciaccess.make
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2012-06-12 22:19:25 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2012-06-13 00:24:25 +0200
commit4667507d976fd4f07b42ce8947530d56fdb59b08 (patch)
treead52b672c703e354b96c9c07f5ce1e1dbf8f17e0 /rules/libpciaccess.make
parenta6d0372a8f308edcd71978b7493e2be8f1f8ace5 (diff)
downloadptxdist-4667507d976fd4f07b42ce8947530d56fdb59b08.tar.gz
ptxdist-4667507d976fd4f07b42ce8947530d56fdb59b08.tar.xz
libpciaccess: version bump 0.12.0 -> 0.13.1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/libpciaccess.make')
-rw-r--r--rules/libpciaccess.make37
1 files changed, 14 insertions, 23 deletions
diff --git a/rules/libpciaccess.make b/rules/libpciaccess.make
index ad122235d..fa14f60c1 100644
--- a/rules/libpciaccess.make
+++ b/rules/libpciaccess.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBPCIACCESS) += libpciaccess
#
# Paths and names
#
-LIBPCIACCESS_VERSION := 0.12.0
-LIBPCIACCESS_MD5 := 285e07976274572e1f1e68edee09b70a
+LIBPCIACCESS_VERSION := 0.13.1
+LIBPCIACCESS_MD5 := 399a419ac6a54f0fc07c69c9bdf452dc
LIBPCIACCESS := libpciaccess-$(LIBPCIACCESS_VERSION)
LIBPCIACCESS_SUFFIX := tar.bz2
LIBPCIACCESS_URL := $(call ptx/mirror, XORG, individual/lib/$(LIBPCIACCESS).$(LIBPCIACCESS_SUFFIX))
@@ -25,35 +25,26 @@ LIBPCIACCESS_SOURCE := $(SRCDIR)/$(LIBPCIACCESS).$(LIBPCIACCESS_SUFFIX)
LIBPCIACCESS_DIR := $(BUILDDIR)/$(LIBPCIACCESS)
# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(LIBPCIACCESS_SOURCE):
- @$(call targetinfo)
- @$(call get, LIBPCIACCESS)
-
-# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
-LIBPCIACCESS_PATH := PATH=$(CROSS_PATH)
-LIBPCIACCESS_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-LIBPCIACCESS_AUTOCONF := $(CROSS_AUTOCONF_USR)
-
-ifdef PTXCONF_LIBPCIACCESS_STATIC
-LIBPCIACCESS_AUTOCONF += --enable-shared=no
-endif
+LIBPCIACCESS_CONF_ENV := $(CROSS_ENV)
ifdef PTXCONF_LIBPCIACCESS_MTRR
-LIBPCIACCESS_ENV += ac_cv_file__usr_include_asm_mtrr_h=yes
+LIBPCIACCESS_CONF_ENV += ac_cv_file__usr_include_asm_mtrr_h=yes
else
-LIBPCIACCESS_ENV += ac_cv_file__usr_include_asm_mtrr_h=no
+LIBPCIACCESS_CONF_ENV += ac_cv_file__usr_include_asm_mtrr_h=no
endif
+#
+# autoconf
+#
+LIBPCIACCESS_CONF_TOOL := autoconf
+LIBPCIACCESS_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --$(call ptx/endis, PTXCONF_LIBPCIACCESS_STATIC)-static \
+ --$(call ptx/disen, PTXCONF_LIBPCIACCESS_STATIC)-shared \
+
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------