update build steps
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
parent
6b56403d54
commit
3b6ce66b48
41
skopeo.spec
41
skopeo.spec
@ -21,8 +21,6 @@
|
|||||||
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
|
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
|
||||||
%global git0 https://%{import_path}
|
%global git0 https://%{import_path}
|
||||||
|
|
||||||
# Used for comparing with latest upstream tag
|
|
||||||
# to decide whether to autobuild
|
|
||||||
%global built_tag v1.6.0
|
%global built_tag v1.6.0
|
||||||
%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
|
%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
|
||||||
|
|
||||||
@ -95,6 +93,7 @@ sed -i 's/install-docs: docs/install-docs:/' Makefile
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
%set_build_flags
|
%set_build_flags
|
||||||
|
export GOPATH=$(pwd)/_build:$(pwd)
|
||||||
export CGO_CFLAGS=$CFLAGS
|
export CGO_CFLAGS=$CFLAGS
|
||||||
# These extra flags present in $CFLAGS have been skipped for now as they break the build
|
# These extra flags present in $CFLAGS have been skipped for now as they break the build
|
||||||
CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-flto=auto//g')
|
CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-flto=auto//g')
|
||||||
@ -108,37 +107,17 @@ export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic -fcf-protection=full"
|
|||||||
# unset LDFLAGS earlier set from set_build_flags
|
# unset LDFLAGS earlier set from set_build_flags
|
||||||
LDFLAGS=''
|
LDFLAGS=''
|
||||||
|
|
||||||
mkdir -p src/github.com/containers
|
mkdir _build
|
||||||
ln -s ../../../ src/%{import_path}
|
pushd _build
|
||||||
|
mkdir -p src/%{provider}.%{provider_tld}/%{project}
|
||||||
mkdir -p vendor/src
|
ln -s $(dirs +1 -l) src/%{import_path}
|
||||||
for v in vendor/*; do
|
|
||||||
if test ${v} = vendor/src; then continue; fi
|
|
||||||
if test -d ${v}; then
|
|
||||||
mv ${v} vendor/src/
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
%if ! 0%{?with_bundled}
|
|
||||||
rm -rf vendor/
|
|
||||||
export GOPATH=$(pwd)
|
|
||||||
%else
|
|
||||||
export GOPATH=$(pwd):$(pwd)/vendor
|
|
||||||
%endif
|
|
||||||
|
|
||||||
mkdir -p bin
|
|
||||||
%if 0%{?rhel} >= 8
|
|
||||||
export BUILDTAGS='exclude_graphdriver_btrfs btrfs_noversion'
|
|
||||||
%endif
|
|
||||||
%gobuild -o bin/%{name} ./cmd/%{name}
|
|
||||||
pushd docs
|
|
||||||
for file in $(ls | grep 1.md)
|
|
||||||
do
|
|
||||||
export FILE_OUT=$(echo $file | sed -e 's/\.md//')
|
|
||||||
go-md2man -in $file -out $FILE_OUT
|
|
||||||
done
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
mv vendor src
|
||||||
|
|
||||||
|
%gobuild -o bin/%{name} %{import_path}/cmd/%{name}
|
||||||
|
%{__make} docs
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make \
|
make \
|
||||||
PREFIX=%{buildroot}%{_prefix} \
|
PREFIX=%{buildroot}%{_prefix} \
|
||||||
|
Loading…
Reference in New Issue
Block a user