Patchwork sconeserver: fix autouild failure

login
register
mail settings
Submitter Simon Dawson
Date June 3, 2013, 12:10 p.m.
Message ID <1370261409-8722-1-git-send-email-spdawson@gmail.com>
Download mbox | patch
Permalink /patch/248245/
State Accepted
Commit 626f9e37492c7f9f5332df02c17e09349f54565b
Headers show

Comments

Simon Dawson - June 3, 2013, 12:10 p.m.
From: Simon Dawson <spdawson@gmail.com>

Fixes autobuild failures such as the following.

  http://autobuild.buildroot.net/results/1bdb5e014daf76b701afea5c82ac83ac4c97d4cb/

Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
 package/sconeserver/sconeserver.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Thomas Petazzoni - June 3, 2013, 12:44 p.m.
Simon,

On Mon,  3 Jun 2013 13:10:09 +0100, spdawson@gmail.com wrote:

> diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
> index 744f389..565d467 100644
> --- a/package/sconeserver/sconeserver.mk
> +++ b/package/sconeserver/sconeserver.mk
> @@ -60,7 +60,8 @@ endif
>  ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
>  	SCONESERVER_DEPENDENCIES += mysql_client
>  	SCONESERVER_CONF_OPT += --with-mysql \
> -		--with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config"
> +		--with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config" \
> +		LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/mysql"
>  else
>  	SCONESERVER_CONF_OPT += --without-mysql
>  endif

This more-or-less reverts part of your commit
8d34e073c00236ff41a6df8f0fdd6b0b25dc4ad1. Is there a reason why
sconeserver isn't taking the right ldflags from mysql_config?

Thanks,

Thomas
Simon Dawson - June 3, 2013, 1:12 p.m.
Hi Thomas; thanks for looking at this.

On 3 June 2013 13:44, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> This more-or-less reverts part of your commit
> 8d34e073c00236ff41a6df8f0fdd6b0b25dc4ad1. Is there a reason why
> sconeserver isn't taking the right ldflags from mysql_config?

The sconeserver configure script doesn't call mysql_config until after
it has checked for the mysqlclient library; the adjustment of the
LDFLAGS in the package makefile is needed so that the check for the
mysqlclient library works correctly. Once this library check has been
performed, the configure script calls mysql_config to obtain compile
and link flags for the build.

Simon.
Thomas Petazzoni - June 3, 2013, 1:24 p.m.
Dear Simon Dawson,

On Mon, 3 Jun 2013 14:12:27 +0100, Simon Dawson wrote:

> The sconeserver configure script doesn't call mysql_config until after
> it has checked for the mysqlclient library; the adjustment of the
> LDFLAGS in the package makefile is needed so that the check for the
> mysqlclient library works correctly. Once this library check has been
> performed, the configure script calls mysql_config to obtain compile
> and link flags for the build.

Ok, the configure script is stupid (checking for a library existence
before calling mysql_config), but ok, I guess we have to live with
that :)

Thanks,

Thomas
Simon Dawson - June 3, 2013, 1:37 p.m.
On 3 June 2013 14:24, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Ok, the configure script is stupid (checking for a library existence
> before calling mysql_config), but ok, I guess we have to live with
> that :)

Yes, agreed.

Simon.
Peter Korsgaard - June 3, 2013, 2:33 p.m.
>>>>> "spdawson" == spdawson  <spdawson@gmail.com> writes:

 spdawson> From: Simon Dawson <spdawson@gmail.com>
 spdawson> Fixes autobuild failures such as the following.

 spdawson>   http://autobuild.buildroot.net/results/1bdb5e014daf76b701afea5c82ac83ac4c97d4cb/

Committed, thanks.
Thomas Petazzoni - June 8, 2013, 3:49 p.m.
Dear spdawson@gmail.com,

On Mon,  3 Jun 2013 13:10:09 +0100, spdawson@gmail.com wrote:
> From: Simon Dawson <spdawson@gmail.com>
> 
> Fixes autobuild failures such as the following.
> 
>   http://autobuild.buildroot.net/results/1bdb5e014daf76b701afea5c82ac83ac4c97d4cb/
> 
> Signed-off-by: Simon Dawson <spdawson@gmail.com>

There are still build failures related to sconeserver and MySQL. See
http://autobuild.buildroot.org/results/a16/a162fbd8977faa561a76f76072ec3335fb8e8d1f/build-end.log.

