Skip to contentSkip to conversation

Handle more <pkg>-config scripts

PATCH New Thomas Petazzoni 2 participants 18 messages May 10, 2013 – May 11, 2013

lore
Share & tools
lore
#0 lore raw

cover Handle more <pkg>-config scripts

Hello,

The allyespackageconfig build has revealed a number of packages that are still installing a <pkg>-config script in target/usr/bin. This patch series converts those packages to use the <pkg>_CONFIG_SCRIPTS mechanism where appropriate, or to manual removal when <pkg>_CONFIG_SCRIPTS is not appropriate (it's the case for Python2/Python3).

Best regards,

Thomas

Thomas Petazzoni (16):
libcgicc: handle cgicc-config script
fltk: handle fltk-config script
gsl: handle gsl-config script
imlib2: handle imlib2-config script
libart: handle libart2-config script
libcdaudio: handle libcdaudio-config script
libesmtp: handle libesmtp-config script
libftdi: handle libftdi-config script
libvncserver: handle libvncserver-config script
netatalk: handle netatalk-config script
netsnmp: handle net-snmp-config script
liblog4c-localtime: remove whitespace at beginning of lines
liblog4c-localtime: handle log4c-config script
python: remove stale python2-config symbolic link
python3: remove another config script
sane-backends: handle sane-config script

 package/fltk/fltk.mk                             |    1 +
 package/gsl/gsl.mk                               |    1 +
 package/imlib2/imlib2.mk                         |    6 ++----
 package/libart/libart.mk                         |    1 +
 package/libcdaudio/libcdaudio.mk                 |    1 +
 package/libcgicc/libcgicc.mk                     |    2 +-
 package/libesmtp/libesmtp.mk                     |    2 +-
 package/libftdi/libftdi.mk                       |    2 +-
 package/liblog4c-localtime/liblog4c-localtime.mk |   21 +++++++++++----------
 package/libvncserver/libvncserver.mk             |    1 +
 package/netatalk/netatalk.mk                     |    1 +
 package/netsnmp/netsnmp.mk                       |    6 +++---
 package/python/python.mk                         |    1 +
 package/python3/python3.mk                       |    1 +
 package/sane-backends/sane-backends.mk           |    1 +
 15 files changed, 28 insertions(+), 20 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/16 libcgicc: handle cgicc-config script

---
 package/libcgicc/libcgicc.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libcgicc/libcgicc.mk +1 -1
index 80e9213..4c5664f 100644
@@ -9,7 +9,7 @@ LIBCGICC_SOURCE=cgicc-$(LIBCGICC_VERSION).tar.gz
 LIBCGICC_LICENSE=LGPLv3+
 LIBCGICC_INSTALL_STAGING=YES
 LIBCGICC_AUTORECONF=YES
-
+LIBCGICC_CONFIG_SCRIPTS = cgicc-config
 LIBCGICC_CONF_OPT = \
 	--disable-demos \
 	--disable-doc
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/16 fltk: handle fltk-config script

In reply to Thomas Petazzoni
---
 package/fltk/fltk.mk |    1 +
 1 file changed, 1 insertion(+)
package/fltk/fltk.mk +1 -0
index 3f192cd..697eb91 100644
@@ -12,5 +12,6 @@ FLTK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) STRIP=$(TARGET_STRIP) install
 FLTK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) install
 FLTK_CONF_OPT = --enable-threads --with-x
 FLTK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt
+FLTK_CONFIG_SCRIPTS = fltk-config
 
 $(eval $(autotools-package))
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 3/16 gsl: handle gsl-config script

In reply to Thomas Petazzoni
---
 package/gsl/gsl.mk |    1 +
 1 file changed, 1 insertion(+)
package/gsl/gsl.mk +1 -0
index 6591591..ef426cf 100644
@@ -9,6 +9,7 @@ GSL_SITE = $(BR2_GNU_MIRROR)/gsl
 GSL_INSTALL_STAGING = YES
 GSL_LICENSE = GPLv3
 GSL_LICENSE_FILES = COPYING
+GSL_CONFIG_SCRIPTS = gsl-config
 
 # uClibc pretends to have fenv support as it installs <fenv.h>, but in
 # practice, it only implements it for i386. Problem reported upstream
Signature · 1 line
1.7.9.5
#4 lore raw

