diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-09-03 08:24:35 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-09-03 08:24:35 +0000 |
| commit | 95b0cfea488b88973fdaeeeaee3c8592abe49708 (patch) | |
| tree | a93521fe5b65d2d5fed339609672e0464dde816f /rules/slang.make | |
| parent | 60986c4045ce58fef07c91fe3323c1b59c713824 (diff) | |
| download | ptxdist-95b0cfea488b88973fdaeeeaee3c8592abe49708.tar.gz ptxdist-95b0cfea488b88973fdaeeeaee3c8592abe49708.tar.xz | |
* slang: update version to latest, because it compiles for the wrong architecture (i386)
* slang: fix dependencies, because the crappy autoconf-without-automake scripts don't work correctly
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7271 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/slang.make')
| -rw-r--r-- | rules/slang.make | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/rules/slang.make b/rules/slang.make index 32c82fd70..dba49c432 100644 --- a/rules/slang.make +++ b/rules/slang.make @@ -2,7 +2,8 @@ # $Id$ # # Copyright (C) 2003 by Benedikt Spranger -# +# Copyright (C) 2007 by Robert Schwebel +# # See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions @@ -17,13 +18,12 @@ PACKAGES-$(PTXCONF_SLANG) += slang # # Paths and names # -SLANG_VERSION = 1.4.9 -SLANG = slang-$(SLANG_VERSION) -SLANG_SUFFIX = tar.bz2 -SLANG_URL = ftp://space.mit.edu/pub/davis/slang/v1.4/$(SLANG).$(SLANG_SUFFIX) -SLANG_SOURCE = $(SRCDIR)/$(SLANG).$(SLANG_SUFFIX) -SLANG_DIR = $(BUILDDIR)/$(SLANG) - +SLANG_VERSION := 2.1.1 +SLANG := slang-$(SLANG_VERSION) +SLANG_SUFFIX := tar.bz2 +SLANG_URL := ftp://space.mit.edu/pub/davis/slang/v2.1/$(SLANG).$(SLANG_SUFFIX) +SLANG_SOURCE := $(SRCDIR)/$(SLANG).$(SLANG_SUFFIX) +SLANG_DIR := $(BUILDDIR)/$(SLANG) # ---------------------------------------------------------------------------- # Get @@ -58,13 +58,16 @@ $(STATEDIR)/slang.extract: $(slang_extract_deps_default) slang_prepare: $(STATEDIR)/slang.prepare -SLANG_PATH = PATH=$(CROSS_PATH) -SLANG_ENV = $(CROSS_ENV) +SLANG_PATH := PATH=$(CROSS_PATH) +SLANG_ENV := $(CROSS_ENV) # # autoconf # -SLANG_AUTOCONF = $(CROSS_AUTOCONF_USR) +SLANG_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + --with-png=$(SYSROOT)/usr \ + --with-iconv=$(SYSROOT)/usr $(STATEDIR)/slang.prepare: $(slang_prepare_deps_default) @$(call targetinfo, $@) @@ -82,7 +85,7 @@ slang_compile: $(STATEDIR)/slang.compile $(STATEDIR)/slang.compile: $(slang_compile_deps_default) @$(call targetinfo, $@) - cd $(SLANG_DIR) && $(SLANG_PATH) make elf + cd $(SLANG_DIR) && $(SLANG_PATH) $(MAKE) elf $(PARALLELMFLAGS) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -105,7 +108,7 @@ slang_targetinstall: $(STATEDIR)/slang.targetinstall $(STATEDIR)/slang.targetinstall: $(slang_targetinstall_deps_default) @$(call targetinfo, $@) - @$(call install_init, slang) + @$(call install_init, slang) @$(call install_fixup, slang,PACKAGE,slang) @$(call install_fixup, slang,PRIORITY,optional) @$(call install_fixup, slang,VERSION,$(SLANG_VERSION)) @@ -113,7 +116,7 @@ $(STATEDIR)/slang.targetinstall: $(slang_targetinstall_deps_default) @$(call install_fixup, slang,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") @$(call install_fixup, slang,DEPENDS,) @$(call install_fixup, slang,DESCRIPTION,missing) - + @$(call install_copy, slang, 0, 0, 0644, \ $(SLANG_DIR)/src/elfobjs/libslang.so.$(SLANG_VERSION), \ /usr/lib/libslang.so.$(SLANG_VERSION)) @@ -134,3 +137,4 @@ slang_clean: rm -rf $(SLANG_DIR) # vim: syntax=make + |