From 81097331e722b057c50b326a9780ad075116f0b5 Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Mon, 2 Dec 2024 18:23:37 +0530 Subject: [PATCH 1/2] support user given prefix and toolchain This patch support user given toolchain which enables cross compilation. Signed-off-by: Gagandeep Singh --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b5b050d..714475d 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ TESTS ?= 1 UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not') DESTDIR = -PREFIX = /usr/local +PREFIX ?= /usr/local MAJOR = 1 MINOR = 10 @@ -15,8 +15,8 @@ REVISION = 8 LIB = libcli.so LIB_STATIC = libcli.a -CC = gcc -AR = ar +CC ?= gcc +AR ?= ar ARFLAGS = rcs DEBUG = -g OPTIM = -O3 From ac1ec77afcf31ce48fd8381a16960d1457143747 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 24 Jul 2025 12:39:02 -0700 Subject: [PATCH 2/2] Enable multilib support Signed-off-by: Tom Hochstein --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 714475d..b7e1e4a 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,7 @@ TESTS ?= 1 UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not') DESTDIR = PREFIX ?= /usr/local +BASELIB ?= lib MAJOR = 1 MINOR = 10 @@ -64,14 +65,14 @@ clean: rm -f *.o $(LIB)* $(LIB_STATIC) clitest libcli-$(MAJOR).$(MINOR).$(REVISION).tar.gz install: $(TARGET_LIBS) - install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib + install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/$(BASELIB) install -m 0644 libcli.h $(DESTDIR)$(PREFIX)/include ifeq (1,$(STATIC_LIB)) - install -m 0644 $(LIB_STATIC) $(DESTDIR)$(PREFIX)/lib + install -m 0644 $(LIB_STATIC) $(DESTDIR)$(PREFIX)/$(BASELIB) endif ifeq (1,$(DYNAMIC_LIB)) - install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(PREFIX)/lib - cd $(DESTDIR)$(PREFIX)/lib && \ + install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(PREFIX)/$(BASELIB) + cd $(DESTDIR)$(PREFIX)/$(BASELIB) && \ ln -fs $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR).$(MINOR) && \ ln -fs $(LIB).$(MAJOR).$(MINOR) $(LIB) endif