diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-06-04 11:12:06 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-06-04 12:18:47 +0200 |
| commit | e4b09481d0db4d1d01281b2f1332b5e63f76e36d (patch) | |
| tree | f385d8bf51c4000fe1163809a1f3622b1f4838cf /package/libcli | |
| parent | 690637753610fef68463508c9687134dc4d1d5ba (diff) | |
use latest git version
Diffstat (limited to 'package/libcli')
| -rwxr-xr-x | package/libcli/Makefile | 7 | ||||
| -rw-r--r-- | package/libcli/patches/patch-Makefile | 31 |
2 files changed, 18 insertions, 20 deletions
diff --git a/package/libcli/Makefile b/package/libcli/Makefile index 6bc7345ca..6561fd243 100755 --- a/package/libcli/Makefile +++ b/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})) diff --git a/package/libcli/patches/patch-Makefile b/package/libcli/patches/patch-Makefile index 8ec1b0f04..2554d54d2 100644 --- a/package/libcli/patches/patch-Makefile +++ b/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) |