diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-10-30 22:10:17 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-10-30 22:10:17 +0000 |
| commit | c2f4774694e99914acc53d876fe91353b7c9b2a1 (patch) | |
| tree | e00ebac776c5940850b4458772d841538f8e23a4 /package/haserl | |
| parent | 10031a1fd1c9cbd5ad073df61135f91228b4c5c2 (diff) | |
Allow use of 'haserl' developer version
Diffstat (limited to 'package/haserl')
| -rw-r--r-- | package/haserl/Config.in | 25 | ||||
| -rw-r--r-- | package/haserl/haserl-0.9.20-legacy.patch | 12 | ||||
| -rw-r--r-- | package/haserl/haserl.mk | 9 |
3 files changed, 42 insertions, 4 deletions
diff --git a/package/haserl/Config.in b/package/haserl/Config.in index 54fe856f0..c721daa89 100644 --- a/package/haserl/Config.in +++ b/package/haserl/Config.in @@ -7,3 +7,28 @@ config BR2_PACKAGE_HASERL where something like PHP is too big. http://haserl.sourceforge.net/ + +choice + prompt "Haserl version" + default BR2_PACKAGE_HASERL_VERSION_0_9_20 + depends on BR2_PACKAGE_HASERL + help + Select the older stable version, or the newer developer version + +config BR2_PACKAGE_HASERL_VERSION_0_8_0 + bool "v 0.8.0" + help + stable version + +config BR2_PACKAGE_HASERL_VERSION_0_9_20 + bool "v 0.9.20" + help + developer version - seems OK though + +endchoice + + +config BR2_PACKAGE_HASERL_VERSION + string + default "0.8.0" if BR2_PACKAGE_HASERL_VERSION_0_8_0 + default "0.9.20" if BR2_PACKAGE_HASERL_VERSION_0_9_20 diff --git a/package/haserl/haserl-0.9.20-legacy.patch b/package/haserl/haserl-0.9.20-legacy.patch new file mode 100644 index 000000000..a8a93ac7e --- /dev/null +++ b/package/haserl/haserl-0.9.20-legacy.patch @@ -0,0 +1,12 @@ +diff -urN haserl-0.9.20-0rig/src/haserl.c haserl-0.9.20/src/haserl.c +--- haserl-0.9.20-0rig/src/haserl.c 2007-10-30 22:58:00.000000000 +0100 ++++ haserl-0.9.20/src/haserl.c 2007-10-30 23:00:10.000000000 +0100 +@@ -210,7 +210,7 @@ + } + memcpy ((char *) (entry + strlen (prefix)), str, strlen (str)); + +- keylen = (size_t) (index (entry, '=') - entry); ++ keylen = (size_t) (strchr (entry, '=') - entry); + + if (keylen <= 0) + { diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk index ccde75cc9..9aca06060 100644 --- a/package/haserl/haserl.mk +++ b/package/haserl/haserl.mk @@ -4,10 +4,11 @@ # ############################################################# -HASERL_VERSION=0.8.0 -HASERL_SOURCE=haserl-$(HASERL_VERSION).tar.gz -HASERL_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/ -HASERL_DIR=$(BUILD_DIR)/haserl-$(HASERL_VERSION) +HASERL_VERSION:=$(strip $(subst ",,$(BR2_PACKAGE_HASERL_VERSION))) +#")) +HASERL_SOURCE:=haserl-$(HASERL_VERSION).tar.gz +HASERL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/ +HASERL_DIR:=$(BUILD_DIR)/haserl-$(HASERL_VERSION) HASERL_CAT:=$(ZCAT) $(DL_DIR)/$(HASERL_SOURCE): |