webserver: build unversioned library.
BUG=chromium:1094927
TEST=CQ
Change-Id: I4f3ebffb7efa46ad774fdc4feae878955eab5604
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2586590
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: John Riordan <jrio@chromium.org>
Commit-Queue: Qijiang Fan <fqj@google.com>
Tested-by: Qijiang Fan <fqj@google.com>
diff --git a/webserver/BUILD.gn b/webserver/BUILD.gn
index 7509883..4008f60 100644
--- a/webserver/BUILD.gn
+++ b/webserver/BUILD.gn
@@ -9,7 +9,7 @@
group("all") {
deps = [
- ":libwebserv-${libbase_ver}",
+ ":libwebserv",
":libwebserv_common",
":webservd",
":webservd_common",
@@ -138,10 +138,10 @@
write_deps("write_libwebserv_deps") {
pkg_deps = default_pkg_deps
- target = "libwebserv-${libbase_ver}"
+ target = "libwebserv"
}
-shared_library("libwebserv-${libbase_ver}") {
+shared_library("libwebserv") {
configs += [ ":target_defaults" ]
deps = [
":libwebserv_common",
diff --git a/webserver/libwebserv/libwebserv.pc.in b/webserver/libwebserv/libwebserv.pc.in
index 537d6bc..cf3f1b5 100644
--- a/webserver/libwebserv/libwebserv.pc.in
+++ b/webserver/libwebserv/libwebserv.pc.in
@@ -4,4 +4,4 @@
Description: Web server interface library
Version: ${bslot}
Requires.private: @PRIVATE_PC@
-Libs: -lwebserv-${bslot}
+Libs: -lwebserv
diff --git a/webserver/libwebserv/preinstall.sh b/webserver/libwebserv/preinstall.sh
index acb6515..6c74650 100755
--- a/webserver/libwebserv/preinstall.sh
+++ b/webserver/libwebserv/preinstall.sh
@@ -9,8 +9,8 @@
OUT=$1
v=$2
-deps=$(<"${OUT}"/gen/libwebserv-${v}-deps.txt)
+deps=$(<"${OUT}"/gen/libwebserv-deps.txt)
sed \
-e "s/@BSLOT@/${v}/g" \
-e "s/@PRIVATE_PC@/${deps}/g" \
- "libwebserv/libwebserv.pc.in" > "${OUT}/lib/libwebserv-${v}.pc"
+ "libwebserv/libwebserv.pc.in" > "${OUT}/lib/libwebserv.pc"