Best regards,

Thomas
Simon Dawson - June 12, 2013, 6:40 p.m.
Hi Thomas,

On 8 June 2013 16:49, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> There are still build failures related to sconeserver and MySQL. See
> http://autobuild.buildroot.org/results/a16/a162fbd8977faa561a76f76072ec3335fb8e8d1f/build-end.log.

I've been unable to reproduce this using the defconfig from the failed
autobuild. I'm struggling to understand what exactly is causing the
failures; would appreciate any suggestions that you may have...

Simon.
Arnout Vandecappelle - June 12, 2013, 9:48 p.m.
On 12/06/13 20:40, Simon Dawson wrote:
> Hi Thomas,
>
> On 8 June 2013 16:49, Thomas Petazzoni
> <thomas.petazzoni@free-electrons.com> wrote:
>> There are still build failures related to sconeserver and MySQL. See
>> http://autobuild.buildroot.org/results/a16/a162fbd8977faa561a76f76072ec3335fb8e8d1f/build-end.log.
>
> I've been unable to reproduce this using the defconfig from the failed
> autobuild. I'm struggling to understand what exactly is causing the
> failures; would appreciate any suggestions that you may have...

  mysql.h is in $(STAGING_DIR)/usr/include/mysql, but that doesn't get 
included in the CXXFLAGS.

  Peter, can you reproduce the autobuilder error and extract the 
config.log and $(STAGING_DIR)/usr/bin/mysql_config?

  Regards,
  Arnout
Peter Korsgaard - June 13, 2013, 7:57 a.m.
>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

Hi,

 >>> There are still build failures related to sconeserver and MySQL. See
 >>> http://autobuild.buildroot.org/results/a16/a162fbd8977faa561a76f76072ec3335fb8e8d1f/build-end.log.
 >> 
 >> I've been unable to reproduce this using the defconfig from the failed
 >> autobuild. I'm struggling to understand what exactly is causing the
 >> failures; would appreciate any suggestions that you may have...

 Arnout>  mysql.h is in $(STAGING_DIR)/usr/include/mysql, but that doesn't get
 Arnout> included in the CXXFLAGS.

 Arnout>  Peter, can you reproduce the autobuilder error and extract the
 Arnout> config.log and $(STAGING_DIR)/usr/bin/mysql_config?

Ehh, it was a build failure on Thomas' server, so it probably makes more
sense that he does it?
Arnout Vandecappelle - June 13, 2013, 8:09 a.m.
On 13/06/13 09:57, Peter Korsgaard wrote:
>>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
>
> Hi,
>
>   >>> There are still build failures related to sconeserver and MySQL. See
>   >>> http://autobuild.buildroot.org/results/a16/a162fbd8977faa561a76f76072ec3335fb8e8d1f/build-end.log.
>   >>
>   >> I've been unable to reproduce this using the defconfig from the failed
>   >> autobuild. I'm struggling to understand what exactly is causing the
>   >> failures; would appreciate any suggestions that you may have...
>
>   Arnout>  mysql.h is in $(STAGING_DIR)/usr/include/mysql, but that doesn't get
>   Arnout> included in the CXXFLAGS.
>
>   Arnout>  Peter, can you reproduce the autobuilder error and extract the
>   Arnout> config.log and $(STAGING_DIR)/usr/bin/mysql_config?
>
> Ehh, it was a build failure on Thomas' server, so it probably makes more
> sense that he does it?

  Sorry, I thought that those /home/test paths were yours. Won't happen 
again :-)

  Regards,
  Arnout
Peter Korsgaard - June 13, 2013, 8:29 a.m.
>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 >> Ehh, it was a build failure on Thomas' server, so it probably makes more
 >> sense that he does it?

 Arnout>  Sorry, I thought that those /home/test paths were yours. Won't
 Arnout> happen again :-)

No problem. This is one of the reasons why we have the submitter file in
the same directory.

Patch

diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
index 744f389..565d467 100644
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -60,7 +60,8 @@  endif
 ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
 	SCONESERVER_DEPENDENCIES += mysql_client
 	SCONESERVER_CONF_OPT += --with-mysql \
-		--with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config"
+		--with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config" \
+		LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/mysql"
 else
 	SCONESERVER_CONF_OPT += --without-mysql
 endif