[Git][reproducible-builds/disorderfs][master] 2 commits: Use the build architecture's pkg-config to permit cross-architecture builds. (Closes: #949609)

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / disorderfs


Commits:
520937a2 by Helmut Grohne at 2020-01-22T21:10:43+00:00
Use the build architecture's pkg-config to permit cross-architecture builds. (Closes: #949609)

disorderfs fails to build from source in a cross-architecture mannner because
the upstream Makefile hardcodes the build architecture pkg-config.

Signed-off-by: Chris Lamb <lamby at debian.org>

- - - - -
fa2fe655 by Chris Lamb at 2020-01-22T21:18:51+00:00
Release 0.5.8

- - - - -


2 changed files:

- Makefile
- disorderfs.cpp


Changes:

=====================================
Makefile
=====================================
@@ -30,8 +30,9 @@ ENABLE_MAN ?= $(HAS_A2X)
 HAS_A2X ?= $(shell command -v a2x >/dev/null && echo yes || echo no)
 
 # FUSE
-FUSE_CFLAGS ?= $(shell pkg-config --cflags fuse) -DFUSE_USE_VERSION=26
-FUSE_LIBS ?= $(shell pkg-config --libs fuse) -lulockmgr
+PKG_CONFIG ?= pkg-config
+FUSE_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags fuse) -DFUSE_USE_VERSION=26
+FUSE_LIBS ?= $(shell $(PKG_CONFIG) --libs fuse) -lulockmgr
 
 # CXXFLAGS
 CXXFLAGS += -std=c++11 -Wno-unused-parameter


=====================================
disorderfs.cpp
=====================================
@@ -43,7 +43,7 @@ extern "C" {
 #include <sys/file.h>
 #include <stddef.h>
 
-#define DISORDERFS_VERSION "0.5.7"
+#define DISORDERFS_VERSION "0.5.8"
 
 namespace {
 	std::vector<std::string>	bare_arguments;



View it on GitLab: https://salsa.debian.org/reproducible-builds/disorderfs/compare/453b7c8251ead3c5c716bdd438f67838c83b0de4...fa2fe65522f974483837d0ef9eabe33707ac3523

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/disorderfs/compare/453b7c8251ead3c5c716bdd438f67838c83b0de4...fa2fe65522f974483837d0ef9eabe33707ac3523
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20200122/147af0c8/attachment.htm>