Skip to contentSkip to conversation

package/dbus-cpp: fix cross-compilation

PATCH New Yann E. MORIN 3 participants 3 messages Mar 21, 2017 – Mar 30, 2017

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH v2 1/1 package/dbus-cpp: fix cross-compilation

dbus-cpp has an ugly hack to not cross-build the tools when it detects cross-compilation.

However, we already have a host variant that builds those tools (and we anyway don't seem to need them to begin with).

Drop our patch that propagates the CXXFLAGS/LDFLAGS_FOR_BUILD. Replace with a patch to cross-compile the tools.

Fixes:
http://autobuild.buildroot.org/results/110/1100539caae6ef62c61a3b96bc54f7c0a215cc62/
and many, many more.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Gustavo Zacarias <[email protected]>
Cc Thomas Petazzoni <[email protected]>

---
Changes v1 -> v2:
- add missing commit log to patch (Thomas)

---
 package/dbus-cpp/0002-cross-compile-tools.patch    | 34 ++++++++++++++++++++++
 .../dbus-cpp/0002-cxxflags-ldflags-for-build.patch | 32 --------------------
 2 files changed, 34 insertions(+), 32 deletions(-)
 create mode 100644 package/dbus-cpp/0002-cross-compile-tools.patch
 delete mode 100644 package/dbus-cpp/0002-cxxflags-ldflags-for-build.patch
package/dbus-cpp/0002-cross-compile-tools.patch new file +34 -0
new file mode 100644
index 0000000..39eff31
@@ -0,0 +1,34 @@
+tools: just do proper cross-compile
+
+Those tools are not used during the build; besides, they are installed.
+
+So they don't need to not be cross-compiled.
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+
+---
+Upstream status: not submitted, upstream is dead.
+
+diff -durN dbus-cpp-0.9.0.orig/tools/Makefile.am dbus-cpp-0.9.0/tools/Makefile.am
+--- dbus-cpp-0.9.0.orig/tools/Makefile.am	2017-03-21 21:48:57.013409423 +0100
++++ dbus-cpp-0.9.0/tools/Makefile.am	2017-03-21 21:49:35.329979798 +0100
+@@ -1,7 +1,3 @@
+-# hacky, but ...
+-
+-CXX = $(CXX_FOR_BUILD)
+-
+ AM_CPPFLAGS = \
+ 	$(dbus_CFLAGS) \
+ 	$(xml_CFLAGS) \
+@@ -9,11 +3,7 @@
+ 	-I$(top_builddir)/include \
+ 	-Wall
+ 
+-if CROSS_COMPILING
+-libdbus_cxx_la = $(BUILD_LIBDBUS_CXX_DIR)/src/libdbus-c++-1.la
+-else
+ libdbus_cxx_la = $(top_builddir)/src/libdbus-c++-1.la
+-endif
+ 
+ bin_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect
+
package/dbus-cpp/0002-cxxflags-ldflags-for-build.patch deleted +0 -32
deleted file mode 100644
index fefb969..0000000
@@ -1,32 +0,0 @@
-Use CXXFLAGS_FOR_BUILD and LDFLAGS_FOR_BUILD for the tools since expat
-may not be living in the default include & library path.
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-diff -Nura libdbus-c++-0.9.0.orig/configure.ac libdbus-c++-0.9.0/configure.ac
---- libdbus-c++-0.9.0.orig/configure.ac	2014-01-05 15:28:03.653886567 -0300
-+++ libdbus-c++-0.9.0/configure.ac	2014-01-05 15:44:32.571172225 -0300
-@@ -65,7 +65,11 @@
- AC_PROG_CXX
- 
- CXX_FOR_BUILD=${CXX_FOR_BUILD-${CXX}}
-+CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
-+LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
- AC_SUBST(CXX_FOR_BUILD)
-+AC_SUBST(CXXFLAGS_FOR_BUILD)
-+AC_SUBST(LDFLAGS_FOR_BUILD)
- 
- AM_PROG_LIBTOOL
- 
-diff -Nura libdbus-c++-0.9.0.orig/tools/Makefile.am libdbus-c++-0.9.0/tools/Makefile.am
---- libdbus-c++-0.9.0.orig/tools/Makefile.am	2014-01-05 15:28:03.652886535 -0300
-+++ libdbus-c++-0.9.0/tools/Makefile.am	2014-01-05 15:44:42.071482390 -0300
-@@ -1,6 +1,8 @@
- # hacky, but ...
- 
- CXX = $(CXX_FOR_BUILD)
-+CXXFLAGS = $(CXXFLAGS_FOR_BUILD)
-+LDFLAGS = $(LDFLAGS_FOR_BUILD)
- 
- AM_CPPFLAGS = \
- 	$(dbus_CFLAGS) \
Signature · 1 line
2.7.4
Applied
#1 lore raw

PATCH v2 1/1 package/dbus-cpp: fix cross-compilation

Hello,

Quoted 20 lines · Yann E. MORIN

dbus-cpp has an ugly hack to not cross-build the tools when it detects cross-compilation.

However, we already have a host variant that builds those tools (and we anyway don't seem to need them to begin with).

Drop our patch that propagates the CXXFLAGS/LDFLAGS_FOR_BUILD. Replace with a patch to cross-compile the tools.

Fixes:
http://autobuild.buildroot.org/results/110/1100539caae6ef62c61a3b96bc54f7c0a215cc62/
and many, many more.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Gustavo Zacarias <[email protected]>
Cc Thomas Petazzoni <[email protected]>

---
Changes v1 -> v2:
- add missing commit log to patch (Thomas)

Quoted 6 lines
---
 package/dbus-cpp/0002-cross-compile-tools.patch    | 34 ++++++++++++++++++++++
 .../dbus-cpp/0002-cxxflags-ldflags-for-build.patch | 32 --------------------
 2 files changed, 34 insertions(+), 32 deletions(-)
 create mode 100644 package/dbus-cpp/0002-cross-compile-tools.patch
 delete mode 100644 package/dbus-cpp/0002-cxxflags-ldflags-for-build.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH v2 1/1 package/dbus-cpp: fix cross-compilation

In reply to Yann E. MORIN
Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

dbus-cpp has an ugly hack to not cross-build the tools when it detects cross-compilation.

However, we already have a host variant that builds those tools (and we anyway don't seem to need them to begin with).

Drop our patch that propagates the CXXFLAGS/LDFLAGS_FOR_BUILD. Replace with a patch to cross-compile the tools.

Fixes:
http://autobuild.buildroot.org/results/110/1100539caae6ef62c61a3b96bc54f7c0a215cc62/
and many, many more.

Quoted 7 lines
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Gustavo Zacarias <[email protected]>
Cc Thomas Petazzoni <[email protected]>

---
Changes v1 -> v2:
- add missing commit log to patch (Thomas)

Committed to 2017.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard