|
|
@ -1,23 +1,18 @@
|
|
|
|
From 6b84166ffa2725391f548cb0c91c2e668a4769f6 Mon Sep 17 00:00:00 2001
|
|
|
|
From de80f4dfd982fa7fc9954a631e739349193ca39f Mon Sep 17 00:00:00 2001
|
|
|
|
From: Fabio Valentini <decathorpe@gmail.com>
|
|
|
|
From: Fabio Valentini <decathorpe@gmail.com>
|
|
|
|
Date: Mon, 8 Aug 2022 18:34:08 +0200
|
|
|
|
Date: Sat, 20 Aug 2022 22:23:23 +0200
|
|
|
|
Subject: [PATCH] Unconditionally use bindgen and dynamic linking with
|
|
|
|
Subject: [PATCH] Unconditionally use bindgen and dynamic linking with
|
|
|
|
pkg-config
|
|
|
|
pkg-config
|
|
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
---
|
|
|
|
build.rs | 248 +++----------------------------------------------------
|
|
|
|
build.rs | 246 +++----------------------------------------------------
|
|
|
|
1 file changed, 11 insertions(+), 237 deletions(-)
|
|
|
|
1 file changed, 11 insertions(+), 235 deletions(-)
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/build.rs b/build.rs
|
|
|
|
diff --git a/build.rs b/build.rs
|
|
|
|
index d74ea68..9947dc5 100644
|
|
|
|
index 138e9d8..e2d2596 100644
|
|
|
|
--- a/build.rs
|
|
|
|
--- a/build.rs
|
|
|
|
+++ b/build.rs
|
|
|
|
+++ b/build.rs
|
|
|
|
@@ -1,210 +1,10 @@
|
|
|
|
@@ -1,205 +1,7 @@
|
|
|
|
-#[cfg(feature = "generate")]
|
|
|
|
|
|
|
|
extern crate bindgen;
|
|
|
|
|
|
|
|
-extern crate cc;
|
|
|
|
|
|
|
|
extern crate pkg_config;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
use pkg_config::Config;
|
|
|
|
use pkg_config::Config;
|
|
|
|
use std::env;
|
|
|
|
use std::env;
|
|
|
|
-use std::fmt;
|
|
|
|
-use std::fmt;
|
|
|
@ -223,7 +218,7 @@ index d74ea68..9947dc5 100644
|
|
|
|
fn bindgen_headers(path: &str) {
|
|
|
|
fn bindgen_headers(path: &str) {
|
|
|
|
let arch = env::var("CARGO_CFG_TARGET_ARCH");
|
|
|
|
let arch = env::var("CARGO_CFG_TARGET_ARCH");
|
|
|
|
let mut bindgen = bindgen::Builder::default()
|
|
|
|
let mut bindgen = bindgen::Builder::default()
|
|
|
|
@@ -223,43 +23,17 @@ fn bindgen_headers(path: &str) {
|
|
|
|
@@ -218,43 +20,17 @@ fn bindgen_headers(path: &str) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pub fn main() {
|
|
|
|
pub fn main() {
|
|
|
@ -279,5 +274,5 @@ index d74ea68..9947dc5 100644
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
--
|
|
|
|
--
|
|
|
|
2.37.1
|
|
|
|
2.37.2
|
|
|
|
|
|
|
|
|
|
|
|