diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2018-04-24 09:53:00 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-04-24 10:21:17 +0200 |
commit | e8216c5837d22368d8e570b14c71516f5877d2b5 (patch) | |
tree | 542e716bc43628d63a0428e5cf2773b2864c9c36 /rules/canfestival.make | |
parent | 9bcaaffeb112959cbcff5ed96715366f23ace092 (diff) | |
download | ptxdist-e8216c5837d22368d8e570b14c71516f5877d2b5.tar.gz ptxdist-e8216c5837d22368d8e570b14c71516f5877d2b5.tar.xz |
CanFestival: version bump 3-20081204-1 -> 3+hg20180126.794
This uses a new snapshot of CanFestival available from the repository
https://hg.beremiz.org/CanFestival-3/ which is the "main repo" according
to https://canfestival.org/code .
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/canfestival.make')
-rw-r--r-- | rules/canfestival.make | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/rules/canfestival.make b/rules/canfestival.make index d8aed433b..80fdbec6a 100644 --- a/rules/canfestival.make +++ b/rules/canfestival.make @@ -19,11 +19,12 @@ endif # # Paths and names # -CANFESTIVAL_VERSION := 3-20081204-1 -CANFESTIVAL_MD5 := 792e225678402dcd026b7b25796d23ad -CANFESTIVAL := CanFestival-$(CANFESTIVAL_VERSION) -CANFESTIVAL_SUFFIX := tar.bz2 -CANFESTIVAL_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(CANFESTIVAL).$(CANFESTIVAL_SUFFIX) +# Taken from https://hg.beremiz.org/CanFestival-3/rev/8bfe0ac00cdb +CANFESTIVAL_VERSION := 3+hg20180126.794 +CANFESTIVAL_MD5 := c97bca1c4a81a17b1a75a1f8d068b2b3 +CANFESTIVAL := canfestival-$(CANFESTIVAL_VERSION) +CANFESTIVAL_SUFFIX := tar.gz +CANFESTIVAL_URL := https://hg.beremiz.org/CanFestival-3/archive/8bfe0ac00cdb.$(CANFESTIVAL_SUFFIX) CANFESTIVAL_SOURCE := $(SRCDIR)/$(CANFESTIVAL).$(CANFESTIVAL_SUFFIX) CANFESTIVAL_DIR := $(BUILDDIR)/$(CANFESTIVAL) @@ -34,18 +35,18 @@ CANFESTIVAL_DIR := $(BUILDDIR)/$(CANFESTIVAL) CANFESTIVAL_PATH := PATH=$(CROSS_PATH) CANFESTIVAL_ENV := $(CROSS_ENV_CC) # Overwrite OPT_CFLAGS instead of CFLAGS so we don't loose other flags -# such as -fPIC for libs. Not this breaks when using "--disable-Ox" +# such as -fPIC for libs. Note this breaks when using "--disable-Ox" CANFESTIVAL_MAKEVARS := OPT_CFLAGS="-isystem $(KERNEL_HEADERS_INCLUDE_DIR) -O2" # # autoconf # -CANFESTIVAL_AUTOCONF := \ +CANFESTIVAL_CONF_TOOL := autoconf +CANFESTIVAL_CONF_OPT := \ --prefix=/usr \ - --can=socket - -ifdef PTXCONF_ENDIAN_BIG -CANFESTIVAL_AUTOCONF += --CANOPEN_BIG_ENDIAN=1 -endif + --can=socket \ + --timers=unix \ + --wx=0 \ + $(call ptx/ifdef,PTXCONF_ENDIAN_BIG,--CANOPEN_BIG_ENDIAN=1) \ # ---------------------------------------------------------------------------- # Install |