Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] svn commit: trunk/buildroot/package/haserl
@ 2008-04-07  7:59 jacmet at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-04-07  7:59 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-04-07 00:59:08 -0700 (Mon, 07 Apr 2008)
New Revision: 21662

Log:
haserl: bump version


Removed:
   trunk/buildroot/package/haserl/haserl-0.9.22-susv3-legacy.patch

Modified:
   trunk/buildroot/package/haserl/Config.in


Changeset:
Modified: trunk/buildroot/package/haserl/Config.in
===================================================================
--- trunk/buildroot/package/haserl/Config.in	2008-04-07 07:59:03 UTC (rev 21661)
+++ trunk/buildroot/package/haserl/Config.in	2008-04-07 07:59:08 UTC (rev 21662)
@@ -31,4 +31,4 @@
 config BR2_PACKAGE_HASERL_VERSION
 	string
 	default "0.8.0"		if BR2_PACKAGE_HASERL_VERSION_0_8_X
-	default "0.9.22"	if BR2_PACKAGE_HASERL_VERSION_0_9_X
+	default "0.9.23"	if BR2_PACKAGE_HASERL_VERSION_0_9_X

Deleted: trunk/buildroot/package/haserl/haserl-0.9.22-susv3-legacy.patch
===================================================================
--- trunk/buildroot/package/haserl/haserl-0.9.22-susv3-legacy.patch	2008-04-07 07:59:03 UTC (rev 21661)
+++ trunk/buildroot/package/haserl/haserl-0.9.22-susv3-legacy.patch	2008-04-07 07:59:08 UTC (rev 21662)
@@ -1,12 +0,0 @@
-diff -urN haserl-0.9.21-0rig/src/haserl.c haserl-0.9.21/src/haserl.c
---- haserl-0.9.21-0rig/src/haserl.c	2007-12-13 22:58:00.000000000 +0100
-+++ haserl-0.9.21/src/haserl.c	2007-12-13 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)
-     {

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/haserl
@ 2008-12-17 12:40 jacmet at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-12-17 12:40 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-12-17 04:40:50 -0800 (Wed, 17 Dec 2008)
New Revision: 24439

Log:
haserl: bump version

Modified:
   trunk/buildroot/package/haserl/Config.in


Changeset:
Modified: trunk/buildroot/package/haserl/Config.in
===================================================================
--- trunk/buildroot/package/haserl/Config.in	2008-12-17 10:32:06 UTC (rev 24438)
+++ trunk/buildroot/package/haserl/Config.in	2008-12-17 12:40:50 UTC (rev 24439)
@@ -30,4 +30,4 @@
 config BR2_PACKAGE_HASERL_VERSION
 	string
 	default "0.8.0"		if BR2_PACKAGE_HASERL_VERSION_0_8_X
-	default "0.9.24"	if BR2_PACKAGE_HASERL_VERSION_0_9_X
+	default "0.9.25"	if BR2_PACKAGE_HASERL_VERSION_0_9_X

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/haserl
@ 2008-12-01 15:10 jacmet at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-12-01 15:10 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-12-01 07:10:47 -0800 (Mon, 01 Dec 2008)
New Revision: 24219

Log:
haserl: fix shared cache interaction issue

The ac_cv_path_install override is needed to strip the target binary for
haserl 0.8.0, but it doesn't interact nicely with the shared cache, so
disable the cache for now.

Longer term we should probably forget about install-strip and do the
strip/cleanup/mklibs stuff as a post processing step before the target
filesystem rules are run.

Modified:
   trunk/buildroot/package/haserl/haserl.mk


Changeset:
Modified: trunk/buildroot/package/haserl/haserl.mk
===================================================================
--- trunk/buildroot/package/haserl/haserl.mk	2008-12-01 14:53:22 UTC (rev 24218)
+++ trunk/buildroot/package/haserl/haserl.mk	2008-12-01 15:10:47 UTC (rev 24219)
@@ -17,6 +17,8 @@
 
 # force haserl 0.8.0 to use install-sh so stripping works
 HASERL_CONF_ENV = ac_cv_path_install=./install-sh
+# the above doesn't interact nicely with a shared cache, so disable for now
+HASERL_USE_CONFIG_CACHE = NO
 
 HASERL_DEPENDENCIES:=uclibc
 

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/haserl
@ 2008-08-19  9:40 jacmet at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-08-19  9:40 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-08-19 02:40:23 -0700 (Tue, 19 Aug 2008)
New Revision: 23105

Log:
haserl: bump 0.9.x version

Modified:
   trunk/buildroot/package/haserl/Config.in


Changeset:
Modified: trunk/buildroot/package/haserl/Config.in
===================================================================
--- trunk/buildroot/package/haserl/Config.in	2008-08-19 09:40:20 UTC (rev 23104)
+++ trunk/buildroot/package/haserl/Config.in	2008-08-19 09:40:23 UTC (rev 23105)
@@ -30,4 +30,4 @@
 config BR2_PACKAGE_HASERL_VERSION
 	string
 	default "0.8.0"		if BR2_PACKAGE_HASERL_VERSION_0_8_X
-	default "0.9.23"	if BR2_PACKAGE_HASERL_VERSION_0_9_X
+	default "0.9.24"	if BR2_PACKAGE_HASERL_VERSION_0_9_X

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/haserl
@ 2008-08-19  9:40 jacmet at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-08-19  9:40 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-08-19 02:40:20 -0700 (Tue, 19 Aug 2008)
New Revision: 23104

Log:
haserl: don't install unneeded examples for 0.8.0 to target

Modified:
   trunk/buildroot/package/haserl/haserl.mk


Changeset:
Modified: trunk/buildroot/package/haserl/haserl.mk
===================================================================
--- trunk/buildroot/package/haserl/haserl.mk	2008-08-19 09:40:18 UTC (rev 23103)
+++ trunk/buildroot/package/haserl/haserl.mk	2008-08-19 09:40:20 UTC (rev 23104)
@@ -12,7 +12,6 @@
 HASERL_INSTALL_STAGING:=NO
 HASERL_INSTALL_TARGET:=YES
 HASERL_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) STRIPPROG='$(STRIPCMD)' install-strip
