Skip to contentSkip to conversation

dropwatch: fix build failure with binutils 2.23.1+

PATCH New Gustavo Zacarias 2 participants 3 messages Jul 31, 2013 – Aug 1, 2013

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/2 dropwatch: fix build failure with binutils 2.23.1+

Signed-off-by Gustavo Zacarias <[email protected]>
---
 ...ch-1.4-build.patch => dropwatch-01-build.patch} |  0
 .../dropwatch/dropwatch-02-binutils-2.23.1.patch   | 74 ++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 rename package/dropwatch/{dropwatch-1.4-build.patch => dropwatch-01-build.patch} (100%)
 create mode 100644 package/dropwatch/dropwatch-02-binutils-2.23.1.patch
package/dropwatch/dropwatch-01-build.patch renamed from package/dropwatch/dropwatch-1.4-build.patch +0 -0
similarity index 100%
rename from package/dropwatch/dropwatch-1.4-build.patch
rename to package/dropwatch/dropwatch-01-build.patch
package/dropwatch/dropwatch-02-binutils-2.23.1.patch new file +74 -0

74 lines not on this page · raw message

Signature · 1 line
1.8.1.5
author
#1 lore raw

PATCH 2/2 dropwatch: link with libintl if present

binutils libbfd links to libintl if present, so dropwatch needs it too. Ugly hardcoded LDFLAGS, but then that's what the dropwatch Makefile does. Fixes:
http://autobuild.buildroot.net/results/549/54917e7943143e47263b60b4eee3dfc6f0801407/

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/dropwatch/dropwatch.mk | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
package/dropwatch/dropwatch.mk +12 -4
index 6c3dc75..09dff6b 100644
@@ -11,20 +11,28 @@ DROPWATCH_DEPENDENCIES = binutils libnl readline host-pkgconf
 DROPWATCH_LICENSE = GPLv2
 DROPWATCH_LICENSE_FILES = COPYING
 
+# libbfd may be linked to libintl
+# Ugly... but LDFLAGS are hardcoded anyway
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
+DROPWATCH_LDFLAGS = LDFLAGS="-lintl -lbfd -lreadline -lnl-3 -lnl-genl-3"
+endif
+
 define DROPWATCH_BUILD_CMDS
-  $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) build
+	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		$(DROPWATCH_LDFLAGS) build
 endef
 
 define DROPWATCH_CLEAN_CMDS
-  $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) clean
+	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) clean
 endef
 
 define DROPWATCH_INSTALL_TARGET_CMDS
-  $(INSTALL) -D -m 0755 $(@D)/src/dropwatch $(TARGET_DIR)/usr/bin/dropwatch
+	$(INSTALL) -D -m 0755 $(@D)/src/dropwatch \
+		$(TARGET_DIR)/usr/bin/dropwatch
 endef
 
 define DROPWATCH_UNINSTALL_CMDS
-  rm -f $(TARGET_DIR)/usr/bin/dropwatch
+	rm -f $(TARGET_DIR)/usr/bin/dropwatch
 endef
 
 $(eval $(generic-package))
Signature · 1 line
1.8.1.5
#2 lore raw

PATCH 1/2 dropwatch: fix build failure with binutils 2.23.1+

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 7 lines · Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 ...ch-1.4-build.patch => dropwatch-01-build.patch} |  0
 .../dropwatch/dropwatch-02-binutils-2.23.1.patch   | 74 ++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 rename package/dropwatch/{dropwatch-1.4-build.patch => dropwatch-01-build.patch} (100%)
 create mode 100644 package/dropwatch/dropwatch-02-binutils-2.23.1.patch

Both applied, thanks. The second patch is a bit ugly, but yes, I don't see how to do it otherwise.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com