PATCH 4/16 imlib2: handle imlib2-config script

In reply to Thomas Petazzoni
---
 package/imlib2/imlib2.mk |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
package/imlib2/imlib2.mk +2 -4
index c7029ae..cec6706 100644
@@ -12,6 +12,7 @@ IMLIB2_LICENSE_FILES = COPYING
 IMLIB2_INSTALL_STAGING = YES
 IMLIB2_DEPENDENCIES = host-pkgconf freetype
 IMLIB2_CONF_OPT = --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
+IMLIB2_CONFIG_SCRIPTS = imlib2-config
 
 ifeq ($(BR2_PACKAGE_IMLIB2_X),y)
 	IMLIB2_CONF_OPT += --with-x
@@ -57,10 +58,7 @@ endif
 
 # drop -L<dir> from linker flags
 define IMLIB2_FIXUP_IMLIB2_CONFIG
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e  's/-L[^ ]*//g' \
-		$(STAGING_DIR)/usr/bin/imlib2-config
+	$(SED) 's/-L[^ ]*//g' $(STAGING_DIR)/usr/bin/imlib2-config
 endef
 
 IMLIB2_POST_INSTALL_STAGING_HOOKS += IMLIB2_FIXUP_IMLIB2_CONFIG
Signature · 1 line
1.7.9.5
#5 lore raw

PATCH 5/16 libart: handle libart2-config script

In reply to Thomas Petazzoni
---
 package/libart/libart.mk |    1 +
 1 file changed, 1 insertion(+)
package/libart/libart.mk +1 -0
index 0505ff5..822dbf1 100644
@@ -9,5 +9,6 @@ LIBART_SOURCE = libart_lgpl-$(LIBART_VERSION).tar.gz
 LIBART_SITE = http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/
 LIBART_AUTORECONF = YES
 LIBART_INSTALL_STAGING = YES
+LIBART_CONFIG_SCRIPTS = libart2-config
 
 $(eval $(autotools-package))
Signature · 1 line
1.7.9.5
#6 lore raw

PATCH 6/16 libcdaudio: handle libcdaudio-config script

In reply to Thomas Petazzoni
---
 package/libcdaudio/libcdaudio.mk |    1 +
 1 file changed, 1 insertion(+)
package/libcdaudio/libcdaudio.mk +1 -0
index 203a8aa..92efabc 100644
@@ -10,5 +10,6 @@ LIBCDAUDIO_SITE = http://downloads.sourceforge.net/project/libcdaudio/libcdaudio
 LIBCDAUDIO_AUTORECONF = YES
 LIBCDAUDIO_LIBTOOL_PATCH = YES
 LIBCDAUDIO_INSTALL_STAGING = YES
+LIBCDAUDIO_CONFIG_SCRIPTS = libcdaudio-config
 
 $(eval $(autotools-package))
Signature · 1 line
1.7.9.5
#7 lore raw

PATCH 7/16 libesmtp: handle libesmtp-config script

In reply to Thomas Petazzoni
---
 package/libesmtp/libesmtp.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libesmtp/libesmtp.mk +1 -1
index 078a729..baa0d64 100644
@@ -7,7 +7,7 @@ LIBESMTP_VERSION = 1.0.6
 LIBESMTP_SOURCE = libesmtp-$(LIBESMTP_VERSION).tar.bz2
 LIBESMTP_SITE = http://www.stafford.uklinux.net/libesmtp
 LIBESMTP_INSTALL_STAGING = YES
-
+LIBESMTP_CONFIG_SCRIPTS = libesmtp-config
 LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl)
 
 $(eval $(autotools-package))
Signature · 1 line
1.7.9.5
#8 lore raw

PATCH 8/16 libftdi: handle libftdi-config script

In reply to Thomas Petazzoni
---
 package/libftdi/libftdi.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libftdi/libftdi.mk +1 -1
index d0f5ef6..c5590ba 100644
@@ -8,7 +8,7 @@ LIBFTDI_SOURCE = libftdi-$(LIBFTDI_VERSION).tar.gz
 LIBFTDI_SITE = http://www.intra2net.com/en/developer/libftdi/download/
 LIBFTDI_DEPENDENCIES = libusb-compat libusb
 LIBFTDI_INSTALL_STAGING = YES