-HASERL_UNINSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) uninstall
 
 # force haserl 0.8.0 to use install-sh so stripping works
 HASERL_CONF_ENV = ac_cv_path_install=./install-sh
@@ -20,3 +19,8 @@
 HASERL_DEPENDENCIES:=uclibc
 
 $(eval $(call AUTOTARGETS,package,haserl))
+
+# haserl 0.8.0 installs unneeded examples to /usr/share/haserl - remove them
+$(HASERL_HOOK_POST_INSTALL): $(HASERL_TARGET_INSTALL_TARGET)
+	rm -rf $(TARGET_DIR)/usr/share/haserl
+	touch $@

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/haserl
@ 2008-04-12 13:26 jacmet at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-04-12 13:26 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-04-12 06:26:57 -0700 (Sat, 12 Apr 2008)
New Revision: 21718

Log:
haserl: depend on haserl binary in TARGET_DIR and also cleanup TARGET_DIR.


Modified:
   trunk/buildroot/package/haserl/haserl.mk


Changeset:
Modified: trunk/buildroot/package/haserl/haserl.mk
===================================================================
--- trunk/buildroot/package/haserl/haserl.mk	2008-04-12 09:56:15 UTC (rev 21717)
+++ trunk/buildroot/package/haserl/haserl.mk	2008-04-12 13:26:57 UTC (rev 21718)
@@ -10,6 +10,7 @@
 HASERL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/
 HASERL_DIR:=$(BUILD_DIR)/haserl-$(HASERL_VERSION)
 HASERL_CAT:=$(ZCAT)
+HASERL_BINARY:=usr/bin/haserl
 
 $(DL_DIR)/$(HASERL_SOURCE):
 	$(WGET) -P $(DL_DIR) $(HASERL_SITE)/$(HASERL_SOURCE)
@@ -35,11 +36,10 @@
 $(HASERL_DIR)/src/haserl: $(HASERL_DIR)/.configured
 	$(MAKE) CC=$(TARGET_CC) -C $(HASERL_DIR)
 
-$(HASERL_DIR)/.installed: $(HASERL_DIR)/src/haserl
-	cp $(HASERL_DIR)/src/haserl $(TARGET_DIR)/usr/bin
-	touch $@
+$(TARGET_DIR)/$(HASERL_BINARY): $(HASERL_DIR)/src/haserl
+	cp $^ $@
 
-haserl: uclibc $(HASERL_DIR)/.installed
+haserl: uclibc $(TARGET_DIR)/$(HASERL_BINARY)
 
 haserl-source: $(DL_DIR)/$(HASERL_SOURCE)
 
@@ -47,6 +47,7 @@
 
 haserl-clean:
 	-$(MAKE) -C $(HASERL_DIR) clean
