* [Buildroot] [PATCH 2/4] fbv: remove redundant --static flag to pkg-config
2015-07-26 18:58 [Buildroot] [PATCH 1/4] aiccu: remove redundant --static flag to pkg-config Thomas De Schampheleire
@ 2015-07-26 18:58 ` Thomas De Schampheleire
2015-07-26 20:09 ` Yann E. MORIN
2015-07-26 18:58 ` [Buildroot] [PATCH 3/4] nmap: " Thomas De Schampheleire
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Thomas De Schampheleire @ 2015-07-26 18:58 UTC (permalink / raw)
To: buildroot
From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
The pkg-config tool is automatically passing --static when BR2_STATIC_LIBS
is set (see package/pkgconf/pkgconf.mk), so no need to pass it explicitly
from package .mk files.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
package/fbv/fbv.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk
index 5f7dc8c..d12b9f4 100644
--- a/package/fbv/fbv.mk
+++ b/package/fbv/fbv.mk
@@ -18,7 +18,7 @@ FBV_DEPENDENCIES += libpng
# libpng in turn depends on other libraries
ifeq ($(BR2_STATIC_LIBS),y)
-FBV_CONFIGURE_OPTS += "--libs=`$(PKG_CONFIG_HOST_BINARY) --libs libpng --static`"
+FBV_CONFIGURE_OPTS += "--libs=`$(PKG_CONFIG_HOST_BINARY) --libs libpng`"
endif
else
--
1.8.5.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 2/4] fbv: remove redundant --static flag to pkg-config
2015-07-26 18:58 ` [Buildroot] [PATCH 2/4] fbv: " Thomas De Schampheleire
@ 2015-07-26 20:09 ` Yann E. MORIN
0 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2015-07-26 20:09 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2015-07-26 20:58 +0200, Thomas De Schampheleire spake thusly:
> From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> The pkg-config tool is automatically passing --static when BR2_STATIC_LIBS
> is set (see package/pkgconf/pkgconf.mk), so no need to pass it explicitly
> from package .mk files.
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/fbv/fbv.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk
> index 5f7dc8c..d12b9f4 100644
> --- a/package/fbv/fbv.mk
> +++ b/package/fbv/fbv.mk
> @@ -18,7 +18,7 @@ FBV_DEPENDENCIES += libpng
>
> # libpng in turn depends on other libraries
> ifeq ($(BR2_STATIC_LIBS),y)
> -FBV_CONFIGURE_OPTS += "--libs=`$(PKG_CONFIG_HOST_BINARY) --libs libpng --static`"
> +FBV_CONFIGURE_OPTS += "--libs=`$(PKG_CONFIG_HOST_BINARY) --libs libpng`"
> endif
>
> else
> --
> 1.8.5.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 3/4] nmap: remove redundant --static flag to pkg-config
2015-07-26 18:58 [Buildroot] [PATCH 1/4] aiccu: remove redundant --static flag to pkg-config Thomas De Schampheleire
2015-07-26 18:58 ` [Buildroot] [PATCH 2/4] fbv: " Thomas De Schampheleire
@ 2015-07-26 18:58 ` Thomas De Schampheleire
2015-07-26 20:10 ` Yann E. MORIN
2015-07-26 18:58 ` [Buildroot] [PATCH 4/4] php: " Thomas De Schampheleire
` (2 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Thomas De Schampheleire @ 2015-07-26 18:58 UTC (permalink / raw)
To: buildroot
From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
The pkg-config tool is automatically passing --static when BR2_STATIC_LIBS
is set (see package/pkgconf/pkgconf.mk), so no need to pass it explicitly
from package .mk files.
Additionally, replace a missed occurrence of $(shell) with backticks.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
package/nmap/nmap.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk
index d450f5e..1a0e977 100644
--- a/package/nmap/nmap.mk
+++ b/package/nmap/nmap.mk
@@ -30,7 +30,7 @@ NMAP_POST_PATCH_HOOKS += NMAP_WRAPPER_EXEC
ifeq ($(BR2_PACKAGE_OPENSSL),y)
NMAP_CONF_OPTS += --with-openssl="$(STAGING_DIR)/usr"
NMAP_DEPENDENCIES += host-pkgconf openssl
-NMAP_LIBS_FOR_STATIC_LINK += $(shell $(PKG_CONFIG_HOST_BINARY) --libs --static openssl)
+NMAP_LIBS_FOR_STATIC_LINK += `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
else
NMAP_CONF_OPTS += --without-openssl
endif
--
1.8.5.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 3/4] nmap: remove redundant --static flag to pkg-config
2015-07-26 18:58 ` [Buildroot] [PATCH 3/4] nmap: " Thomas De Schampheleire
@ 2015-07-26 20:10 ` Yann E. MORIN
0 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2015-07-26 20:10 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2015-07-26 20:58 +0200, Thomas De Schampheleire spake thusly:
> From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> The pkg-config tool is automatically passing --static when BR2_STATIC_LIBS
> is set (see package/pkgconf/pkgconf.mk), so no need to pass it explicitly
> from package .mk files.
>
> Additionally, replace a missed occurrence of $(shell) with backticks.
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/nmap/nmap.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk
> index d450f5e..1a0e977 100644
> --- a/package/nmap/nmap.mk
> +++ b/package/nmap/nmap.mk
> @@ -30,7 +30,7 @@ NMAP_POST_PATCH_HOOKS += NMAP_WRAPPER_EXEC
> ifeq ($(BR2_PACKAGE_OPENSSL),y)
> NMAP_CONF_OPTS += --with-openssl="$(STAGING_DIR)/usr"
> NMAP_DEPENDENCIES += host-pkgconf openssl
> -NMAP_LIBS_FOR_STATIC_LINK += $(shell $(PKG_CONFIG_HOST_BINARY) --libs --static openssl)
> +NMAP_LIBS_FOR_STATIC_LINK += `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
> else
> NMAP_CONF_OPTS += --without-openssl
> endif
> --
> 1.8.5.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 4/4] php: remove redundant --static flag to pkg-config
2015-07-26 18:58 [Buildroot] [PATCH 1/4] aiccu: remove redundant --static flag to pkg-config Thomas De Schampheleire
2015-07-26 18:58 ` [Buildroot] [PATCH 2/4] fbv: " Thomas De Schampheleire
2015-07-26 18:58 ` [Buildroot] [PATCH 3/4] nmap: " Thomas De Schampheleire
@ 2015-07-26 18:58 ` Thomas De Schampheleire
2015-07-26 20:11 ` Yann E. MORIN
2015-07-26 20:08 ` [Buildroot] [PATCH 1/4] aiccu: " Yann E. MORIN
2015-07-26 21:46 ` Thomas Petazzoni
4 siblings, 1 reply; 9+ messages in thread
From: Thomas De Schampheleire @ 2015-07-26 18:58 UTC (permalink / raw)
To: buildroot
From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
The pkg-config tool is automatically passing --static when BR2_STATIC_LIBS
is set (see package/pkgconf/pkgconf.mk), so no need to pass it explicitly
from package .mk files.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
package/php/php.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/php/php.mk b/package/php/php.mk
index 39f4e2a..4b171cf 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -116,7 +116,7 @@ PHP_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += openssl
# openssl needs zlib, but the configure script forgets to link against
# it causing detection failures with static linking
-PHP_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs --static openssl`
+PHP_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y)
@@ -187,7 +187,7 @@ endif
ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
PHP_CONF_OPTS += --with-sqlite3=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += sqlite
-PHP_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs --static sqlite3`
+PHP_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs sqlite3`
endif
### PDO
--
1.8.5.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 4/4] php: remove redundant --static flag to pkg-config
2015-07-26 18:58 ` [Buildroot] [PATCH 4/4] php: " Thomas De Schampheleire
@ 2015-07-26 20:11 ` Yann E. MORIN
0 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2015-07-26 20:11 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2015-07-26 20:58 +0200, Thomas De Schampheleire spake thusly:
> From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> The pkg-config tool is automatically passing --static when BR2_STATIC_LIBS
> is set (see package/pkgconf/pkgconf.mk), so no need to pass it explicitly
> from package .mk files.
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/php/php.mk | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/php/php.mk b/package/php/php.mk
> index 39f4e2a..4b171cf 100644
> --- a/package/php/php.mk
> +++ b/package/php/php.mk
> @@ -116,7 +116,7 @@ PHP_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr
> PHP_DEPENDENCIES += openssl
> # openssl needs zlib, but the configure script forgets to link against
> # it causing detection failures with static linking
> -PHP_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs --static openssl`
> +PHP_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
> endif
>
> ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y)
> @@ -187,7 +187,7 @@ endif
> ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
> PHP_CONF_OPTS += --with-sqlite3=$(STAGING_DIR)/usr
> PHP_DEPENDENCIES += sqlite
> -PHP_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs --static sqlite3`
> +PHP_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs sqlite3`
> endif
>
> ### PDO
> --
> 1.8.5.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/4] aiccu: remove redundant --static flag to pkg-config
2015-07-26 18:58 [Buildroot] [PATCH 1/4] aiccu: remove redundant --static flag to pkg-config Thomas De Schampheleire
` (2 preceding siblings ...)
2015-07-26 18:58 ` [Buildroot] [PATCH 4/4] php: " Thomas De Schampheleire
@ 2015-07-26 20:08 ` Yann E. MORIN
2015-07-26 21:46 ` Thomas Petazzoni
4 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2015-07-26 20:08 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2015-07-26 20:58 +0200, Thomas De Schampheleire spake thusly:
> From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> The pkg-config tool is automatically passing --static when BR2_STATIC_LIBS
> is set (see package/pkgconf/pkgconf.mk), so no need to pass it explicitly
> from package .mk files.
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/aiccu/aiccu.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/aiccu/aiccu.mk b/package/aiccu/aiccu.mk
> index fc328fd..60d65dd 100644
> --- a/package/aiccu/aiccu.mk
> +++ b/package/aiccu/aiccu.mk
> @@ -16,7 +16,7 @@ AICCU_LFDLAGS = $(TARGET_LDFLAGS)
> # aiccu forgets to link with gnutls' dependencies breaking the build when
> # linking statically
> ifeq ($(BR2_STATIC_LIBS),y)
> -AICCU_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --static --libs gnutls`
> +AICCU_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs gnutls`
> endif
>
> # dummy RPM_OPT_FLAGS to disable stripping
> --
> 1.8.5.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 1/4] aiccu: remove redundant --static flag to pkg-config
2015-07-26 18:58 [Buildroot] [PATCH 1/4] aiccu: remove redundant --static flag to pkg-config Thomas De Schampheleire
` (3 preceding siblings ...)
2015-07-26 20:08 ` [Buildroot] [PATCH 1/4] aiccu: " Yann E. MORIN
@ 2015-07-26 21:46 ` Thomas Petazzoni
4 siblings, 0 replies; 9+ messages in thread
From: Thomas Petazzoni @ 2015-07-26 21:46 UTC (permalink / raw)
To: buildroot
Dear Thomas De Schampheleire,
On Sun, 26 Jul 2015 20:58:29 +0200, Thomas De Schampheleire wrote:
> From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> The pkg-config tool is automatically passing --static when BR2_STATIC_LIBS
> is set (see package/pkgconf/pkgconf.mk), so no need to pass it explicitly
> from package .mk files.
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> ---
> package/aiccu/aiccu.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
All four patches applied, thanks. Thanks also to Yann for the review,
and the discussion on IRC leading to those clean up patches.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 9+ messages in thread