adjust build dir process
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
parent
3992927941
commit
066cf353cf
20
skopeo.spec
20
skopeo.spec
@ -89,6 +89,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')
|
||||||
@ -102,20 +103,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 _build
|
||||||
|
pushd _build
|
||||||
|
mkdir -p src/%{provider}.%{provider_tld}/%{project}
|
||||||
|
ln -s $(dirs +1 -l) src/%{import_path}
|
||||||
|
popd
|
||||||
|
|
||||||
|
mv vendor src
|
||||||
|
|
||||||
mkdir -p src/github.com/containers
|
mkdir -p src/github.com/containers
|
||||||
ln -s ../../../ src/%{import_path}
|
ln -s ../../../ src/%{import_path}
|
||||||
|
|
||||||
mkdir -p vendor/src
|
|
||||||
for v in vendor/*; do
|
|
||||||
if test ${v} = vendor/src; then continue; fi
|
|
||||||
if test -d ${v}; then
|
|
||||||
mv ${v} vendor/src/
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
export GOPATH=$(pwd):$(pwd)/vendor
|
|
||||||
|
|
||||||
mkdir -p bin
|
|
||||||
%gobuild -o bin/%{name} ./cmd/%{name}
|
%gobuild -o bin/%{name} ./cmd/%{name}
|
||||||
pushd docs
|
pushd docs
|
||||||
for file in $(ls | grep 1.md)
|
for file in $(ls | grep 1.md)
|
||||||
|
Loading…
Reference in New Issue
Block a user