+	rm -f $(TARGET_DIR)/$(HASERL_BINARY)
 
 haserl-dirclean:
 	rm -rf $(HASERL_DIR)

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/haserl
@ 2008-04-07  7:59 jacmet at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-04-07  7:59 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-04-07 00:59:03 -0700 (Mon, 07 Apr 2008)
New Revision: 21661

Log:
haserl: get rid of minor version in config names

Rename haserl config options to 0.8.x / 0.9.x so the config names
don't change every time the version is bumped (similar to busysbox package).


Modified:
   trunk/buildroot/package/haserl/Config.in


Changeset:
Modified: trunk/buildroot/package/haserl/Config.in
===================================================================
--- trunk/buildroot/package/haserl/Config.in	2008-04-07 01:45:41 UTC (rev 21660)
+++ trunk/buildroot/package/haserl/Config.in	2008-04-07 07:59:03 UTC (rev 21661)
@@ -10,18 +10,18 @@
 
 choice
 	prompt "Haserl version"
-	default BR2_PACKAGE_HASERL_VERSION_0_9_22
+	default BR2_PACKAGE_HASERL_VERSION_0_9_X
 	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"
+config BR2_PACKAGE_HASERL_VERSION_0_8_X
+	bool	"v 0.8.x"
 	help
 	  stable version
 
-config BR2_PACKAGE_HASERL_VERSION_0_9_22
-	bool	"v 0.9.22"
+config BR2_PACKAGE_HASERL_VERSION_0_9_X
+	bool	"v 0.9.x"
 	help
 	  developer version - seems OK though
 
@@ -30,5 +30,5 @@
 
 config BR2_PACKAGE_HASERL_VERSION
 	string
-	default "0.8.0"		if BR2_PACKAGE_HASERL_VERSION_0_8_0
-	default "0.9.22"	if BR2_PACKAGE_HASERL_VERSION_0_9_22
+	default "0.8.0"		if BR2_PACKAGE_HASERL_VERSION_0_8_X
+	default "0.9.22"	if BR2_PACKAGE_HASERL_VERSION_0_9_X

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/haserl
@ 2008-02-29 13:54 jacmet at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-02-29 13:54 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-02-29 05:54:20 -0800 (Fri, 29 Feb 2008)
New Revision: 21143

Log:
haserl: bump version


Added:
   trunk/buildroot/package/haserl/haserl-0.9.22-susv3-legacy.patch

Removed:
   trunk/buildroot/package/haserl/haserl-0.9.21-susv3-legacy.patch

Modified:
   trunk/buildroot/package/haserl/Config.in


Changeset:
Modified: trunk/buildroot/package/haserl/Config.in
===================================================================
--- trunk/buildroot/package/haserl/Config.in	2008-02-29 07:46:19 UTC (rev 21142)
+++ trunk/buildroot/package/haserl/Config.in	2008-02-29 13:54:20 UTC (rev 21143)
@@ -10,7 +10,7 @@
 
 choice
 	prompt "Haserl version"
-	default BR2_PACKAGE_HASERL_VERSION_0_9_21
+	default BR2_PACKAGE_HASERL_VERSION_0_9_22
 	depends on BR2_PACKAGE_HASERL
 	help
 	  Select the older stable version, or the newer developer version
@@ -20,8 +20,8 @@
 	help
 	  stable version
 
-config BR2_PACKAGE_HASERL_VERSION_0_9_21
-	bool	"v 0.9.21"
+config BR2_PACKAGE_HASERL_VERSION_0_9_22
+	bool	"v 0.9.22"
 	help
 	  developer version - seems OK though
 
@@ -31,4 +31,4 @@
 config BR2_PACKAGE_HASERL_VERSION
 	string
 	default "0.8.0"		if BR2_PACKAGE_HASERL_VERSION_0_8_0
-	default "0.9.21"	if BR2_PACKAGE_HASERL_VERSION_0_9_21
+	default "0.9.22"	if BR2_PACKAGE_HASERL_VERSION_0_9_22

