script/release.sh: fix for opensuse

kolyshkin · kolyshkin · commit 42bfc63b3d9e · 2021-11-29T15:54:22.000-08:00
openSUSE comes with site-config package, which makes configure select ${prefix}/lib64 as libdir on x86_64, unless explicitly specified. Since release.sh relies on a particular libdir path (for pkgconfig), it breaks things: > + make -C /home/kir/git/runc PKG_CONFIG_PATH=/tmp/tmp.QgIJ1sR5c9/lib/pkgconfig COMMIT_NO= EXTRA_FLAGS=-a 'EXTRA_LDFLAGS=-w -s -buildid=' static > make[1]: Entering directory '/home/kir/git/runc' > CGO_ENABLED=1 go build -trimpath -a -tags "seccomp netgo osusergo" -ldflags "-extldflags -static -X main.gitCommit=v1.0.0-204-g963e0146 -X main.version=1.0.0+dev -w -s -buildid=" -o runc . > Package libseccomp was not found in the pkg-config search path. > Perhaps you should add the directory containing `libseccomp.pc' To fix, we have to explicitly specify libdir. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 39d0ee1) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
diff --git a/script/release.sh b/script/release.sh
@@ -38,7 +38,8 @@ function build_project() {
 	tar xf "$tarball"
 	(
 		cd "libseccomp-${libseccomp_ver}"
-		./configure --prefix="$prefix" --enable-static --disable-shared
+		./configure --prefix="$prefix" --libdir="$prefix/lib" \
+			--enable-static --disable-shared
 		make install
 	)
 	mv "$tarball"{,.asc} "$builddir"

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ function build_project() {`
`38`	`38`	`tar xf "$tarball"`
`39`	`39`	`(`
`40`	`40`	`cd "libseccomp-${libseccomp_ver}"`
`41`		`- ./configure --prefix="$prefix" --enable-static --disable-shared`
	`41`	`+ ./configure --prefix="$prefix" --libdir="$prefix/lib" \`
	`42`	`+ --enable-static --disable-shared`
`42`	`43`	`make install`
`43`	`44`	`)`
`44`	`45`	`mv "$tarball"{,.asc} "$builddir"`