Browse Source

use latest git version

Waldemar Brodkorb 9 years ago
parent
commit
e4b09481d0
2 changed files with 18 additions and 20 deletions
  1. 2 5
      package/libcli/Makefile
  2. 16 15
      package/libcli/patches/patch-Makefile

+ 2 - 5
package/libcli/Makefile

@@ -4,17 +4,14 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		libcli
-PKG_VERSION:=		1.9.7
+PKG_VERSION:=		c63c9d35144939c8b4fa3c5394aed2e29ff517b0
 PKG_RELEASE:=		1
-PKG_HASH:=		1160377886d50b979f11e247d172156b16ccf0124b4ce5a212d4cec5eb25ef30
 PKG_DESCR:=		cisco-like command-line interface library
 PKG_SECTION:=		libs/misc
 PKG_URL:=		http://sites.dparrish.com/libcli
-PKG_SITES:=		https://github.com/dparrish/libcli
+PKG_SITES:=		https://github.com/dparrish/libcli.git
 PKG_OPTS:=		dev
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-
 include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBCLI,libcli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))

+ 16 - 15
package/libcli/patches/patch-Makefile

@@ -1,14 +1,15 @@
---- libcli-1.9.7.orig/Makefile	2013-12-21 13:33:31.000000000 +0100
-+++ libcli-1.9.7/Makefile	2013-12-21 13:37:09.000000000 +0100
-@@ -1,6 +1,5 @@
--UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not')
+--- libcli-c63c9d35144939c8b4fa3c5394aed2e29ff517b0.orig/Makefile	2015-05-29 00:20:31.000000000 +0200
++++ libcli-c63c9d35144939c8b4fa3c5394aed2e29ff517b0/Makefile	2015-05-31 12:27:42.000000000 +0200
+@@ -7,7 +7,7 @@ TESTS ?= 1
+ 
+ UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not')
  DESTDIR =
 -PREFIX = /usr/local
 +PREFIX = /usr
  
  MAJOR = 1
  MINOR = 9
-@@ -8,21 +7,15 @@ REVISION = 7
+@@ -15,21 +15,17 @@ REVISION = 7
  LIB = libcli.so
  LIB_STATIC = libcli.a
  
@@ -17,19 +18,19 @@
 +CC ?= gcc
 +AR ?= ar
  ARFLAGS = rcs
--DEBUG = -g
--OPTIM = -O3
--CFLAGS += $(DEBUG) $(OPTIM) -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Werror -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter
-+CFLAGS += -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Werror -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter
- LDFLAGS += -shared
- LIBPATH += -L.
+ DEBUG = -g
+ OPTIM = -O3
+-override CFLAGS += $(DEBUG) $(OPTIM) -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Werror -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter
++override CFLAGS += -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Werror -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter
+ override LDFLAGS += -shared
+ override LIBPATH += -L.
  
 -ifeq ($(UNAME),Darwin)
--LDFLAGS += -Wl,-install_name,$(LIB).$(MAJOR).$(MINOR)
+-override LDFLAGS += -Wl,-install_name,$(LIB).$(MAJOR).$(MINOR)
 -else
- LDFLAGS += -Wl,-soname,$(LIB).$(MAJOR).$(MINOR)
+ override LDFLAGS += -Wl,-soname,$(LIB).$(MAJOR).$(MINOR)
  LIBS = -lcrypt
 -endif
  
- all: $(LIB) $(LIB_STATIC) clitest
- 
+ ifeq (1,$(DYNAMIC_LIB))
+ TARGET_LIBS += $(LIB)