diff options
Diffstat (limited to 'dynamic-layers/selinux/android-tools/android-tools/core/0007-libcrypto_utils.mk-modifications-to-make-it-build-in.patch')
-rw-r--r-- | dynamic-layers/selinux/android-tools/android-tools/core/0007-libcrypto_utils.mk-modifications-to-make-it-build-in.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/dynamic-layers/selinux/android-tools/android-tools/core/0007-libcrypto_utils.mk-modifications-to-make-it-build-in.patch b/dynamic-layers/selinux/android-tools/android-tools/core/0007-libcrypto_utils.mk-modifications-to-make-it-build-in.patch deleted file mode 100644 index af92726..0000000 --- a/dynamic-layers/selinux/android-tools/android-tools/core/0007-libcrypto_utils.mk-modifications-to-make-it-build-in.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From cae154ec12a864ada8372b393fceb1d682c78c60 Mon Sep 17 00:00:00 2001 | ||
2 | From: Etienne Cordonnier <ecordonnier@snap.com> | ||
3 | Date: Fri, 3 Mar 2023 14:38:05 +0100 | ||
4 | Subject: [PATCH 07/15] libcrypto_utils.mk: modifications to make it build in | ||
5 | yocto environment | ||
6 | |||
7 | Adding an include file that is setting the common flags. | ||
8 | Changed the cppflag to include the headers from other components | ||
9 | of android-tools | ||
10 | |||
11 | Modified LDflags so that the libraries that are coming from other android-tools | ||
12 | are searched in the output folder. | ||
13 | |||
14 | Modified the build rule so that it outputs the binary and header to the OUT_DIR | ||
15 | |||
16 | Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com> | ||
17 | --- | ||
18 | debian/libcrypto_utils.mk | 14 ++++++++------ | ||
19 | 1 file changed, 8 insertions(+), 6 deletions(-) | ||
20 | |||
21 | diff --git a/debian/libcrypto_utils.mk b/debian/libcrypto_utils.mk | ||
22 | index 3afd4124..80c52f30 100644 | ||
23 | --- a/debian/libcrypto_utils.mk | ||
24 | +++ b/debian/libcrypto_utils.mk | ||
25 | @@ -1,15 +1,17 @@ | ||
26 | +include ../../rules_yocto.mk | ||
27 | NAME:= libcrypto_utils | ||
28 | SOURCES := android_pubkey.c | ||
29 | SOURCES := $(foreach source, $(SOURCES), libcrypto_utils/$(source)) | ||
30 | -CPPFLAGS += -Ilibcrypto_utils/include -Iinclude | ||
31 | +CPPFLAGS += -Ilibcrypto_utils/include -Iinclude -I$(OUT_DIR)/usr/include | ||
32 | LDFLAGS += -shared -Wl,-soname,$(NAME).so.0 \ | ||
33 | -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ | ||
34 | - -L/usr/lib/$(DEB_HOST_MULTIARCH)/android \ | ||
35 | - -lcrypto -Wl,-z,defs | ||
36 | + -L$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android \ | ||
37 | + -l:libcrypto.so.0 -Wl,-z,defs | ||
38 | |||
39 | build: $(SOURCES) | ||
40 | - $(CC) $^ -o $(NAME).so.0 $(CPPFLAGS) $(LDFLAGS) | ||
41 | - ln -s $(NAME).so.0 $(NAME).so | ||
42 | + $(CC) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CPPFLAGS) $(LDFLAGS) | ||
43 | + ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so | ||
44 | + cp -r libcrypto_utils/include/* $(OUT_DIR)/usr/include/ | ||
45 | |||
46 | clean: | ||
47 | - $(RM) $(NAME).so* | ||
48 | + $(RM) $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so* | ||
49 | -- | ||
50 | 2.36.1.vfs.0.0 | ||
51 | |||