-
+LIBFTDI_CONFIG_SCRIPTS = libftdi-config
 LIBFTDI_AUTORECONF = YES
 
 LIBFDTI_CONF_OPT = --without-examples
Signature · 1 line
1.7.9.5
#9 lore raw

PATCH 9/16 libvncserver: handle libvncserver-config script

In reply to Thomas Petazzoni
---
 package/libvncserver/libvncserver.mk |    1 +
 1 file changed, 1 insertion(+)
package/libvncserver/libvncserver.mk +1 -0
index 550abc4..a450632 100644
@@ -10,6 +10,7 @@ LIBVNCSERVER_SITE = http://downloads.sourceforge.net/project/libvncserver/libvnc
 LIBVNCSERVER_LICENSE = GPLv2+
 LIBVNCSERVER_LICENSE_FILES = COPYING
 LIBVNCSERVER_INSTALL_STAGING = YES
+LIBVNCSERVER_CONFIG_SCRIPTS = libvncserver-config
 
 # only used for examples
 LIBVNCSERVER_CONF_OPT += --with-sdl-config=/bin/false
Signature · 1 line
1.7.9.5
#10 lore raw

PATCH 10/16 netatalk: handle netatalk-config script

In reply to Thomas Petazzoni
---
 package/netatalk/netatalk.mk |    1 +
 1 file changed, 1 insertion(+)
package/netatalk/netatalk.mk +1 -0
index 243d3f7..a366644 100644
@@ -8,6 +8,7 @@ NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NET
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 
 NETATALK_AUTORECONF = YES
+NETATALK_CONFIG_SCRIPTS = netatalk-config
 
 NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error
 NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99"
Signature · 1 line
1.7.9.5
#11 lore raw

PATCH 11/16 netsnmp: handle net-snmp-config script

In reply to Thomas Petazzoni
---
 package/netsnmp/netsnmp.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
package/netsnmp/netsnmp.mk +3 -3
index a6912e5..6a72da7 100644
@@ -24,6 +24,8 @@ NETSNMP_CONF_OPT = --with-persistent-directory=/var/lib/snmp --disable-static \
 		--with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \
 		--with-out-transports="Unix"
 NETSNMP_MAKE = $(MAKE1)
+NETSNMP_CONFIG_SCRIPTS = net-snmp-config
+
 NETSNMP_BLOAT_MIBS = BRIDGE DISMAN-EVENT DISMAN-SCHEDULE DISMAN-SCRIPT EtherLike RFC-1215 RFC1155-SMI RFC1213 SCTP SMUX
 
 ifeq ($(BR2_ENDIAN),"BIG")
@@ -81,9 +83,7 @@ define NETSNMP_UNINSTALL_TARGET_CMDS
 endef
 
 define NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP
-	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
-		-e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \
+	$(SED) 	"s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \
 		-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
 		$(STAGING_DIR)/usr/bin/net-snmp-config
 endef
Signature · 1 line
1.7.9.5
#12 lore raw

PATCH 12/16 liblog4c-localtime: remove whitespace at beginning of lines

In reply to Thomas Petazzoni
---
 package/liblog4c-localtime/liblog4c-localtime.mk |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
package/liblog4c-localtime/liblog4c-localtime.mk +10 -10
index 3b1642c..492c6ef 100644
@@ -1,13 +1,13 @@
- #############################################################
- #
- # liblog4c
- #
- #############################################################
- LIBLOG4C_LOCALTIME_VERSION = 1.0
- LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarball/v$(LIBLOG4C_LOCALTIME_VERSION)
- LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
- LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest
- LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
+#############################################################
+#
+# liblog4c
+#
+#############################################################
+LIBLOG4C_LOCALTIME_VERSION = 1.0
+LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarball/v$(LIBLOG4C_LOCALTIME_VERSION)
+LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
+LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest
+LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
 
 define LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS
 	chmod +x $(@D)/configure
Signature · 1 line
1.7.9.5
#13 lore raw

PATCH 13/16 liblog4c-localtime: handle log4c-config script

In reply to Thomas Petazzoni
---
 package/liblog4c-localtime/liblog4c-localtime.mk |    1 +
 1 file changed, 1 insertion(+)
package/liblog4c-localtime/liblog4c-localtime.mk +1 -0
index 492c6ef..3701cca 100644
@@ -8,6 +8,7 @@ LIBLOG4C_LOCALTIME_SITE    = https://github.com/rcmadruga/log4c-localtime/tarbal
 LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
 LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest
 LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
