Browse Source

haserl: update to 0.9.34

Signed-off-by: Maxim Storchak <m.storchak@gmail.com>
Maxim Storchak 10 years ago
parent
commit
5b90cf85de
2 changed files with 14 additions and 12 deletions
  1. 2
    2
      utils/haserl/Makefile
  2. 12
    10
      utils/haserl/patches/100-replace-lua2c-with-sed.patch

+ 2
- 2
utils/haserl/Makefile View File

8
 include $(TOPDIR)/rules.mk
8
 include $(TOPDIR)/rules.mk
9
 
9
 
10
 PKG_NAME:=haserl
10
 PKG_NAME:=haserl
11
-PKG_VERSION:=0.9.33
11
+PKG_VERSION:=0.9.34
12
 PKG_RELEASE:=1
12
 PKG_RELEASE:=1
13
 
13
 
14
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
14
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
15
 PKG_SOURCE_URL:=@SF/haserl
15
 PKG_SOURCE_URL:=@SF/haserl
16
-PKG_MD5SUM:=a9decddb508944d56f71dd2f821e2ec5
16
+PKG_MD5SUM:=cae2240f25040c7a0a270c35cf7abda4
17
 PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
17
 PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
18
 PKG_LICENSE:=GPL-2.0
18
 PKG_LICENSE:=GPL-2.0
19
 PKG_LICENSE_FILES:=COPYING
19
 PKG_LICENSE_FILES:=COPYING

+ 12
- 10
utils/haserl/patches/100-replace-lua2c-with-sed.patch View File

1
---- a/src/Makefile.in	2013-09-20 23:52:15.000000000 +0300
2
-+++ b/src/Makefile.in	2014-05-03 23:06:17.000000000 +0300
3
-@@ -76,7 +76,6 @@
1
+diff --git a/src/Makefile.in b/src/Makefile.in
2
+index 31d45f7..d249f67 100644
3
+--- a/src/Makefile.in
4
++++ b/src/Makefile.in
5
+@@ -86,7 +86,6 @@ POST_INSTALL = :
4
  NORMAL_UNINSTALL = :
6
  NORMAL_UNINSTALL = :
5
  PRE_UNINSTALL = :
7
  PRE_UNINSTALL = :
6
  POST_UNINSTALL = :
8
  POST_UNINSTALL = :
8
  @INCLUDE_LUASHELL_TRUE@@USE_LUA_TRUE@am__append_1 = h_lua.c h_lua.h
10
  @INCLUDE_LUASHELL_TRUE@@USE_LUA_TRUE@am__append_1 = h_lua.c h_lua.h
9
  @INCLUDE_LUACSHELL_TRUE@@USE_LUA_TRUE@am__append_2 = h_luac.c h_luac.h
11
  @INCLUDE_LUACSHELL_TRUE@@USE_LUA_TRUE@am__append_2 = h_luac.c h_luac.h
10
  bin_PROGRAMS = haserl$(EXEEXT)
12
  bin_PROGRAMS = haserl$(EXEEXT)
11
-@@ -115,9 +114,6 @@
13
+@@ -124,9 +123,6 @@ am__DEPENDENCIES_1 =
12
  haserl_DEPENDENCIES = $(am__DEPENDENCIES_1)
14
  haserl_DEPENDENCIES = $(am__DEPENDENCIES_1)
13
  haserl_LINK = $(CCLD) $(haserl_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
15
  haserl_LINK = $(CCLD) $(haserl_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
14
  	$(LDFLAGS) -o $@
16
  	$(LDFLAGS) -o $@
18
  AM_V_P = $(am__v_P_@AM_V@)
20
  AM_V_P = $(am__v_P_@AM_V@)
19
  am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
21
  am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
20
  am__v_P_0 = false
22
  am__v_P_0 = false
21
-@@ -150,8 +146,8 @@
23
+@@ -159,8 +155,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
22
  am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
24
  am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
23
  am__v_CCLD_0 = @echo "  CCLD    " $@;
25
  am__v_CCLD_0 = @echo "  CCLD    " $@;
24
  am__v_CCLD_1 = 
26
  am__v_CCLD_1 = 
29
  am__can_run_installinfo = \
31
  am__can_run_installinfo = \
30
    case $$AM_UPDATE_INFO_DIR in \
32
    case $$AM_UPDATE_INFO_DIR in \
31
      n|no|NO) false;; \
33
      n|no|NO) false;; \
32
-@@ -273,7 +269,7 @@
34
+@@ -284,7 +280,7 @@ target_alias = @target_alias@
33
  top_build_prefix = @top_build_prefix@
35
  top_build_prefix = @top_build_prefix@
34
  top_builddir = @top_builddir@
36
  top_builddir = @top_builddir@
35
  top_srcdir = @top_srcdir@
37
  top_srcdir = @top_srcdir@
38
  
40
  
39
  # Not strictly required, but we explicitly do not distribute the generated inc file
41
  # Not strictly required, but we explicitly do not distribute the generated inc file
40
  nodist_haserl_SOURCES = haserl_lualib.inc
42
  nodist_haserl_SOURCES = haserl_lualib.inc
41
-@@ -386,10 +382,6 @@
43
+@@ -396,10 +392,6 @@ haserl$(EXEEXT): $(haserl_OBJECTS) $(haserl_DEPENDENCIES) $(EXTRA_haserl_DEPENDE
42
  	@rm -f haserl$(EXEEXT)
44
  	@rm -f haserl$(EXEEXT)
43
  	$(AM_V_CCLD)$(haserl_LINK) $(haserl_OBJECTS) $(haserl_LDADD) $(LIBS)
45
  	$(AM_V_CCLD)$(haserl_LINK) $(haserl_OBJECTS) $(haserl_LDADD) $(LIBS)
44
  
46
  
49
  mostlyclean-compile:
51
  mostlyclean-compile:
50
  	-rm -f *.$(OBJEXT)
52
  	-rm -f *.$(OBJEXT)
51
  
53
  
52
-@@ -406,7 +398,6 @@
54
+@@ -416,7 +408,6 @@ distclean-compile:
53
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-haserl.Po@am__quote@
55
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-haserl.Po@am__quote@
54
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-rfc2388.Po@am__quote@
56
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-rfc2388.Po@am__quote@
55
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-sliding_buffer.Po@am__quote@
57
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-sliding_buffer.Po@am__quote@
57
  
59
  
58
  .c.o:
60
  .c.o:
59
  @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
61
  @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
60
-@@ -758,17 +749,13 @@
61
- 	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
62
+@@ -770,17 +761,13 @@ uninstall-am: uninstall-binPROGRAMS
63
+ .PRECIOUS: Makefile
62
  
64
  
63
  
65
  
64
 -# lua2c_LIBS ?= -llua -ldl -lm
66
 -# lua2c_LIBS ?= -llua -ldl -lm