Skip to content

igvm_c: fix pkg-config file and header installation #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chris-oo merged 1 commit into from
Feb 23, 2026
Merged

igvm_c: fix pkg-config file and header installation #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion igvm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,14 @@ categories = ["virtualization", "parser-implementations"]

[package.metadata.capi.header]
# cbindgen is handled from igvm_c/Makefile
enabled = false
generation = false

[package.metadata.capi.pkg_config]
# users include <igvm/igvm.h>, so let's strip igvm from Cflags
strip_include_path_components = 1

[package.metadata.capi.install.include]
asset = [{from = "../igvm_c/include/igvm.h"}, {from = "../igvm_c/include/igvm_defs.h"}]

[package.metadata.docs.rs]
# Document all features
Expand Down
4 changes: 1 addition & 3 deletions igvm_c/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ all: build test

build: $(API_DIR)/include/igvm.h $(TARGET_PATH)/dump_igvm$(EXE)

$(LIBIGVM):
$(LIBIGVM): $(API_DIR)/include/igvm.h
$(CARGO) cbuild --prefix $(PREFIX) --features $(FEATURES) $(EXTRA_PARAMS) --manifest-path=$(IGVM_DIR)/igvm/Cargo.toml

$(TARGET_PATH)/libigvm_defs.rlib:
Expand Down Expand Up @@ -71,8 +71,6 @@ clean:
rm -f $(API_DIR)/include/igvm.h $(API_DIR)/include/igvm_defs.h $(TARGET_PATH)/dump_igvm$(EXE) $(TARGET_PATH)/test_data$(EXE) $(TARGET_PATH)/igvm.bin

install: build
mkdir -p $(DESTDIR)/$(PREFIX)/include/igvm
install -m 644 $(IGVM_DIR)/igvm_c/include/* $(DESTDIR)/$(PREFIX)/include/igvm
$(CARGO) cinstall $(if $(DESTDIR), --destdir "$(DESTDIR)") --prefix "$(PREFIX)" --features $(FEATURES) $(EXTRA_PARAMS) --manifest-path=$(IGVM_DIR)/igvm/Cargo.toml
mkdir -p $(DESTDIR)/$(PREFIX)/bin/
install -m 755 $(TARGET_PATH)/dump_igvm$(EXE) $(DESTDIR)/$(PREFIX)/bin/