summaryrefslogtreecommitdiff
path: root/package/libcli/patches/patch-Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-12-21 13:38:32 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-12-21 13:38:32 +0100
commitbf74f495c3da7b24ff1c580f0653f1664ea5fd32 (patch)
treedc8f7c44d84bce7aac4002599e5dbca2396a843f /package/libcli/patches/patch-Makefile
parent8a9ac05d747444358820c8d2da604904fad1271e (diff)
fix musl compile, update to latest git version
Diffstat (limited to 'package/libcli/patches/patch-Makefile')
-rw-r--r--package/libcli/patches/patch-Makefile30
1 files changed, 22 insertions, 8 deletions
diff --git a/package/libcli/patches/patch-Makefile b/package/libcli/patches/patch-Makefile
index 03c26c349..8ec1b0f04 100644
--- a/package/libcli/patches/patch-Makefile
+++ b/package/libcli/patches/patch-Makefile
@@ -1,21 +1,35 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libcli-1.9.4.orig/Makefile 2008-10-09 04:38:01.000000000 +0200
-+++ libcli-1.9.4/Makefile 2009-05-29 17:42:04.310095050 +0200
-@@ -1,15 +1,12 @@
+--- 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')
DESTDIR =
-PREFIX = /usr/local
+PREFIX = /usr
MAJOR = 1
MINOR = 9
- REVISION = 3
+@@ -8,21 +7,15 @@ REVISION = 7
LIB = libcli.so
+ LIB_STATIC = libcli.a
-CC = gcc
+-AR = ar
++CC ?= gcc
++AR ?= ar
+ ARFLAGS = rcs
-DEBUG = -g
-OPTIM = -O3
--CFLAGS += $(DEBUG) $(OPTIM) -Wall -Wformat-security -Wno-format-zero-length
-+CFLAGS += -Wall -Wformat-security -Wno-format-zero-length
- LDFLAGS += -shared -Wl,-soname,$(LIB).$(MAJOR).$(MINOR)
+-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.
+
+-ifeq ($(UNAME),Darwin)
+-LDFLAGS += -Wl,-install_name,$(LIB).$(MAJOR).$(MINOR)
+-else
+ LDFLAGS += -Wl,-soname,$(LIB).$(MAJOR).$(MINOR)
LIBS = -lcrypt
+-endif
+
+ all: $(LIB) $(LIB_STATIC) clitest
+