open2300: fix build failure
PATCH 1/1 open2300: fix build failure
This patch fixes the open2300's build-system, which is a handwritten Makefile, by removing the hard-coded include and library locations and making them pointing to the systroot.
Fixes:
http://autobuild.buildroot.org/results/072/0724ffa1355f5564b1fcd9d6e3c9ff2162d20f44/build-end.log
--- package/open2300/open2300-0001-fix-makefile.patch | 52 +++++++++++++++++++++++ package/open2300/open2300.mk | 7 ++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 package/open2300/open2300-0001-fix-makefile.patch
package/open2300/open2300-0001-fix-makefile.patch new file +52 -0
@@ -0,0 +1,52 @@ +From faca6c375cbb528f3f34333b3858492f4564da81 Mon Sep 17 00:00:00 2001 +From: Samuel Martin <[email protected]> +Date: Wed, 5 Feb 2014 21:52:20 +0100 +Subject: [PATCH] fix makefile + +- allow to extend CFLAGS and CC_LDFLAGS +- remove hard-coded include dirs. and lib. dirs. (which pointed to some + location in the host system) + +Signed-off-by: Samuel Martin <[email protected]> +--- + Makefile | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 92a2cc0..6b461ef 100755 +--- a/Makefile ++++ b/Makefile +@@ -37,9 +37,9 @@ MYSQLHISTLOGOBJ = mysqlhistlog2300.o rw2300.o linux2300.o win2300.o + + VERSION = 1.11 + +-CFLAGS = -Wall -O3 -DVERSION=\"$(VERSION)\" +-CC_LDFLAGS = -lm +-CC_WINFLAG = ++CFLAGS += -Wall -O3 -DVERSION=\"$(VERSION)\" ++CC_LDFLAGS += -lm ++CC_WINFLAG = + # For Windows - comment the two line above and un-comment the two lines below. + #CC_LDFLAGS = -lm -lwsock32 + #CC_WINFLAG = -mwindows +@@ -80,7 +80,7 @@ xml2300 : $(XMLOBJ) + $(CC) $(CFLAGS) -o $@ $(XMLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) + + mysql2300: +- $(CC) $(CFLAGS) -o mysql2300 mysql2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/mysql -L/usr/lib/mysql -lmysqlclient ++ $(CC) $(CFLAGS) -o mysql2300 mysql2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG) + + pgsql2300: $(PGSQLOBJ) + $(CC) $(CFLAGS) -o $@ $(PGSQLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/pgsql -L/usr/lib/pgsql -lpq +@@ -95,7 +95,7 @@ minmax2300: $(MINMAXOBJ) + $(CC) $(CFLAGS) -o $@ $(MINMAXOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) + + mysqlhistlog2300 : +- $(CC) $(CFLAGS) -o mysqlhistlog2300 mysqlhistlog2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/mysql -L/usr/lib/mysql -lmysqlclient ++ $(CC) $(CFLAGS) -o mysqlhistlog2300 mysqlhistlog2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG) + + + install: +-- +1.8.5.3 +
package/open2300/open2300.mk +6 -1
@@ -10,14 +10,19 @@ OPEN2300_VERSION = 12 OPEN2300_BINS = open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 \ histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300 +OPEN2300_CFLAGS = $(TARGET_CFLAGS) +OPEN2300_LDFLAGS = $(TARGET_LDFLAGS) ifeq ($(BR2_PACKAGE_MYSQL),y) OPEN2300_DEPENDENCIES += mysql OPEN2300_BINS += mysql2300 mysqlhistlog2300 + OPEN2300_CFLAGS += -I$(STAGING_DIR)/usr/include/mysql + OPEN2300_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient endif define OPEN2300_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) $(OPEN2300_BINS) + CFLAGS="$(OPEN2300_CFLAGS)" CC_LDFLAGS="$(OPEN2300_LDFLAGS)" \ + $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) $(OPEN2300_BINS) endef define OPEN2300_INSTALL_TARGET_CMDS
Signature · 1 line
1.8.5.3
PATCH 1/1 open2300: fix build failure
Dear Samuel Martin,
Quoted 1 line · Samuel Martin
+- allow to extend CFLAGS and
CC_LDFLAGS
[...]
Quoted 6 lines
+-CFLAGS = -Wall -O3 -DVERSION=\"$(VERSION)\" +-CC_LDFLAGS = -lm +-CC_WINFLAG =++CFLAGS += -Wall -O3 -DVERSION=\"$(VERSION)\"
++CC_LDFLAGS += -lm
++CC_WINFLAG =
This doesn't allow to extend CFLAGS if the CFLAGS is passed on the right hand side of the "make" call.
I.e, with your patch, if you do:
make CFLAGS=-something
Then the CFLAGS will only contain "-something", not "-something -Wall -O3 -DVERSION...". However, with your patch, it works if you do:
CFLAGS=-something make
In Buildroot, we indeed often do $(TARGET_CONFIGURE_OPTS) $(MAKE), which means CFLAGS is passed on the left side of make. But this specific package does not do this:
$(MAKE) CC=... LD=... -C $(@D)
So it doesn't pass CFLAGS, so there is no problem for now, but if it started to pass CFLAGS on the right side of make, then your patch wouldn't work.
Instead, if you want it to work in all cases, it should be:
override CFLAGS += -Wall -O3 ...
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 open2300: fix build failure
Hi Thomas,
Quoted 33 lines · Thomas Petazzoni
Dear Samuel Martin,
Quoted 1 line · Samuel Martin
+- allow to extend CFLAGS and
CC_LDFLAGS[...]
Quoted 6 lines
+-CFLAGS = -Wall -O3 -DVERSION=\"$(VERSION)\" +-CC_LDFLAGS = -lm +-CC_WINFLAG =++CFLAGS += -Wall -O3 -DVERSION=\"$(VERSION)\"
++CC_LDFLAGS += -lm
++CC_WINFLAG =This doesn't allow to extend CFLAGS if the CFLAGS is passed on the right hand side of the "make" call.
I.e, with your patch, if you do:
make CFLAGS=-something
Then the CFLAGS will only contain "-something", not "-something -Wall -O3 -DVERSION...". However, with your patch, it works if you do:
CFLAGS=-something make
In Buildroot, we indeed often do $(TARGET_CONFIGURE_OPTS) $(MAKE), which means CFLAGS is passed on the left side of make. But this specific package does not do this:
$(MAKE) CC=... LD=... -C $(@D)
Quoted 8 lines
So it doesn't pass CFLAGS, so there is no problem for now, but if it started to pass CFLAGS on the right side of make, then your patch wouldn't work.
Instead, if you want it to work in all cases, it should be:
override CFLAGS += -Wall -O3 ...
I did know all these fine details. Thanks a lot for the explanation. I'll fix it and repost shortly.
Regards,
Signature · 4 lines
Samuel -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140206/b5009e3b/attachment.html>