aboutsummaryrefslogtreecommitdiffstats
path: root/build-root
diff options
context:
space:
mode:
authorEd Warnicke <eaw@cisco.com>2016-09-07 17:12:52 +0000
committerChris Luke <chris_luke@comcast.com>2016-09-07 18:42:03 +0000
commitf5a0e73e5316fa5ed2c5f64aec43cbb78724cb65 (patch)
tree0d43c8fd85229687e6cd51e837b933f89b31bc8e /build-root
parent8fce3e3c51db126004672c929bb9178c502cc2e8 (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>
Diffstat (limited to 'build-root')
-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
#