Deleted: trunk/buildroot/package/haserl/haserl-0.9.21-susv3-legacy.patch
===================================================================
--- trunk/buildroot/package/haserl/haserl-0.9.21-susv3-legacy.patch	2008-02-29 07:46:19 UTC (rev 21142)
+++ trunk/buildroot/package/haserl/haserl-0.9.21-susv3-legacy.patch	2008-02-29 13:54:20 UTC (rev 21143)
@@ -1,12 +0,0 @@
-diff -urN haserl-0.9.21-0rig/src/haserl.c haserl-0.9.21/src/haserl.c
---- haserl-0.9.21-0rig/src/haserl.c	2007-12-13 22:58:00.000000000 +0100
-+++ haserl-0.9.21/src/haserl.c	2007-12-13 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)
-     {

Copied: trunk/buildroot/package/haserl/haserl-0.9.22-susv3-legacy.patch (from rev 21138, trunk/buildroot/package/haserl/haserl-0.9.21-susv3-legacy.patch)
===================================================================
--- trunk/buildroot/package/haserl/haserl-0.9.22-susv3-legacy.patch	                        (rev 0)
+++ trunk/buildroot/package/haserl/haserl-0.9.22-susv3-legacy.patch	2008-02-29 13:54:20 UTC (rev 21143)
@@ -0,0 +1,12 @@
+diff -urN haserl-0.9.21-0rig/src/haserl.c haserl-0.9.21/src/haserl.c
+--- haserl-0.9.21-0rig/src/haserl.c	2007-12-13 22:58:00.000000000 +0100
++++ haserl-0.9.21/src/haserl.c	2007-12-13 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)
+     {

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/haserl
@ 2007-12-13 12:01 vanokuten at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: vanokuten at uclibc.org @ 2007-12-13 12:01 UTC (permalink / raw)
  To: buildroot

Author: vanokuten
Date: 2007-12-13 04:01:48 -0800 (Thu, 13 Dec 2007)
New Revision: 20645

Log:
delete haserl-0.9.20-legacy.patch

Removed:
   trunk/buildroot/package/haserl/haserl-0.9.20-legacy.patch


Changeset:
Deleted: trunk/buildroot/package/haserl/haserl-0.9.20-legacy.patch
===================================================================
--- trunk/buildroot/package/haserl/haserl-0.9.20-legacy.patch	2007-12-13 11:34:27 UTC (rev 20644)
+++ trunk/buildroot/package/haserl/haserl-0.9.20-legacy.patch	2007-12-13 12:01:48 UTC (rev 20645)
@@ -1,12 +0,0 @@
-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)
-     {

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/haserl
@ 2007-12-13 11:34 vanokuten at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: vanokuten at uclibc.org @ 2007-12-13 11:34 UTC (permalink / raw)
  To: buildroot

Author: vanokuten
Date: 2007-12-13 03:34:27 -0800 (Thu, 13 Dec 2007)
New Revision: 20644

Log:
susv3 legacy fix for haserl

Added:
   trunk/buildroot/package/haserl/haserl-0.9.21-susv3-legacy.patch


Changeset:
Added: trunk/buildroot/package/haserl/haserl-0.9.21-susv3-legacy.patch
===================================================================
--- trunk/buildroot/package/haserl/haserl-0.9.21-susv3-legacy.patch	                        (rev 0)
+++ trunk/buildroot/package/haserl/haserl-0.9.21-susv3-legacy.patch	2007-12-13 11:34:27 UTC (rev 20644)
@@ -0,0 +1,12 @@
+diff -urN haserl-0.9.21-0rig/src/haserl.c haserl-0.9.21/src/haserl.c
+--- haserl-0.9.21-0rig/src/haserl.c	2007-12-13 22:58:00.000000000 +0100
++++ haserl-0.9.21/src/haserl.c	2007-12-13 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)
+     {

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/haserl
@ 2007-12-11 20:29 vanokuten at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: vanokuten at uclibc.org @ 2007-12-11 20:29 UTC (permalink / raw)
  To: buildroot

Author: vanokuten
Date: 2007-12-11 12:29:54 -0800 (Tue, 11 Dec 2007)
New Revision: 20642

Log:
bump haserl version

Modified:
   trunk/buildroot/package/haserl/Config.in


Changeset:
Modified: trunk/buildroot/package/haserl/Config.in
===================================================================
--- trunk/buildroot/package/haserl/Config.in	2007-12-11 20:21:35 UTC (rev 20641)
+++ trunk/buildroot/package/haserl/Config.in	2007-12-11 20:29:54 UTC (rev 20642)
@@ -10,7 +10,7 @@
 
 choice
 	prompt "Haserl version"
-	default BR2_PACKAGE_HASERL_VERSION_0_9_20
+	default BR2_PACKAGE_HASERL_VERSION_0_9_21
 	depends on BR2_PACKAGE_HASERL
 	help
 	  Select the older stable version, or the newer developer version
@@ -20,8 +20,8 @@
 	help
 	  stable version
 
-config BR2_PACKAGE_HASERL_VERSION_0_9_20
-	bool	"v 0.9.20"
+config BR2_PACKAGE_HASERL_VERSION_0_9_21
+	bool	"v 0.9.21"
 	help
 	  developer version - seems OK though
 
@@ -31,4 +31,4 @@
 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
+	default "0.9.21"	if BR2_PACKAGE_HASERL_VERSION_0_9_21

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/haserl
@ 2007-10-30 22:10 ulf at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: ulf at uclibc.org @ 2007-10-30 22:10 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-10-30 15:10:17 -0700 (Tue, 30 Oct 2007)
New Revision: 20342

Log:
Allow use of 'haserl' developer version

Added:
   trunk/buildroot/package/haserl/haserl-0.9.20-legacy.patch

Modified:
   trunk/buildroot/package/haserl/Config.in
   trunk/buildroot/package/haserl/haserl.mk


Changeset:
Modified: trunk/buildroot/package/haserl/Config.in
===================================================================
--- trunk/buildroot/package/haserl/Config.in	2007-10-30 21:58:15 UTC (rev 20341)
+++ trunk/buildroot/package/haserl/Config.in	2007-10-30 22:10:17 UTC (rev 20342)
@@ -7,3 +7,28 @@
 	  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

Added: trunk/buildroot/package/haserl/haserl-0.9.20-legacy.patch
===================================================================
--- trunk/buildroot/package/haserl/haserl-0.9.20-legacy.patch	                        (rev 0)
+++ trunk/buildroot/package/haserl/haserl-0.9.20-legacy.patch	2007-10-30 22:10:17 UTC (rev 20342)
@@ -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)
+     {

Modified: trunk/buildroot/package/haserl/haserl.mk
===================================================================
--- trunk/buildroot/package/haserl/haserl.mk	2007-10-30 21:58:15 UTC (rev 20341)
+++ trunk/buildroot/package/haserl/haserl.mk	2007-10-30 22:10:17 UTC (rev 20342)
@@ -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):

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/haserl
@ 2007-10-12 14:28 ulf at uclibc.org
  2007-10-12 15:05 ` Alexander Kriegisch
  0 siblings, 1 reply; 15+ messages in thread
From: ulf at uclibc.org @ 2007-10-12 14:28 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-10-12 07:28:56 -0700 (Fri, 12 Oct 2007)
New Revision: 20229

Log:
Remove LEGACY functions from haserl

Added:
   trunk/buildroot/package/haserl/haserl-0.8.0-legacy.patch

Modified:
   trunk/buildroot/package/haserl/haserl.mk


Changeset:
Added: trunk/buildroot/package/haserl/haserl-0.8.0-legacy.patch
===================================================================
--- trunk/buildroot/package/haserl/haserl-0.8.0-legacy.patch	                        (rev 0)
+++ trunk/buildroot/package/haserl/haserl-0.8.0-legacy.patch	2007-10-12 14:28:56 UTC (rev 20229)
@@ -0,0 +1,12 @@
+diff -urN haserl-0.8.0-0rig/src/haserl.c haserl-0.8.0/src/haserl.c
+--- haserl-0.8.0-0rig/src/haserl.c	2004-11-10 18:59:35.000000000 +0100
++++ haserl-0.8.0/src/haserl.c	2007-10-12 14:36:28.000000000 +0200
+@@ -131,7 +131,7 @@
+ 	if (strlen(prefix)) { memcpy (entry, prefix, strlen(prefix)); }
+ 	memcpy ((char *) (entry + strlen(prefix)), newbuf, strlen(newbuf));
+ 
+-	keylen = (size_t) (index (entry, '=') - entry);
++	keylen = (size_t) (strchr (entry, '=') - entry);
+ 	
+ 	if ( keylen <= 0 ) {
+ 			free (entry);

Modified: trunk/buildroot/package/haserl/haserl.mk
===================================================================
--- trunk/buildroot/package/haserl/haserl.mk	2007-10-12 12:34:04 UTC (rev 20228)
+++ trunk/buildroot/package/haserl/haserl.mk	2007-10-12 14:28:56 UTC (rev 20229)
@@ -15,6 +15,7 @@
 
 $(HASERL_DIR)/.unpacked: $(DL_DIR)/$(HASERL_SOURCE)
 	$(HASERL_CAT) $(DL_DIR)/$(HASERL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(HASERL_DIR) package/haserl/ haserl-$(HASERL_VERSION)\*.patch
 	touch $@
 
 $(HASERL_DIR)/.configured: $(HASERL_DIR)/.unpacked
@@ -41,6 +42,8 @@
 
 haserl-source: $(DL_DIR)/$(HASERL_SOURCE)
 
+haserl-unpacked: $(HASERL_DIR)/.unpacked
+
 haserl-clean:
 	-$(MAKE) -C $(HASERL_DIR) clean
 

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/haserl
@ 2007-05-31 15:19 jacmet at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2007-05-31 15:19 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2007-05-31 08:19:37 -0700 (Thu, 31 May 2007)
New Revision: 18710

Log:
Cleanup, get rid of HASERL_WORKDIR, use $@

Modified:
   trunk/buildroot/package/haserl/haserl.mk


Changeset:
Modified: trunk/buildroot/package/haserl/haserl.mk
===================================================================
--- trunk/buildroot/package/haserl/haserl.mk	2007-05-31 08:26:29 UTC (rev 18709)
+++ trunk/buildroot/package/haserl/haserl.mk	2007-05-31 15:19:37 UTC (rev 18710)
@@ -7,8 +7,7 @@
 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)/${shell basename $(HASERL_SOURCE) .tar.gz}
-HASERL_WORKDIR=$(BUILD_DIR)/haserl-$(HASERL_VERSION)
+HASERL_DIR=$(BUILD_DIR)/haserl-$(HASERL_VERSION)
 HASERL_CAT:=$(ZCAT)
 
 $(DL_DIR)/$(HASERL_SOURCE):
@@ -16,7 +15,7 @@
 
 $(HASERL_DIR)/.unpacked: $(DL_DIR)/$(HASERL_SOURCE)
 	$(HASERL_CAT) $(DL_DIR)/$(HASERL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(HASERL_DIR)/.unpacked
+	touch $@
 
 $(HASERL_DIR)/.configured: $(HASERL_DIR)/.unpacked
 	(cd $(HASERL_DIR); rm -rf config.cache; \
@@ -30,26 +29,24 @@
 		--prefix=/usr \
 		--sysconfdir=/etc \
 	);
-	touch $(HASERL_DIR)/.configured
+	touch $@
 
-$(HASERL_WORKDIR)/src/haserl: $(HASERL_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(HASERL_WORKDIR)
+$(HASERL_DIR)/src/haserl: $(HASERL_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC) -C $(HASERL_DIR)
 
-$(HASERL_WORKDIR)/.installed: $(HASERL_WORKDIR)/src/haserl
-	cp $(HASERL_WORKDIR)/src/haserl $(TARGET_DIR)/usr/bin
-	touch $(HASERL_WORKDIR)/.installed
+$(HASERL_DIR)/.installed: $(HASERL_DIR)/src/haserl
+	cp $(HASERL_DIR)/src/haserl $(TARGET_DIR)/usr/bin
+	touch $@
 
-haserl:	uclibc $(HASERL_WORKDIR)/.installed
+haserl:	uclibc $(HASERL_DIR)/.installed
 
 haserl-source: $(DL_DIR)/$(HASERL_SOURCE)
 
 haserl-clean:
-	@if [ -d $(HASERL_WORKDIR)/Makefile ] ; then \
-		$(MAKE) -C $(HASERL_WORKDIR) clean ; \
-	fi;
+	-$(MAKE) -C $(HASERL_DIR) clean
 
 haserl-dirclean:
-	rm -rf $(HASERL_DIR) $(HASERL_WORKDIR)
+	rm -rf $(HASERL_DIR)
 #############################################################
 #
 # Toplevel Makefile options

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2008-12-17 12:40 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-07  7:59 [Buildroot] svn commit: trunk/buildroot/package/haserl jacmet at uclibc.org
  -- strict thread matches above, loose matches on Subject: below --
2008-12-17 12:40 jacmet at uclibc.org
2008-12-01 15:10 jacmet at uclibc.org
2008-08-19  9:40 jacmet at uclibc.org
2008-08-19  9:40 jacmet at uclibc.org
2008-04-12 13:26 jacmet at uclibc.org
2008-04-07  7:59 jacmet at uclibc.org
2008-02-29 13:54 jacmet at uclibc.org
2007-12-13 12:01 vanokuten at uclibc.org
2007-12-13 11:34 vanokuten at uclibc.org
2007-12-11 20:29 vanokuten at uclibc.org
2007-10-30 22:10 ulf at uclibc.org
2007-10-12 14:28 ulf at uclibc.org
2007-10-12 15:05 ` Alexander Kriegisch
2007-05-31 15:19 jacmet at uclibc.org

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox