summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Warnicke <eaw@cisco.com>2016-09-07 17:12:52 +0000
committerEd Warnicke <eaw@cisco.com>2016-09-07 17:15:18 +0000
commitc1ac47b61ca6f788bb8cc08128c79edc743dcb99 (patch)
tree58f98c05ab48d05da35b76245c8fe4ba94da74ed
parentc278ebdd39bd3be4155f0c186b8df2e16c5c884e (diff)
VPP-390: include *.so symlinks in vpp-lib
Currently, vpp-lib rpm includes symlinks for *.so.0 -> *.so.0.0.0 but not *.so -> *.so.0.0.0 This causes linker issues in cases where vpp-lib and vpp-devel rpms are installed and sources are built that rely on libraries in vpp-lib. Example: libtool: link: gcc -shared -fPIC -DPIC jvpp/.libs/libjvpp_nsh_la-jvpp_nsh.o -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra -lpthread -lm -lrt -ljvpp_common -L/usr/lib64 -O2 -Wl,-soname -Wl,libjvpp_nsh.so.0 -o .libs/libjvpp_nsh.so.0.0.0 /usr/bin/ld: cannot find -lvlibmemoryclient /usr/bin/ld: cannot find -lvlibapi /usr/bin/ld: cannot find -lsvm /usr/bin/ld: cannot find -lvppinfra collect2: error: ld returned 1 exit status Change-Id: Ic8eebc696f973ea348be0b43e7cfb289efbe44fe Signed-off-by: Ed Warnicke <eaw@cisco.com>
-rw-r--r--build-root/rpm/vpp.spec2
1 files changed, 2 insertions, 0 deletions
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index 90a3c3aafa0..c6ac4056f3a 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -82,6 +82,8 @@ do
# make lib symlinks
( cd %{buildroot}%{_libdir} &&
ln -fs $file $(echo $file | sed -e 's/\(\.so\.[0-9]\+\).*/\1/') )
+ ( cd %{buildroot}%{_libdir} &&
+ ln -fs $file $(echo $file | sed -e 's/\(\.so\)\.[0-9]\+.*/\1/') )
done
#