packaging: Remove full path from ld.so.preload and add libcrypt to asan-runtime-env... 98/276298/3 accepted/tizen_7.0_base accepted/tizen_7.0_base_hotfix accepted/tizen_8.0_base accepted/tizen_base accepted/tizen_base_asan accepted/tizen_base_dev tizen_7.0_base tizen_7.0_base_hotfix tizen_8.0_base tizen_base accepted/tizen/7.0/base/20221116.025757 accepted/tizen/7.0/base/hotfix/20221116.055205 accepted/tizen/8.0/base/20231005.044715 accepted/tizen/base/20220701.061649 accepted/tizen/base/20221115.103634 accepted/tizen/base/asan/20240305.000524 accepted/tizen/base/dev/20230602.080717 submit/tizen_base/20220630.062917 tizen_7.0_m2_release tizen_8.0_m2_release
authorSeung-Woo Kim <sw0312.kim@samsung.com>
Tue, 14 Jun 2022 06:53:35 +0000 (15:53 +0900)
committerSeung-Woo Kim <sw0312.kim@samsung.com>
Tue, 14 Jun 2022 07:58:59 +0000 (16:58 +0900)
Do not use full path from ld.so.preload because it causes error
during build. Also set libcrypt-2.30.so to asan-runtime-env
ld.so.preload.

Change-Id: Ic0406b51976a5ed5e3c96d5103e92e831039576d
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
packaging/gcc-contrib.spec

index fa326e4..281dd5e 100644 (file)
@@ -359,8 +359,8 @@ Asan build environment
 %post -n asan-build-env
 # Add /usr/lib/libasan.so to /etc/ld.so.preload
 [ -f /etc/ld.so.preload ] && mv -v /etc/ld.so.preload /etc/ld.so.preload.orig
-echo "%{_libdir}/libasan.so" > /etc/ld.so.preload
-echo "%{_libdir}/libcrypt-2.30.so" >> /etc/ld.so.preload
+echo "libasan.so" > /etc/ld.so.preload
+echo "libcrypt-2.30.so" >> /etc/ld.so.preload
 [ -f /etc/ld.so.preload.orig ] && cat /etc/ld.so.preload.orig >> /etc/ld.so.preload
 
 %preun -n asan-build-env
@@ -516,6 +516,7 @@ echo "%{tsan_runtime_options}"  | tee TSAN_OPTIONS
 echo "%{ubsan_runtime_options}" | tee UBSAN_OPTIONS
 
 echo "libasan.so" | tee asan-runtime-ld.so.preload
+echo "libcrypt-2.30.so" | tee -a asan-runtime-ld.so.preload
 
 %ifarch x86_64
 gcc -shared -o libhwasan.so -fPIC hwasan_stub.c