Skip to contentSkip to conversation

dropwatch: fix avr32 build failure

PATCH New spdawson at gmail.com 2 participants 2 messages Nov 5, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 dropwatch: fix avr32 build failure

From: Simon Dawson <[email protected]>

On avr32, dropwatch needs libiberty to avoid build failures such as

http://autobuild.buildroot.net/results/cd5/cd5e22fb5c9b0fc5d396bc85a5e253a1a65054da/

Also test built on ARM.

---
v2: Handle using LDFLAGS in package makefile, rather than by patching. This
was suggested by Peter Korsgaard.

 package/dropwatch/dropwatch.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
package/dropwatch/dropwatch.mk +5 -1
index 5d65d86..9d49d1e 100644
@@ -13,8 +13,12 @@ DROPWATCH_LICENSE_FILES = COPYING
 
 # libbfd may be linked to libintl
 # Ugly... but LDFLAGS are hardcoded anyway
+#
+# Also: always need to add -liberty to hardcoded LDFLAGS for avr32
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-DROPWATCH_LDFLAGS = LDFLAGS="-lintl -lbfd -lreadline -lnl-3 -lnl-genl-3"
+DROPWATCH_LDFLAGS = LDFLAGS="-lintl -lbfd -liberty -lreadline -lnl-3 -lnl-genl-3"
+else
+DROPWATCH_LDFLAGS = LDFLAGS="-lbfd -liberty -lreadline -lnl-3 -lnl-genl-3"
 endif
 
 define DROPWATCH_BUILD_CMDS
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH v2 1/1 dropwatch: fix avr32 build failure

Quoted 23 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"spdawson" == spdawson <[email protected]> writes:

From: Simon Dawson <[email protected]>
On avr32, dropwatch needs libiberty to avoid build failures such as

http://autobuild.buildroot.net/results/cd5/cd5e22fb5c9b0fc5d396bc85a5e253a1a65054da/

Also test built on ARM.

---
v2: Handle using LDFLAGS in package makefile, rather than by patching. This
was suggested by Peter Korsgaard.

 package/dropwatch/dropwatch.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
package/dropwatch/dropwatch.mk +0 -0
index 5d65d86..9d49d1e 100644
@@ -13,8 +13,12 @@ DROPWATCH_LICENSE_FILES = COPYING
 

package/dropwatch/dropwatch.mk DROPWATCH_LICENSE_FILES = COPYING · line 22

Quoted 10 lines
package/dropwatch/dropwatch.mk +5 -1
 # libbfd may be linked to libintl
 # Ugly... but LDFLAGS are hardcoded anyway
+#
+# Also: always need to add -liberty to hardcoded LDFLAGS for avr32
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-DROPWATCH_LDFLAGS = LDFLAGS="-lintl -lbfd -lreadline -lnl-3 -lnl-genl-3"
+DROPWATCH_LDFLAGS = LDFLAGS="-lintl -lbfd -liberty -lreadline -lnl-3 -lnl-genl-3"
+else
+DROPWATCH_LDFLAGS = LDFLAGS="-lbfd -liberty -lreadline -lnl-3 -lnl-genl-3"
 endif

I've changed this so the GETTEXT_IF_LOCALE case appends to the LDFLAGS instead of having this twice.

Committed with that fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard