[1.0] script/release.sh: fix for opensuse#3298
Merged
kolyshkin merged 1 commit intoopencontainers:release-1.0from Dec 1, 2021
Merged
[1.0] script/release.sh: fix for opensuse#3298kolyshkin merged 1 commit intoopencontainers:release-1.0from
kolyshkin merged 1 commit intoopencontainers:release-1.0from
Conversation
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>
This was referenced Nov 29, 2021
Closed
AkihiroSuda
approved these changes
Nov 30, 2021
Member
|
I see you also requested a review from @cyphar, but feel free to merge if that was just "one of you both" 😅 |
Contributor
Author
|
It's a trivial fix, let's merge. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
backport of #3200 to release-1.0 branch
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:
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