mirror of
https://github.com/openwrt/telephony.git
synced 2025-05-02 08:09:05 +08:00
3424e0027d
libpri can not be built on macos for OpenWrt Linux target due to: 1. Makefile uses `ar` and `ranlib` (without using make variables). MacOS system ar and ranlib are not compatible with the objects generated by OpenWrt GCC toolchain. This commit adds patch to add an ability to redefine `ar` and `ranlib` tools. Upstream issue: https://issues.asterisk.org/jira/browse/PRI-188 2. Makefile detects Darwin using `uname -s` and changes build logic but it is not need for cross-platfrom build. This commit redefines OSARCH=Linux in OpenWrt Makefile 3. After redefining OSARCH=Linux, libpri Makefile uses /sbin/ldconfig that does not exist on MacOS. This commit redefines LDCONFIG=ldconfig in OpenWrt Makefile to use ldconfig provided by OpenWrt. Patch '001-fix-include-signal-h-warning.patch' was refreshed to pass CI checks. The payload of this patch was not changed. Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
40 lines
1.0 KiB
Diff
40 lines
1.0 KiB
Diff
Upstream issue: https://issues.asterisk.org/jira/browse/PRI-188
|
|
|
|
From ec1d6589c6e4eb6550cb92d5e0f214f7b31e8d5f Mon Sep 17 00:00:00 2001
|
|
From: "Sergey V. Lobanov" <sergey@lobanov.in>
|
|
Date: Sun, 30 Jan 2022 13:25:17 +0300
|
|
Subject: [PATCH] Add an ability to build libpri on MacOS for Linux target
|
|
|
|
This patch allows to rededine ar and ranlib tool using AR and
|
|
RANLIB make flags.
|
|
|
|
Fixes: PRI-188
|
|
|
|
Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
|
|
---
|
|
Makefile | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -27,6 +27,8 @@
|
|
CC=gcc
|
|
GREP=grep
|
|
AWK=awk
|
|
+AR=ar
|
|
+RANLIB=ranlib
|
|
|
|
OSARCH=$(shell uname -s)
|
|
PROC?=$(shell uname -m)
|
|
@@ -193,8 +195,8 @@ MAKE_DEPS= -MD -MT $@ -MF .$(subst /,_,$
|
|
$(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
|
|
|
|
$(STATIC_LIBRARY): $(STATIC_OBJS)
|
|
- ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS)
|
|
- ranlib $(STATIC_LIBRARY)
|
|
+ $(AR) rcs $(STATIC_LIBRARY) $(STATIC_OBJS)
|
|
+ $(RANLIB) $(STATIC_LIBRARY)
|
|
|
|
$(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
|
|
$(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
|