diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/libcli/patches/patch-Makefile | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/libcli/patches/patch-Makefile')
| -rw-r--r-- | package/libcli/patches/patch-Makefile | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/package/libcli/patches/patch-Makefile b/package/libcli/patches/patch-Makefile index 26f11e041..03c26c349 100644 --- a/package/libcli/patches/patch-Makefile +++ b/package/libcli/patches/patch-Makefile @@ -1,23 +1,21 @@ -$Id$ -allow CFLAGS overwrite, change some defaults ---- libcli-1.8.6.orig/Makefile 2006-03-07 00:13:11.000000000 +0100 -+++ libcli-1.8.6/Makefile 2007-01-07 21:27:49.000000000 +0100 -@@ -1,14 +1,14 @@ +$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 @@ DESTDIR = -PREFIX = /usr/local +PREFIX = /usr MAJOR = 1 - MINOR = 8 - REVISION = 6 + MINOR = 9 + REVISION = 3 LIB = libcli.so -CC = gcc -DEBUG = -g -OPTIM = -O3 -+#CC := gcc -+#DEBUG = -g -+#OPTIM = -O3 - CFLAGS += $(DEBUG) $(OPTIM) -Wall -Wformat-security -Wno-format-zero-length +-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) LIBPATH += -L. + LIBS = -lcrypt |