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