opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #747 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-create-disk-by-snapshot to release/2.4.0

Browse Source 
* commit 'd74b2390dabe930cc850dacc30c80d15bbce27b3':
  fix import C use env CFLAGS
This commit is contained in:
邱剑
2018-12-13 11:35:14 +08:00
parent 28fdd6437a d74b2390da
commit 7c7bf5c4c2
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+11 -1
View File
@@ -32,6 +32,16 @@ GO_TEST := go test
PKGS := go list ./...
CGO_CFLAGS_ENV = $(shell go env CGO_CFLAGS)
CGO_LDFLAGS_ENV = $(shell go env CGO_LDFLAGS)
ifdef LIBQEMUIO_PATH
X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread -L ${LIBQEMUIO_PATH}/src
endif
export CGO_CFLAGS = ${X_CGO_CFLAGS}
export CGO_LDFLAGS = ${X_CGO_LDFLAGS}
all: build
@@ -44,7 +54,7 @@ install: prepare_dir
build: gendoc
$(MAKE) $(wildcard cmd/*)
$(MAKE) $(filter-out cmd/host-image, $(wildcard cmd/*))
gendoc:
@sh build/gendoc.sh
pkg/hostimage/image.go
-2
View File
@@ -2,8 +2,6 @@ package hostimage
/*
#cgo pkg-config: glib-2.0 zlib
#cgo CFLAGS: -I/home/yunion/rpmbuild/SOURCES/qemu/src -I/home/yunion/rpmbuild/SOURCES/qemu/src/include
#cgo LDFLAGS: -laio -lqemuio -lpthread -L /home/yunion/rpmbuild/SOURCES/qemu/src
#include "libqemuio.h"
#include "qemu/osdep.h"