Hello, I uploaded the following debdiff in deferred/5, fixing the two above bugs.
thanks G.
diff -Nru lshw-02.18.85/debian/changelog lshw-02.18.85/debian/changelog --- lshw-02.18.85/debian/changelog 2019-07-03 11:15:12.000000000 +0200 +++ lshw-02.18.85/debian/changelog 2019-07-06 14:36:53.000000000 +0200 @@ -1,3 +1,21 @@ +lshw (02.18.85-0.3) unstable; urgency=medium + + [ Gianfranco Costamagna ] + * Upload to unstable + * Refresh FTCBFS patch to make it apply on the new release. + + [ Helmut Grohne ] + * Non-maintainer upload. + * Fix FTCBFS: Closes: #839404. + + Pass triplet-prefixed CC and CXX to make. + + cross.patch: Make pkg-config substitutable. + + Use triplet-prefixed pkg-config. + + [ Steve Langasek ] + * fix -version wrongly passed during build procedure (Closes: #849697) + + -- Gianfranco Costamagna <locutusofb...@debian.org> Sat, 06 Jul 2019 14:36:53 +0200 + lshw (02.18.85-0.2) unstable; urgency=medium [ Ondřej Nový ] diff -Nru lshw-02.18.85/debian/patches/cross.patch lshw-02.18.85/debian/patches/cross.patch --- lshw-02.18.85/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100 +++ lshw-02.18.85/debian/patches/cross.patch 2019-07-06 14:36:53.000000000 +0200 @@ -0,0 +1,66 @@ +From: Helmut Grohne <hel...@subdivi.de> +Subject: make pkg-config subtitutable + +--- lshw-02.18.85.orig/src/Makefile ++++ lshw-02.18.85/src/Makefile +@@ -21,14 +21,15 @@ export SQLITE + export ZLIB + + CXX?=$(CROSS_COMPILE)c++ ++PKG_CONFIG ?= pkg-config + INCLUDES=-I./core/ + DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" -DVERSION=\"$(VERSION)\" + CXXFLAGS=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES) + ifeq ($(SQLITE), 1) +- CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) ++ CXXFLAGS+= -DSQLITE $(shell $(PKG_CONFIG) --cflags sqlite3) + endif + ifeq ($(ZLIB), 1) +- CXXFLAGS+= -DZLIB $(shell pkg-config --cflags zlib) ++ CXXFLAGS+= -DZLIB $(shell $(PKG_CONFIG) --cflags zlib) + endif + LDFLAGS+=-L./core/ + ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) +@@ -37,10 +38,10 @@ endif + LDSTATIC=-static + LIBS+=-llshw -lresolv + ifeq ($(SQLITE), 1) +- LIBS+= $(shell pkg-config --libs sqlite3) ++ LIBS+= $(shell $(PKG_CONFIG) --libs sqlite3) + endif + ifeq ($(ZLIB), 1) +- LIBS+= $(shell pkg-config --libs zlib) ++ LIBS+= $(shell $(PKG_CONFIG) --libs zlib) + endif + + export CXXFLAGS +--- lshw-02.18.85.orig/src/gui/Makefile ++++ lshw-02.18.85/src/gui/Makefile +@@ -1,22 +1,23 @@ + PACKAGENAME?=lshw + + CXX?=$(CROSS_COMPILE)c++ ++PKG_CONFIG ?= pkg-config + CC?=$(CROSS_COMPILE)cc + STRIP?=strip + OBJCOPY?=objcopy + + DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" +-GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags) ++GTKINCLUDES=$(shell $(PKG_CONFIG) gtk+-2.0 --cflags) + INCLUDES=-I../core $(GTKINCLUDES) + CXXFLAGS=$(CXX_DEB_FLAGS) $(INCLUDES) $(DEFINES) + ifeq ($(SQLITE), 1) +- CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) ++ CXXFLAGS+= -DSQLITE $(shell $(PKG_CONFIG) --cflags sqlite3) + endif + CFLAGS=$(CXXFLAGS) $(DEFINES) +-GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs) ++GTKLIBS=$(shell $(PKG_CONFIG) gtk+-2.0 gmodule-2.0 --libs) + LIBS+=-L../core -llshw -lresolv $(GTKLIBS) + ifeq ($(SQLITE), 1) +- LIBS+= $(shell pkg-config --libs sqlite3) ++ LIBS+= $(shell $(PKG_CONFIG) --libs sqlite3) + endif + LDFLAGS= + ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) diff -Nru lshw-02.18.85/debian/patches/series lshw-02.18.85/debian/patches/series --- lshw-02.18.85/debian/patches/series 2019-07-03 11:15:12.000000000 +0200 +++ lshw-02.18.85/debian/patches/series 2019-07-06 14:36:53.000000000 +0200 @@ -8,3 +8,4 @@ privacy.patch spelling-error.patch add-missing-ethlink-standards.patch +cross.patch diff -Nru lshw-02.18.85/debian/rules lshw-02.18.85/debian/rules --- lshw-02.18.85/debian/rules 2019-07-03 11:15:12.000000000 +0200 +++ lshw-02.18.85/debian/rules 2019-07-06 14:36:53.000000000 +0200 @@ -3,6 +3,15 @@ UPSTREAM_GIT = https://github.com/lyonel/lshw -include /usr/share/openstack-pkg-tools/pkgos.make +include /usr/share/dpkg/architecture.mk +ifeq ($(origin CC),default) +CC = $(DEB_HOST_GNU_TYPE)-gcc +endif +ifeq ($(origin CXX),default) +CXX = $(DEB_HOST_GNU_TYPE)-g++ +endif +export PKG_CONFIG = $(DEB_HOST_GNU_TYPE)-pkg-config + CXX_DEB_FLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -35,8 +44,8 @@ dh_testdir # Add here commands to compile the package. - $(MAKE) -C $(srcdir) core - $(MAKE) -C $(srcdir) gui + $(MAKE) -C $(srcdir) VERSION=$(uver) core CC="$(CC)" CXX="$(CXX)" + $(MAKE) -C $(srcdir) gui CC="$(CC)" CXX="$(CXX)" #/usr/bin/docbook-to-man debian/lshw.sgml > lshw.1 touch build-stamp @@ -57,8 +66,8 @@ dh_installdirs # Add here commands to install the package into debian/lshw. - $(MAKE) -C $(srcdir) install DESTDIR=$(CURDIR)/debian/lshw - $(MAKE) -C $(srcdir) install-gui DESTDIR=$(CURDIR)/debian/lshw-gtk + $(MAKE) -C $(srcdir) install DESTDIR=$(CURDIR)/debian/lshw CC="$(CC)" CXX="$(CXX)" + $(MAKE) -C $(srcdir) install-gui DESTDIR=$(CURDIR)/debian/lshw-gtk CC="$(CC)" CXX="$(CXX)" # data files supplied by pciutils and usbutils rm -rf $(CURDIR)/debian/lshw/usr/share/lshw
