blob: 25f8efee7371ce7bfc2d29df128fb1bc1ceb1a9a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From 3be070a1fe2efa2877684f95c6a5643f76ee8bbc Mon Sep 17 00:00:00 2001
From: Etienne Cordonnier <ecordonnier@snap.com>
Date: Fri, 3 Mar 2023 13:32:11 +0100
Subject: [PATCH 2/2] libfec: change out_dir in makefile
---
debian/libfec.mk | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/debian/libfec.mk b/debian/libfec.mk
index 1d48392..dea9316 100644
--- a/debian/libfec.mk
+++ b/debian/libfec.mk
@@ -1,3 +1,4 @@
+include ../../rules_yocto.mk
NAME = libfec
# copied from libfec/Android.bp
@@ -12,20 +13,21 @@ CXXSOURCES := $(foreach source, $(filter %.cpp, $(SOURCES)), libfec/$(source))
CXXFLAGS += -fno-strict-aliasing -std=g++17
CPPFLAGS += \
-Iext4_utils/include \
- -Ilibfec/include \
+ -Ilibfec/include -I $(OUT_DIR)/usr/include \
-D_GNU_SOURCE -DFEC_NO_KLOG -D_LARGEFILE64_SOURCE
LDFLAGS += -shared -Wl,-soname,$(NAME).so.0 \
-Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
- -L/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+ -L$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android \
-lbase -lsparse -lselinux
build: $(COBJECTS) $(CXXOBJECTS)
- mkdir -p $(OUT_DIR)
- $(CXX) $^ -o $(OUT_DIR)/$(NAME).so.0 $(LDFLAGS)
- ln -s $(NAME).so.0 $(OUT_DIR)/$(NAME).so
+ mkdir -p $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android
+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(LDFLAGS)
+ ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
+ cp -r libfec/include/* $(OUT_DIR)/usr/include/
clean:
- $(RM) $(CXXOBJECTS) $(COBJECTS) $(NAME).so*
+ $(RM) $(CXXOBJECTS) $(COBJECTS) $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so*
$(COBJECTS): %.o: %.c
$(CC) $< -o $@ $(CFLAGS) $(CPPFLAGS)
--
2.36.1.vfs.0.0
|
