aiccu: remove redundant --static flag to pkg-config

PATCH New Thomas De Schampheleire 3 participants 9 messages Jul 26, 2015

lore

Share & tools

lore

Thomas De Schampheleire

author

2015-07-26 18:58 UTC #0 lore raw

PATCH 1/4 aiccu: remove redundant --static flag to pkg-config

From: Thomas De Schampheleire <[email protected]>

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 <[email protected]>

---
 package/aiccu/aiccu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/aiccu/aiccu.mk +1 -1

index fc328fd..60d65dd 100644
@@ -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

Signature · 1 line

1.8.5.1

Thomas De Schampheleire

author

2015-07-26 18:58 UTC #1 lore raw

PATCH 2/4 fbv: remove redundant --static flag to pkg-config

From: Thomas De Schampheleire <[email protected]>

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 <[email protected]>

---
 package/fbv/fbv.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/fbv/fbv.mk +1 -1

index 5f7dc8c..d12b9f4 100644
@@ -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

Signature · 1 line

1.8.5.1

Yann E. MORIN

2015-07-26 20:09 UTC #2 lore raw

PATCH 2/4 fbv: remove redundant --static flag to pkg-config

Thomas, All,

On 2015-07-26 20:58 +0200, Thomas De Schampheleire spake thusly:

Quoted 7 lines

From: Thomas De Schampheleire <[email protected]>
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 <[email protected]>

Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 20 lines

---
 package/fbv/fbv.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/fbv/fbv.mk +1 -1

index 5f7dc8c..d12b9f4 100644
@@ -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

Signature · 1 line

1.8.5.1

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

Thomas De Schampheleire

author

2015-07-26 18:58 UTC #3 lore raw

PATCH 3/4 nmap: remove redundant --static flag to pkg-config

In reply to Thomas De Schampheleire

From: Thomas De Schampheleire <[email protected]>

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 <[email protected]>

---
 package/nmap/nmap.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/nmap/nmap.mk +1 -1

index d450f5e..1a0e977 100644
@@ -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

Signature · 1 line

1.8.5.1

Yann E. MORIN

2015-07-26 20:10 UTC #4 lore raw

PATCH 3/4 nmap: remove redundant --static flag to pkg-config

Thomas, All,

On 2015-07-26 20:58 +0200, Thomas De Schampheleire spake thusly:

Quoted 9 lines

From: Thomas De Schampheleire <[email protected]>
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 <[email protected]>

Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 20 lines

---
 package/nmap/nmap.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/nmap/nmap.mk +1 -1

index d450f5e..1a0e977 100644
@@ -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

Signature · 1 line

1.8.5.1

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

Thomas De Schampheleire

author

2015-07-26 18:58 UTC #5 lore raw

PATCH 4/4 php: remove redundant --static flag to pkg-config

In reply to Thomas De Schampheleire

From: Thomas De Schampheleire <[email protected]>

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 <[email protected]>

---
 package/php/php.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

package/php/php.mk +2 -2

index 39f4e2a..4b171cf 100644
@@ -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

Signature · 1 line

1.8.5.1

Yann E. MORIN

2015-07-26 20:11 UTC #6 lore raw

PATCH 4/4 php: remove redundant --static flag to pkg-config

Thomas, All,

On 2015-07-26 20:58 +0200, Thomas De Schampheleire spake thusly:

Quoted 7 lines

From: Thomas De Schampheleire <[email protected]>
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 <[email protected]>

Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 29 lines

---
 package/php/php.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

package/php/php.mk +2 -2

index 39f4e2a..4b171cf 100644
@@ -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

Signature · 1 line

1.8.5.1

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

Yann E. MORIN

2015-07-26 20:08 UTC #7 lore raw

PATCH 1/4 aiccu: remove redundant --static flag to pkg-config

In reply to Thomas De Schampheleire

Thomas, All,

On 2015-07-26 20:58 +0200, Thomas De Schampheleire spake thusly:

Quoted 7 lines

From: Thomas De Schampheleire <[email protected]>
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 <[email protected]>

Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 20 lines

---
 package/aiccu/aiccu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/aiccu/aiccu.mk +1 -1

index fc328fd..60d65dd 100644
@@ -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

Signature · 1 line

1.8.5.1

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

Thomas Petazzoni

2015-07-26 21:46 UTC #8 lore raw

PATCH 1/4 aiccu: remove redundant --static flag to pkg-config

In reply to Thomas De Schampheleire

Dear Thomas De Schampheleire,

Quoted 10 lines · Thomas De Schampheleire

From: Thomas De Schampheleire <[email protected]>
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 <[email protected]>
---
 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

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com