Skip to contentSkip to conversation

package/gnuplot: drop gdlib-config

PATCH New Fabrice Fontaine 2 participants 2 messages Jan 23, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/gnuplot: drop gdlib-config

Drop gdlib-config and use pkg-config to find gd. Indeed, gdlib.pc is available since version 2.1.0 and
https://github.com/libgd/libgd/commit/071a2a94ee9f9e5ce00ff689dfe67a0fcb885ad6
and gdlib-config has been dropped from version 2.3.0

gnuplot supports pkg-config to find gd since version 5.4.1 and
https://sourceforge.net/p/gnuplot/gnuplot-main/ci/4a64124cf5e7bf7d6fd7be1f1a7b853c022678fd

---
 package/gnuplot/gnuplot.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
package/gnuplot/gnuplot.mk +1 -3
index 746831275a..bebaf1fa76 100644
@@ -31,9 +31,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy)
 GNUPLOT_CONF_OPTS += --with-gd
-GNUPLOT_DEPENDENCIES += gd
-GNUPLOT_CONF_ENV += \
-	ac_cv_path_GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config
+GNUPLOT_DEPENDENCIES += host-pkgconf gd
 else
 GNUPLOT_CONF_OPTS += --without-gd
 endif
Signature · 1 line
2.29.2
#1 lore raw

PATCH 1/1 package/gnuplot: drop gdlib-config

Fabrice, All,

On 2021-01-23 11:32 +0100, Fabrice Fontaine spake thusly:

Quoted 9 lines

Drop gdlib-config and use pkg-config to find gd. Indeed, gdlib.pc is available since version 2.1.0 and
https://github.com/libgd/libgd/commit/071a2a94ee9f9e5ce00ff689dfe67a0fcb885ad6
and gdlib-config has been dropped from version 2.3.0

gnuplot supports pkg-config to find gd since version 5.4.1 and
https://sourceforge.net/p/gnuplot/gnuplot-main/ci/4a64124cf5e7bf7d6fd7be1f1a7b853c022678fd

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 26 lines
---
 package/gnuplot/gnuplot.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
package/gnuplot/gnuplot.mk +1 -3
index 746831275a..bebaf1fa76 100644
@@ -31,9 +31,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy)
 GNUPLOT_CONF_OPTS += --with-gd
-GNUPLOT_DEPENDENCIES += gd
-GNUPLOT_CONF_ENV += \
-	ac_cv_path_GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config
+GNUPLOT_DEPENDENCIES += host-pkgconf gd
 else
 GNUPLOT_CONF_OPTS += --without-gd
 endif
Signature · 6 lines
2.29.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'