Skip to content

Commit

Permalink
Revert "deal with opensuse cbindgen"
Browse files Browse the repository at this point in the history
This reverts commit 483dbac.
  • Loading branch information
fabbione committed Jun 18, 2021
1 parent 483dbac commit 9dc0297
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,3 @@ cov*
*libknet/bindings/rust/src/sys/libknet.rs
*libnozzle/bindings/rust/src/sys/libnozzle.rs
*build.rs
build-aux/rust-regen.sh
2 changes: 1 addition & 1 deletion build-aux/rust-regen.sh.in → build-aux/rust-regen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ srcheader="$1"
dstrs="$2"
filter="$3"

@BINDGEN@ \
bindgen \
--size_t-is-usize \
--no-recursive-whitelist \
--no-prepend-enum-name \
Expand Down
4 changes: 1 addition & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ if test "x$enable_rust_bindings" = "xyes"; then
AC_MSG_ERROR(["rustc command not found"])
fi

AC_CHECK_PROGS([BINDGEN], [bindgen cbindgen], [no])
AC_PATH_PROG([BINDGEN], [bindgen], [no])
if test "x$BINDGEN" = xno; then
AC_MSG_ERROR(["bindgen command not found"])
fi
Expand Down Expand Up @@ -430,8 +430,6 @@ AS_IF([test -n "$SOURCE_EPOCH"],
])
AC_MSG_NOTICE([using source epoch $($UTC_DATE_AT$SOURCE_EPOCH +'%F %T %Z')])

AC_CONFIG_FILES([build-aux/rust-regen.sh], [chmod +x build-aux/rust-regen.sh])

AC_CONFIG_FILES([
Makefile
libnozzle/Makefile
Expand Down

0 comments on commit 9dc0297

Please sign in to comment.