+LIBLOG4C_LOCALTIME_CONFIG_SCRIPTS = log4c-config
 
 define LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS
 	chmod +x $(@D)/configure
Signature · 1 line
1.7.9.5
#14 lore raw

PATCH 14/16 python: remove stale python2-config symbolic link

In reply to Thomas Petazzoni

We already remove python2.7-config and the symbolic link python-config, but we forgot to remove the python2-config symbolic link.

Note that we can't use the <pkg>_CONFIG_SCRIPTS mechanism here because python2.7-config is written in... Python, and doesn't follow the usual syntax of <pkg>-config scripts. It takes the paths directly from distutils.sysconfig.

---
 package/python/python.mk |    1 +
 1 file changed, 1 insertion(+)
package/python/python.mk +1 -0
index b942854..801c669 100644
@@ -154,6 +154,7 @@ PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_SMTPD
 #
 define PYTHON_REMOVE_DEVFILES
 	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR)-config
+	rm -f $(TARGET_DIR)/usr/bin/python2-config
 	rm -f $(TARGET_DIR)/usr/bin/python-config
 endef
 
Signature · 1 line
1.7.9.5
#15 lore raw

PATCH 15/16 python3: remove another config script

In reply to Thomas Petazzoni
---
 package/python3/python3.mk |    1 +
 1 file changed, 1 insertion(+)
package/python3/python3.mk +1 -0
index 7551a7b..239ac8f 100644
@@ -130,6 +130,7 @@ PYTHON3_POST_INSTALL_STAGING_HOOKS += PYTHON3_FIXUP_LIBDIR
 #
 define PYTHON3_REMOVE_DEVFILES
 	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)-config
+	rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)m-config
 	rm -f $(TARGET_DIR)/usr/bin/python3-config
 endef
 
Signature · 1 line
1.7.9.5
#16 lore raw

PATCH 16/16 sane-backends: handle sane-config script

In reply to Thomas Petazzoni
---
 package/sane-backends/sane-backends.mk |    1 +
 1 file changed, 1 insertion(+)
package/sane-backends/sane-backends.mk +1 -0
index 496dca4..9022845 100644
@@ -6,6 +6,7 @@
 SANE_BACKENDS_VERSION = 1.0.22
 SANE_BACKENDS_SOURCE = sane-backends-$(SANE_BACKENDS_VERSION).tar.gz
 SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/3503
+SANE_BACKENDS_CONFIG_SCRIPTS = sane-config
 
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 SANE_BACKENDS_DEPENDENCIES += libusb
Signature · 1 line
1.7.9.5
#17 lore raw

cover Handle more <pkg>-config scripts

In reply to Thomas Petazzoni
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Hello,
Thomas> The allyespackageconfig build has revealed a number of packages that Thomas> are still installing a <pkg>-config script in target/usr/bin. This Thomas> patch series converts those packages to use the <pkg>_CONFIG_SCRIPTS Thomas> mechanism where appropriate, or to manual removal when Thomas> <pkg>_CONFIG_SCRIPTS is not appropriate (it's the case for Thomas> Python2/Python3).

Thomas> Best regards,

Thomas> Thomas

Thomas> Thomas Petazzoni (16):

 Thomas>   libcgicc: handle cgicc-config script
 Thomas>   fltk: handle fltk-config script
 Thomas>   gsl: handle gsl-config script
 Thomas>   imlib2: handle imlib2-config script
 Thomas>   libart: handle libart2-config script
 Thomas>   libcdaudio: handle libcdaudio-config script
 Thomas>   libesmtp: handle libesmtp-config script
 Thomas>   libftdi: handle libftdi-config script
 Thomas>   libvncserver: handle libvncserver-config script
 Thomas>   netatalk: handle netatalk-config script
 Thomas>   netsnmp: handle net-snmp-config script
 Thomas>   liblog4c-localtime: remove whitespace at beginning of lines
 Thomas>   liblog4c-localtime: handle log4c-config script
 Thomas>   python: remove stale python2-config symbolic link
 Thomas>   python3: remove another config script
 Thomas>   sane-backends: handle sane-config script

Committed to next, thanks.

Signature · 1 line
Bye, Peter Korsgaard