Extend and use the <pkg>_CONFIG_FIXUP infra
Hello,
This patch series improves on the <pkg>_CONFIG_FIXUP work done by Stefan Fr?berg by:
* Renaming the variable to <pkg>_CONFIG_SCRIPTS. I believe this is needed, because we will not only "fixup" those files, but also remove them from the target directory. Also, I don't think the variable name should indicate what will happen to these files. It should just indicate what those files are.
* Extending the <pkg>_CONFIG_SCRIPTS handling to remove the config scripts from the TARGET_DIR, unless BR2_HAVE_DEVFILES is set (even though it is deprecated, it is still here).
* Use <pkg>_CONFIG_SCRIPTS in a number of packages that were already fixing manually their <foo>-config script and for which the new infrastructure does exactly the same thing.
* Use <pkg>_CONFIG_SCRIPTS in a number of packages that were doing a bit more than the infrastructure: fixing the includedir and libdir fields. A manual inspection of each of those packages shows that by default, the includedir and libdir are described relatively to prefix and exec_prefix, so fixing up those is sufficient, and this is what the infrastructure does.
* Use <pkg>_CONFIG_SCRIPTS to fix up gpg-error-config installed by the libgpg-error package. This is done separately from the previous patch, because libgpg-error was not previously doing any fix up of its gpg-error-config script.
Best regards,
Thomas
PATCH 1/5 package: rename <pkg>_CONFIG_FIXUP to <pkg>_CONFIG_SCRIPTS
This commit renames the newly introduced <pkg>_CONFIG_FIXUP variable to <pkg>_CONFIG_SCRIPTS, for two reasons:
* <pkg>_CONFIG_SCRIPTS will not only "fixup" the scripts in $(STAGING_DIR)/usr/bin, but also remove them from $(TARGET_DIR)/usr/bin. So it is not only about doing a "fixup".
* On the principle, it is strange that the variable carries an indication of the action that will take place on those files. It should rather be named to say "Here are the <foo>-config scripts", and let the package infrastructure decide if it should fix them up, remove them, etc.
This commit also updates the documentation accordingly.
--- docs/manual/adding-packages-generic.txt | 17 +++++++++-------- package/libpcap/libpcap.mk | 2 +- package/pkg-generic.mk | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-)
docs/manual/adding-packages-generic.txt +9 -8
@@ -25,7 +25,7 @@ system is based on hand-written Makefiles or shell scripts. 09: LIBFOO_LICENSE = GPLv3+ 10: LIBFOO_LICENSE_FILES = COPYING 11: LIBFOO_INSTALL_STAGING = YES -12: LIBFOO_CONFIG_FIXUP = libfoo-config +12: LIBFOO_CONFIG_SCRIPTS = libfoo-config 13: LIBFOO_DEPENDENCIES = host-libaaa libbbb 14: 15: define LIBFOO_BUILD_CMDS
@@ -86,7 +86,7 @@ or: '-L/usr/lib' instead of '-L$(STAGING_DIR)/usr/lib' So some sed magic is done to these scripts to make them give correct flags. -The argument to be given to +LIBFOO_CONFIG_FIXUP+ is the file name(s) +The argument to be given to +LIBFOO_CONFIG_SCRIPTS+ is the file name(s) of the shell script(s) needing fixing. All these names are relative to '$(STAGING_DIR)/usr/bin' and if needed multiple names can be given.
@@ -96,7 +96,7 @@ Package divine installs shell script '$(STAGING_DIR)/usr/bin/divine-config'. So it's fixup would be: -DIVINE_CONFIG = divine-config +DIVINE_CONFIG_SCRIPTS = divine-config Example 2:
@@ -105,8 +105,9 @@ Package imagemagick installs the following scripts: So it's fixup would be: -IMAGEMAGICK_CONFIG_FIXUP = Magick-config Magick++-config \ - MagickCore-config MagickWand-config Wand-config +IMAGEMAGICK_CONFIG_SCRIPTS = \ + Magick-config Magick++-config \ + MagickCore-config MagickWand-config Wand-config On line 13, we specify the list of dependencies this package relies on. These dependencies are listed in terms of lower-case package names,
@@ -284,10 +285,10 @@ information is (assuming the package name is +libfoo+) : variables are executed to install the package into the target directory. -* +LIBFOO_CONFIG_FIXUP+ lists the names of the files in +* +LIBFOO_CONFIG_SCRIPTS+ lists the names of the files in '$(STAGING_DIR)/usr/bin' that need some special fixing to make them - cross-compiling friendly. Multiple file names separated by space can be - given and all are relative to '$(STAGING_DIR)/usr/bin'. + cross-compiling friendly. Multiple file names separated by space can + be given and all are relative to '$(STAGING_DIR)/usr/bin'. * +LIBFOO_DEVICES+ lists the device files to be created by Buildroot when using the static device table. The syntax to use is the
package/libpcap/libpcap.mk +1 -1
@@ -24,7 +24,7 @@ LIBPCAP_DEPENDENCIES = zlib LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \ ac_cv_header_linux_wireless_h=yes # configure misdetects this LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux -LIBPCAP_CONFIG_FIXUP = pcap-config +LIBPCAP_CONFIG_SCRIPTS = pcap-config ifeq ($(BR2_PACKAGE_LIBUSB),y) LIBPCAP_CONF_OPT += --enable-canusb
package/pkg-generic.mk +2 -2
@@ -128,12 +128,12 @@ $(BUILD_DIR)/%/.stamp_staging_installed: @$(call MESSAGE,"Installing to staging directory") $($(PKG)_INSTALL_STAGING_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) - $(Q)if test -n "$($(PKG)_CONFIG_FIXUP)" ; then \ + $(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \ $(call MESSAGE,"Fixing package configuration files") ;\ $(SED) "s,^\(exec_\)\?prefix=.*,\1prefix=$(STAGING_DIR)/usr,g" \ -e "s,-I/usr/,-I$(STAGING_DIR)/usr/,g" \ -e "s,-L/usr/,-L$(STAGING_DIR)/usr/,g" \ - $(addprefix $(STAGING_DIR)/usr/bin/,$($(PKG)_CONFIG_FIXUP)) ;\ + $(addprefix $(STAGING_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ;\ fi $(Q)touch $@
Signature · 1 line
1.7.9.5
PATCH 1/5 package: rename <pkg>_CONFIG_FIXUP to <pkg>_CONFIG_SCRIPTS
Quoted 3 lines · Thomas Petazzoni
This commit also updates the documentation accordingly.
Signed-off-by Thomas Petazzoni<[email protected]>
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 1/5 package: rename <pkg>_CONFIG_FIXUP to <pkg>_CONFIG_SCRIPTS
2013/2/7 Arnout Vandecappelle <[email protected]>:
Quoted 8 lines · Thomas Petazzoni
Quoted 4 lines
This commit also updates the documentation accordingly.
Signed-off-by Thomas Petazzoni<[email protected]>
Signature · 1 line
Samuel
PATCH 2/5 package: remove scripts listed in <pkg>_CONFIG_SCRIPTS from target
In reply to Thomas PetazzoniThe <foo>-config scripts are useless on the target, since they are only needed for development, so we remove them automatically.
--- docs/manual/adding-packages-generic.txt | 11 ++++++++++- package/pkg-generic.mk | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-)
docs/manual/adding-packages-generic.txt +10 -1
@@ -90,6 +90,11 @@ The argument to be given to +LIBFOO_CONFIG_SCRIPTS+ is the file name(s) of the shell script(s) needing fixing. All these names are relative to '$(STAGING_DIR)/usr/bin' and if needed multiple names can be given. +In addition, the scripts listed in +LIBFOO_CONFIG_SCRIPTS+ are removed +from +$(TARGET_DIR)/usr/bin+ if they are not needed (i.e, when the +installation of development files on the target has not been selected, +which is the default). + Example 1: Package divine installs shell script '$(STAGING_DIR)/usr/bin/divine-config'.
@@ -288,7 +293,11 @@ information is (assuming the package name is +libfoo+) : * +LIBFOO_CONFIG_SCRIPTS+ lists the names of the files in '$(STAGING_DIR)/usr/bin' that need some special fixing to make them cross-compiling friendly. Multiple file names separated by space can - be given and all are relative to '$(STAGING_DIR)/usr/bin'. + be given and all are relative to '$(STAGING_DIR)/usr/bin'. The files + listed in +LIBFOO_CONFIG_SCRIPTS+ are also removed from + +$(TARGET_DIR)/usr/bin+ if they are not needed (i.e, when the + installation of development files on the target has not been + selected, which is the default). * +LIBFOO_DEVICES+ lists the device files to be created by Buildroot when using the static device table. The syntax to use is the
package/pkg-generic.mk +5 -0
@@ -153,6 +153,11 @@ $(BUILD_DIR)/%/.stamp_target_installed: $($(PKG)_INSTALL_INIT_SYSV)) $($(PKG)_INSTALL_TARGET_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) +ifeq ($(BR2_HAVE_DEVFILES),) + $(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \ + $(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ; \ + fi +endif $(Q)touch $@ # Clean package
Signature · 1 line
1.7.9.5
PATCH 2/5 package: remove scripts listed in <pkg>_CONFIG_SCRIPTS from target
Quoted 4 lines · Thomas Petazzoni
The <foo>-config scripts are useless on the target, since they are only needed for development, so we remove them automatically.
Signed-off-by Thomas Petazzoni <[email protected]>
Quoted 10 lines
--- docs/manual/adding-packages-generic.txt | 11 ++++++++++- package/pkg-generic.mk | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-)docs/manual/adding-packages-generic.txt +0
-0
docs/manual/adding-packages-generic.txt The argument to be given to +LIBFOO_CONFIG_SCRIPTS+ is the file name(s) · line 96
Quoted 7 lines
docs/manual/adding-packages-generic.txt +4
-0@@ -90,6 +90,11 @@ The argument to be given to +LIBFOO_CONFIG_SCRIPTS+ is the file name(s) of the shell script(s) needing fixing. All these names are relative to '$(STAGING_DIR)/usr/bin' and if needed multiple names can be given. +In addition, the scripts listed in +LIBFOO_CONFIG_SCRIPTS+ are removed +from +$(TARGET_DIR)/usr/bin+ if they are not needed (i.e, when the +installation of development files on the target has not been selected, +which is the default).
I wouldn't document deprecated things. So just remove "if they are not
needed ...".
Quoted 5 lines
docs/manual/adding-packages-generic.txt +1
-0+ Example 1: Package divine installs shell script '$(STAGING_DIR)/usr/bin/divine-config'.
docs/manual/adding-packages-generic.txt information is (assuming the package name is +libfoo+) : · line 300
Quoted 9 lines
docs/manual/adding-packages-generic.txt +5
-1@@ -288,7 +293,11 @@ information is (assuming the package name is +libfoo+) : * +LIBFOO_CONFIG_SCRIPTS+ lists the names of the files in '$(STAGING_DIR)/usr/bin' that need some special fixing to make them cross-compiling friendly. Multiple file names separated by space can - be given and all are relative to '$(STAGING_DIR)/usr/bin'. + be given and all are relative to '$(STAGING_DIR)/usr/bin'. The files + listed in +LIBFOO_CONFIG_SCRIPTS+ are also removed from + +$(TARGET_DIR)/usr/bin+ if they are not needed (i.e, when the + installation of development files on the target has not been + selected, which is the default).
Same here.
Regards,
Arnout
Quoted 20 lines
docs/manual/adding-packages-generic.txt +0
-0* +LIBFOO_DEVICES+ lists the device files to be created by Buildroot when using the static device table. The syntax to use is thepackage/pkg-generic.mk +5
-0@@ -153,6 +153,11 @@ $(BUILD_DIR)/%/.stamp_target_installed: $($(PKG)_INSTALL_INIT_SYSV)) $($(PKG)_INSTALL_TARGET_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) +ifeq ($(BR2_HAVE_DEVFILES),) + $(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \ + $(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ; \ + fi +endif $(Q)touch $@ # Clean package
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 2/5 package: remove scripts listed in <pkg>_CONFIG_SCRIPTS from target
2013/2/7 Arnout Vandecappelle <[email protected]>:
Quoted 9 lines · Thomas Petazzoni
Quoted 5 lines
The <foo>-config scripts are useless on the target, since they are only needed for development, so we remove them automatically.
Signed-off-by Thomas Petazzoni <[email protected]>
Quoted 17 lines
Quoted 17 lines
--- docs/manual/adding-packages-generic.txt | 11 ++++++++++- package/pkg-generic.mk | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-)docs/manual/adding-packages-generic.txt +0
-0@@ -90,6 +90,11 @@ The argument to be given to +LIBFOO_CONFIG_SCRIPTS+ is the file name(s) of the shell script(s) needing fixing. All these names are relative to '$(STAGING_DIR)/usr/bin' and if needed multiple names can be given.
Quoted 8 lines
docs/manual/adding-packages-generic.txt The argument to be given to +LIBFOO_CONFIG_SCRIPTS+ is the file name(s) · line 96
Quoted 4 lines
docs/manual/adding-packages-generic.txt +4
-0+In addition, the scripts listed in +LIBFOO_CONFIG_SCRIPTS+ are removed +from +$(TARGET_DIR)/usr/bin+ if they are not needed (i.e, when the +installation of development files on the target has not been selected, +which is the default).I wouldn't document deprecated things. So just remove "if they are not
needed ...".
I tend to agree with Arnout.
Regards,
Signature · 1 line
Samuel
PATCH 3/5 package: use <pkg>_CONFIG_SCRIPTS wherever possible
In reply to Thomas PetazzoniUse the <pkg>_CONFIG_SCRIPTS mechanism in all packages for which it does all what the package was doing. A few packages, like libxslt, are for now left out, since they need some additional fixup (for example a fixup of includedir).
--- package/cups/cups.mk | 10 +--------- package/directfb/directfb.mk | 9 +-------- package/divine/divine.mk | 9 +-------- package/gd/gd.mk | 10 +--------- package/giblib/giblib.mk | 9 +-------- package/icu/icu.mk | 9 +-------- package/imagemagick/imagemagick.mk | 12 ++---------- package/libcurl/libcurl.mk | 11 ++++------- package/libdvdnav/libdvdnav.mk | 16 +--------------- package/libdvdread/libdvdread.mk | 15 +-------------- package/libgcrypt/libgcrypt.mk | 10 +--------- package/libmcrypt/libmcrypt.mk | 9 +-------- package/libnspr/libnspr.mk | 10 ++-------- package/libusb-compat/libusb-compat.mk | 9 +-------- package/libxml2/libxml2.mk | 17 +---------------- package/ncurses/ncurses.mk | 8 +------- package/neon/neon.mk | 18 +----------------- package/pcre/pcre.mk | 17 +---------------- package/php/php.mk | 11 +---------- 19 files changed, 24 insertions(+), 195 deletions(-)
package/cups/cups.mk +1 -9
@@ -15,6 +15,7 @@ CUPS_CONF_OPT = --without-perl \ --disable-gnutls \ --disable-gssapi \ --libdir=/usr/lib +CUPS_CONFIG_SCRIPTS = cups-config CUPS_DEPENDENCIES = $(if $(BR2_PACKAGE_ZLIB),zlib) \ $(if $(BR2_PACKAGE_LIBPNG),libpng) \
@@ -61,13 +62,4 @@ CUPS_DEPENDENCIES += host-autoconf CUPS_PRE_CONFIGURE_HOOKS += CUPS_FIXUP_AUTOCONF -# Fixup prefix= and exec_prefix= in cups-config -define CUPS_FIXUP_CUPS_CONFIG - $(SED) 's%^prefix=/usr%prefix=$(STAGING_DIR)/usr%' \ - -e 's%^exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \ - $(STAGING_DIR)/usr/bin/cups-config -endef - -CUPS_POST_INSTALL_STAGING_HOOKS += CUPS_FIXUP_CUPS_CONFIG - $(eval $(autotools-package))
package/directfb/directfb.mk +1 -8
@@ -23,6 +23,7 @@ DIRECTFB_CONF_OPT = \ --disable-video4linux \ --disable-video4linux2 \ --without-tools +DIRECTFB_CONFIG_SCRIPTS = directfb-config DIRECTFB_DEPENDENCIES = freetype zlib
@@ -131,14 +132,6 @@ HOST_DIRECTFB_BUILD_CMDS = \ HOST_DIRECTFB_INSTALL_CMDS = \ $(INSTALL) -m 0755 $(@D)/tools/directfb-csource $(HOST_DIR)/usr/bin -define DIRECTFB_STAGING_CONFIG_FIXUP - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ - $(STAGING_DIR)/usr/bin/directfb-config -endef - -DIRECTFB_POST_INSTALL_STAGING_HOOKS += DIRECTFB_STAGING_CONFIG_FIXUP - $(eval $(autotools-package)) $(eval $(host-autotools-package))
package/divine/divine.mk +1 -8
@@ -9,13 +9,6 @@ DIVINE_SITE = http://www.directfb.org/downloads/Extras DIVINE_SOURCE = DiVine-$(DIVINE_VERSION).tar.gz DIVINE_INSTALL_STAGING = YES DIVINE_DEPENDENCIES = directfb - -define DIVINE_STAGING_DIVINE_CONFIG_FIXUP - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ - $(STAGING_DIR)/usr/bin/divine-config -endef - -DIVINE_POST_INSTALL_STAGING_HOOKS += DIVINE_STAGING_DIVINE_CONFIG_FIXUP +DIVINE_CONFIG_SCRIPTS = divine-config $(eval $(autotools-package))
package/gd/gd.mk +1 -9
@@ -13,6 +13,7 @@ GD_INSTALL_STAGING = YES GD_LICENSE = GD license GD_LICENSE_FILES = COPYING +GD_CONFIG_SCRIPTS = gdlib-config GD_CONF_OPT = --without-x --disable-rpath ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
@@ -66,15 +67,6 @@ endef GD_PRE_CONFIGURE_HOOKS += GD_FIXUP_ICONV endif -define GD_FIXUP_GDLIB_CONFIG - $(SED) 's%prefix=/usr%prefix=$(STAGING_DIR)/usr%' \ - -e 's%exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \ - $(STAGING_DIR)/usr/bin/gdlib-config -endef - -GD_POST_INSTALL_STAGING_HOOKS += GD_FIXUP_GDLIB_CONFIG - -GD_TOOLS_ += gdlib-config GD_TOOLS_$(BR2_PACKAGE_GD_ANNOTATE) += annotate GD_TOOLS_$(BR2_PACKAGE_GD_BDFTOGD) += bdftogd GD_TOOLS_$(BR2_PACKAGE_GD_GD2COPYPAL) += gd2copypal
package/giblib/giblib.mk +1 -8
@@ -12,13 +12,6 @@ GIBLIB_AUTORECONF = YES GIBLIB_AUTORECONF_OPT = --install GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING_DIR)/usr \ --with-imlib2-exec-prefix=$(STAGING_DIR)/usr - -define GIBLIB_STAGING_GIBLIB_CONFIG_FIXUP - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ - $(STAGING_DIR)/usr/bin/giblib-config -endef - -GIBLIB_POST_INSTALL_STAGING_HOOKS += GIBLIB_STAGING_GIBLIB_CONFIG_FIXUP +GIBLIB_CONFIG_SCRIPTS = giblib-config $(eval $(autotools-package))
package/icu/icu.mk +1 -8
@@ -12,6 +12,7 @@ ICU_LICENSE_FILES = license.html ICU_DEPENDENCIES = host-icu ICU_INSTALL_STAGING = YES +ICU_CONFIG_SCRIPTS = icu-config ICU_CONF_OPT = --with-cross-build=$(HOST_ICU_DIR)/source --disable-samples \ --disable-tests HOST_ICU_CONF_OPT = --disable-samples --disable-tests
@@ -19,13 +20,5 @@ ICU_MAKE = $(MAKE1) ICU_SUBDIR = source HOST_ICU_SUBDIR = source -define ICU_PREFIX_FIXUP - $(SED) "s,^default_prefix=.*,default_prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ - $(STAGING_DIR)/usr/bin/icu-config -endef - -ICU_POST_INSTALL_TARGET_HOOKS += ICU_PREFIX_FIXUP - $(eval $(autotools-package)) $(eval $(host-autotools-package))
package/imagemagick/imagemagick.mk +2 -10
@@ -16,6 +16,8 @@ IMAGEMAGICK_LICENSE_FILES = LICENSE IMAGEMAGICK_INSTALL_STAGING = YES IMAGEMAGICK_AUTORECONF = YES +IMAGEMAGICK_CONFIG_SCRIPTS = \ + $(addsuffix -config,Magick MagickCore MagickWand Wand Magick++) ifeq ($(BR2_LARGEFILE),y) IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=64
@@ -113,14 +115,4 @@ else IMAGEMAGICK_CONF_OPT += --without-bzip2 endif -define IMAGEMAGICK_REMOVE_CONFIG_SCRIPTS - $(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/, \ - $(addsuffix -config, \ - Magick MagickCore MagickWand Wand Magick++)) -endef - -ifneq ($(BR2_HAVE_DEVFILES),y) -IMAGEMAGICK_POST_INSTALL_TARGET_HOOKS += IMAGEMAGICK_REMOVE_CONFIG_SCRIPTS -endif - $(eval $(autotools-package))
package/libcurl/libcurl.mk +4 -7
@@ -11,6 +11,7 @@ LIBCURL_LICENSE = ICS LIBCURL_LICENSE_FILES = COPYING LIBCURL_INSTALL_STAGING = YES LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols +LIBCURL_CONFIG_SCRIPTS = curl-config ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBCURL_DEPENDENCIES += openssl
@@ -30,16 +31,12 @@ define LIBCURL_FIX_DOT_PC endef LIBCURL_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_OPENSSL),LIBCURL_FIX_DOT_PC) +ifeq ($(BR2_PACKAGE_CURL),) define LIBCURL_TARGET_CLEANUP - rm -rf $(TARGET_DIR)/usr/bin/curl-config \ - $(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl) + rm -rf $(TARGET_DIR)/usr/bin/curl endef LIBCURL_POST_INSTALL_TARGET_HOOKS += LIBCURL_TARGET_CLEANUP - -define LIBCURL_STAGING_FIXUP_CURL_CONFIG - $(SED) "s,prefix=/usr,prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/curl-config -endef -LIBCURL_POST_INSTALL_STAGING_HOOKS += LIBCURL_STAGING_FIXUP_CURL_CONFIG +endif $(eval $(autotools-package))
package/libdvdnav/libdvdnav.mk +1 -15
@@ -9,25 +9,11 @@ LIBDVDNAV_SOURCE = libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 LIBDVDNAV_SITE = http://dvdnav.mplayerhq.hu/releases LIBDVDNAV_AUTORECONF = YES LIBDVDNAV_INSTALL_STAGING = YES - +LIBDVDNAV_CONFIG_SCRIPTS = dvdnav-config LIBDVDNAV_DEPENDENCIES = libdvdread host-pkgconf # By default libdvdnav tries to find dvdread-config in $PATH. Because # of cross compilation, we prefer using pkg-config. LIBDVDNAV_CONF_OPT = --with-dvdread-config="$(PKG_CONFIG_HOST_BINARY) dvdread" -define LIBDVDNAV_TARGET_CLEANUP - $(RM) -f $(TARGET_DIR)/usr/bin/dvdnav-config -endef - -ifneq ($(BR2_HAVE_DEVFILES),y) -LIBDVDNAV_POST_INSTALL_TARGET_HOOKS += LIBDVDNAV_TARGET_CLEANUP -endif - -define LIBDVDNAV_STAGING_FIXUP_DVDNAV_CONFIG - $(SED) "s,prefix=/usr,prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/dvdnav-config -endef - -LIBDVDNAV_POST_INSTALL_STAGING_HOOKS += LIBDVDNAV_STAGING_FIXUP_DVDNAV_CONFIG - $(eval $(autotools-package))
package/libdvdread/libdvdread.mk +1 -14
@@ -10,19 +10,6 @@ LIBDVDREAD_SITE = http://dvdnav.mplayerhq.hu/releases LIBDVDREAD_AUTORECONF = YES LIBDVDREAD_LIBTOOL_PATCH = YES LIBDVDREAD_INSTALL_STAGING = YES - -define LIBDVDREAD_TARGET_CLEANUP - $(RM) -f $(TARGET_DIR)/usr/bin/dvdread-config -endef - -ifneq ($(BR2_HAVE_DEVFILES),y) -LIBDVDREAD_POST_INSTALL_TARGET_HOOKS += LIBDVDREAD_TARGET_CLEANUP -endif - -define LIBDVDREAD_STAGING_FIXUP_DVDREAD_CONFIG - $(SED) "s,prefix=/usr,prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/dvdread-config -endef - -LIBDVDREAD_POST_INSTALL_STAGING_HOOKS += LIBDVDREAD_STAGING_FIXUP_DVDREAD_CONFIG +LIBDVDREAD_CONFIG_SCRIPTS = dvdread-config $(eval $(autotools-package))
package/libgcrypt/libgcrypt.mk +1 -9
@@ -11,6 +11,7 @@ LIBGCRYPT_LICENSE_FILES = COPYING.LIB LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt LIBGCRYPT_INSTALL_STAGING = YES LIBGCRYPT_DEPENDENCIES = libgpg-error +LIBGCRYPT_CONFIG_SCRIPTS = libgcrypt-config LIBGCRYPT_CONF_ENV = \ ac_cv_sys_symbol_underscore=no
@@ -25,13 +26,4 @@ endef LIBGCRYPT_POST_PATCH_HOOKS += LIBGCRYPT_DISABLE_TESTS -define LIBGCRYPT_STAGING_LIBGCRYPT_CONFIG_FIXUP - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ - $(STAGING_DIR)/usr/bin/libgcrypt-config -endef - -LIBGCRYPT_POST_INSTALL_STAGING_HOOKS += LIBGCRYPT_STAGING_LIBGCRYPT_CONFIG_FIXUP - - $(eval $(autotools-package))
package/libmcrypt/libmcrypt.mk +1 -8
@@ -10,13 +10,6 @@ LIBMCRYPT_AUTORECONF = YES LIBMCRYPT_INSTALL_STAGING = YES LIBMCRYPT_LICENSE = LGPLv2.1 LIBMCRYPT_LICENSE_FILES = COPYING.LIB - -define LIBMCRYPT_STAGING_LIBMCRYPT_CONFIG_FIXUP - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ - $(STAGING_DIR)/usr/bin/libmcrypt-config -endef - -LIBMCRYPT_POST_INSTALL_STAGING_HOOKS += LIBMCRYPT_STAGING_LIBMCRYPT_CONFIG_FIXUP +LIBMCRYPT_CONFIG_SCRIPTS = libmcrypt-config $(eval $(autotools-package))
package/libnspr/libnspr.mk +2 -8
@@ -8,6 +8,8 @@ LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src/ LIBNSPR_SUBDIR = mozilla/nsprpub LIBNSPR_INSTALL_STAGING = YES +LIBNSPR_CONFIG_SCRIPTS = nspr-config + # Set the host CFLAGS and LDFLAGS so NSPR does not guess wrongly LIBNSPR_CONF_ENV = HOST_CFLAGS="-g -O2" \ HOST_LDFLAGS="-lc"
@@ -24,12 +26,4 @@ LIBNSPR_CONF_OPT += --disable-thumb2 endif endif -define LIBNSPR_STAGING_LIBNSPR_CONFIG_FIXUP - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ - $(STAGING_DIR)/usr/bin/nspr-config -endef - -LIBNSPR_POST_INSTALL_STAGING_HOOKS += LIBNSPR_STAGING_LIBNSPR_CONFIG_FIXUP - $(eval $(autotools-package))
package/libusb-compat/libusb-compat.mk +1 -8
@@ -8,14 +8,7 @@ LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2 LIBUSB_COMPAT_SITE = http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMPAT_VERSION) LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf libusb LIBUSB_COMPAT_INSTALL_STAGING = YES - -define LIBUSB_COMPAT_FIXUP_CONFIG - $(SED) 's%prefix=/usr%prefix=$(STAGING_DIR)/usr%' \ - -e 's%exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \ - $(STAGING_DIR)/usr/bin/libusb-config -endef - -LIBUSB_COMPAT_POST_INSTALL_STAGING_HOOKS+=LIBUSB_COMPAT_FIXUP_CONFIG +LIBUSB_COMPAT_CONFIG_SCRIPTS = libusb-config $(eval $(autotools-package)) $(eval $(host-autotools-package))
package/libxml2/libxml2.mk +1 -16
@@ -10,6 +10,7 @@ LIBXML2_INSTALL_STAGING = YES LIBXML2_AUTORECONF = YES LIBXML2_LICENSE = MIT LIBXML2_LICENSE_FILES = COPYING +LIBXML2_CONFIG_SCRIPTS = xml2-config ifneq ($(BR2_LARGEFILE),y) LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
@@ -17,13 +18,6 @@ endif LIBXML2_CONF_OPT = --with-gnu-ld --without-python --without-debug -define LIBXML2_STAGING_LIBXML2_CONFIG_FIXUP - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config - $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config -endef - -LIBXML2_POST_INSTALL_STAGING_HOOKS += LIBXML2_STAGING_LIBXML2_CONFIG_FIXUP - HOST_LIBXML2_DEPENDENCIES = host-pkgconf # mesa3d uses functions that are only available with debug
@@ -40,15 +34,6 @@ else HOST_LIBXML2_CONF_OPT += --without-python endif - -define LIBXML2_REMOVE_CONFIG_SCRIPTS - $(RM) -f $(TARGET_DIR)/usr/bin/xml2-config -endef - -ifneq ($(BR2_HAVE_DEVFILES),y) -LIBXML2_POST_INSTALL_TARGET_HOOKS += LIBXML2_REMOVE_CONFIG_SCRIPTS -endif - $(eval $(autotools-package)) $(eval $(host-autotools-package))
package/ncurses/ncurses.mk +1 -7
@@ -11,6 +11,7 @@ NCURSES_INSTALL_STAGING = YES NCURSES_DEPENDENCIES = host-ncurses NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = README +NCURSES_CONFIG_SCRIPTS = ncurses5-config NCURSES_CONF_OPT = \ $(if $(BR2_PREFER_STATIC_LIB),--without-shared,--with-shared) \
@@ -37,13 +38,6 @@ define NCURSES_BUILD_CMDS $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) endef -define NCURSES_PATCH_NCURSES_CONFIG - $(SED) 's^prefix="^prefix="$(STAGING_DIR)^' \ - $(STAGING_DIR)/usr/bin/ncurses5-config -endef - -NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_PATCH_NCURSES_CONFIG - ifeq ($(BR2_HAVE_DEVFILES),y) define NCURSES_INSTALL_TARGET_DEVFILES mkdir -p $(TARGET_DIR)/usr/include
package/neon/neon.mk +1 -17
@@ -7,7 +7,7 @@ NEON_VERSION = 0.29.6 NEON_SITE = http://www.webdav.org/neon/ NEON_INSTALL_STAGING = YES NEON_CONF_OPT = --without-gssapi --disable-rpath - +NEON_CONFIG_SCRIPTS = neon-config NEON_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_NEON_ZLIB),y)
@@ -44,20 +44,4 @@ ifeq ($(BR2_PACKAGE_NEON_NOXML),y) NEON_CONF_OPT += --disable-webdav endif -define NEON_REMOVE_CONFIG_SCRIPTS - $(RM) -f $(TARGET_DIR)/usr/bin/neon-config -endef - -ifneq ($(BR2_HAVE_DEVFILES),y) -NEON_POST_INSTALL_TARGET_HOOKS += NEON_REMOVE_CONFIG_SCRIPTS -endif - -define NEON_STAGING_NEON_CONFIG_FIXUP - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ - $(STAGING_DIR)/usr/bin/neon-config -endef - -NEON_POST_INSTALL_STAGING_HOOKS += NEON_STAGING_NEON_CONFIG_FIXUP - $(eval $(autotools-package))
package/pcre/pcre.mk +1 -16
@@ -9,26 +9,11 @@ PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre PCRE_LICENSE = BSD-3c PCRE_LICENSE_FILES = LICENCE PCRE_INSTALL_STAGING = YES +PCRE_CONFIG_SCRIPTS = pcre-config ifneq ($(BR2_INSTALL_LIBSTDCPP),y) # pcre will use the host g++ if a cross version isn't available PCRE_CONF_OPT = --disable-cpp endif -define PCRE_STAGING_PCRE_CONFIG_FIXUP - $(SED) 's,^prefix=.*,prefix=$(STAGING_DIR)/usr,' \ - -e 's,^exec_prefix=.*,exec_prefix=$(STAGING_DIR)/usr,' \ - $(STAGING_DIR)/usr/bin/pcre-config -endef - -PCRE_POST_INSTALL_STAGING_HOOKS += PCRE_STAGING_PCRE_CONFIG_FIXUP - -define PCRE_TARGET_REMOVE_PCRE_CONFIG - rm -f $(TARGET_DIR)/usr/bin/pcre-config -endef - -ifneq ($(BR2_HAVE_DEVFILES),y) -PCRE_POST_INSTALL_TARGET_HOOKS += PCRE_TARGET_REMOVE_PCRE_CONFIG -endif - $(eval $(autotools-package))
package/php/php.mk +1 -10
@@ -19,6 +19,7 @@ PHP_CONF_OPT = --mandir=/usr/share/man \ --with-config-file-path=/etc \ --localstatedir=/var \ --disable-rpath +PHP_CONFIG_SCRIPTS = php-config PHP_CFLAGS = $(TARGET_CFLAGS)
@@ -200,19 +201,9 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_SNMP),y) PHP_DEPENDENCIES += netsnmp endif -# Fixup prefix= and exec_prefix= in php-config -define PHP_FIXUP_PHP_CONFIG - $(SED) 's%^prefix="/usr"%prefix="$(STAGING_DIR)/usr"%' \ - -e 's%^exec_prefix="/usr"%exec_prefix="$(STAGING_DIR)/usr"%' \ - $(STAGING_DIR)/usr/bin/php-config -endef - -PHP_POST_INSTALL_STAGING_HOOKS += PHP_FIXUP_PHP_CONFIG - define PHP_INSTALL_FIXUP rm -rf $(TARGET_DIR)/usr/lib/php rm -f $(TARGET_DIR)/usr/bin/phpize - rm -f $(TARGET_DIR)/usr/bin/php-config if [ ! -f $(TARGET_DIR)/etc/php.ini ]; then \ $(INSTALL) -m 0755 $(PHP_DIR)/php.ini-production \ $(TARGET_DIR)/etc/php.ini; \
Signature · 1 line
1.7.9.5
PATCH 3/5 package: use <pkg>_CONFIG_SCRIPTS wherever possible
Quoted 6 lines · Thomas Petazzoni
Use the <pkg>_CONFIG_SCRIPTS mechanism in all packages for which it does all what the package was doing. A few packages, like libxslt, are for now left out, since they need some additional fixup (for example a fixup of includedir).
Signed-off-by Thomas Petazzoni<[email protected]>
(visual inspection only)
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 4/5 package: use <pkg>_CONFIG_SCRIPTS in packages that used special handling
In reply to Thomas PetazzoniThe packages changed by this commit were not only changing prefix= and exec_prefix= during their <foo>-config fixups, they were also changing includedir= and/or libdir=. So, they could not be directly converted to the new <pkg>_CONFIG_SCRIPTS infrastructure.
However, a careful analysis of their default <foo>-config shows that includedir= and libdir= is defined relatively to either ${prefix} and ${exec_prefix}. Therefore, the manual fixing of includedir= and libdir= is useless, and fixing prefix= and exec_prefix=, as done by the <pkg>_CONFIG_SCRIPTS mechanism is sufficient.
--- package/freetype/freetype.mk | 19 +------------------ package/libpng/libpng.mk | 20 +------------------- package/libxslt/libxslt.mk | 18 +----------------- 3 files changed, 3 insertions(+), 54 deletions(-)
package/freetype/freetype.mk +1 -18
@@ -14,26 +14,9 @@ FREETYPE_LICENSE_FILES = docs/FTL.TXT docs/GPLv2.TXT FREETYPE_DEPENDENCIES = host-pkgconf \ $(if $(BR2_PACKAGE_ZLIB),zlib) \ $(if $(BR2_PACKAGE_BZIP2),bzip2) +FREETYPE_CONFIG_SCRIPTS = freetype-config HOST_FREETYPE_DEPENDENCIES = host-pkgconf -define FREETYPE_FREETYPE_CONFIG_STAGING_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/freetype2\',g" \ - -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \ - $(STAGING_DIR)/usr/bin/freetype-config -endef - -FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FREETYPE_CONFIG_STAGING_FIXUP - -define FREETYPE_FREETYPE_CONFIG_TARGET_REMOVE - rm -f $(TARGET_DIR)/usr/bin/freetype-config -endef - -ifneq ($(BR2_HAVE_DEVFILES),y) -FREETYPE_POST_INSTALL_TARGET_HOOKS += FREETYPE_FREETYPE_CONFIG_TARGET_REMOVE -endif - $(eval $(autotools-package)) $(eval $(host-autotools-package))
package/libpng/libpng.mk +1 -19
@@ -12,25 +12,7 @@ LIBPNG_LICENSE = libpng license LIBPNG_LICENSE_FILES = LICENSE LIBPNG_INSTALL_STAGING = YES LIBPNG_DEPENDENCIES = host-pkgconf zlib - -define LIBPNG_STAGING_LIBPNG12_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/libpng$(LIBPNG_SERIES)\',g" \ - -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \ - $(STAGING_DIR)/usr/bin/libpng$(LIBPNG_SERIES)-config -endef - -LIBPNG_POST_INSTALL_STAGING_HOOKS += LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP - -define LIBPNG_REMOVE_CONFIG_SCRIPTS - $(RM) -f $(TARGET_DIR)/usr/bin/libpng$(LIBPNG_SERIES)-config \ - $(TARGET_DIR)/usr/bin/libpng-config -endef - -ifneq ($(BR2_HAVE_DEVFILES),y) -LIBPNG_POST_INSTALL_TARGET_HOOKS += LIBPNG_REMOVE_CONFIG_SCRIPTS -endif +LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config $(eval $(autotools-package)) $(eval $(host-autotools-package))
package/libxslt/libxslt.mk +1 -17
@@ -12,7 +12,7 @@ LIBXSLT_LICENSE_FILES = COPYING LIBXSLT_CONF_OPT = --with-gnu-ld --without-debug \ --without-python --with-libxml-prefix=$(STAGING_DIR)/usr/ - +LIBXSLT_CONFIG_SCRIPTS = xslt-config LIBXSLT_DEPENDENCIES = libxml2 # If we have enabled libgcrypt then use it, else disable crypto support.
@@ -27,21 +27,5 @@ HOST_LIBXSLT_CONF_OPT = --without-debug --without-python --without-crypto HOST_LIBXSLT_DEPENDENCIES = host-libxml2 -define LIBXSLT_XSLT_CONFIG_FIXUP - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xslt-config - $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xslt-config - $(SED) "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" $(STAGING_DIR)/usr/bin/xslt-config -endef - -LIBXSLT_POST_INSTALL_STAGING_HOOKS += LIBXSLT_XSLT_CONFIG_FIXUP - -define LIBXSLT_REMOVE_CONFIG_SCRIPTS - $(RM) -f $(TARGET_DIR)/usr/bin/xslt-config -endef - -ifneq ($(BR2_HAVE_DEVFILES),y) -LIBXSLT_POST_INSTALL_TARGET_HOOKS += LIBXSLT_REMOVE_CONFIG_SCRIPTS -endif - $(eval $(autotools-package)) $(eval $(host-autotools-package))
Signature · 1 line
1.7.9.5
PATCH 4/5 package: use <pkg>_CONFIG_SCRIPTS in packages that used special handling
2013/2/7 Thomas Petazzoni <[email protected]>:
Quoted 5 lines
The packages changed by this commit were not only changing prefix= and exec_prefix= during their <foo>-config fixups, they were also changing includedir= and/or libdir=. So, they could not be directly converted to the new <pkg>_CONFIG_SCRIPTS infrastructure.
Quoted 7 lines
However, a careful analysis of their default <foo>-config shows that includedir= and libdir= is defined relatively to either ${prefix} and ${exec_prefix}. Therefore, the manual fixing of includedir= and libdir= is useless, and fixing prefix= and exec_prefix=, as done by the <pkg>_CONFIG_SCRIPTS mechanism is sufficient.
Signed-off-by Thomas Petazzoni <[email protected]>
Signature · 1 line
Samuel
PATCH 5/5 libgpg-error: use <pkg>_CONFIG_SCRIPTS
In reply to Thomas Petazzonilibgpg-error installs a gpg-error-config script, but it wasn't fixed up properly. Use the <pkg>_CONFIG_SCRIPTS to handle this.
--- package/libgpg-error/libgpg-error.mk | 1 + 1 file changed, 1 insertion(+)
package/libgpg-error/libgpg-error.mk +1 -0
@@ -9,5 +9,6 @@ LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error LIBGPG_ERROR_LICENSE = LGPLv2.1+ LIBGPG_ERROR_LICENSE_FILES = COPYING.LIB LIBGPG_ERROR_INSTALL_STAGING = YES +LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config $(eval $(autotools-package))
Signature · 1 line
1.7.9.5
PATCH 5/5 libgpg-error: use <pkg>_CONFIG_SCRIPTS
2013/2/7 Thomas Petazzoni <[email protected]>:
Quoted 4 lines
libgpg-error installs a gpg-error-config script, but it wasn't fixed up properly. Use the <pkg>_CONFIG_SCRIPTS to handle this.
Signed-off-by Thomas Petazzoni <[email protected]>
Signature · 1 line
Samuel
Peter,
In the following patch series, if we agree on "[PATCH 1/5] package:
rename <pkg>_CONFIG_FIXUP to <pkg>_CONFIG_SCRIPTS", then I believe it would be better to take it for 2013.02 so that we don't have <pkg>_CONFIG_FIXUP introduced in 2013.02 and then later a rename of this new variable.
However, the other patches, 2 to 5, should probably not be taken for 2013.02, but only applied to -next once it opens.
Best regards,
Thomas
Quoted 39 lines · Thomas Petazzoni
Hello,
This patch series improves on the <pkg>_CONFIG_FIXUP work done by Stefan Fr?berg by:
* Renaming the variable to <pkg>_CONFIG_SCRIPTS. I believe this is needed, because we will not only "fixup" those files, but also remove them from the target directory. Also, I don't think the variable name should indicate what will happen to these files. It should just indicate what those files are.
* Extending the <pkg>_CONFIG_SCRIPTS handling to remove the config scripts from the
TARGET_DIR, unlessBR2_HAVE_DEVFILESis set (even though it is deprecated, it is still here).* Use <pkg>_CONFIG_SCRIPTS in a number of packages that were already fixing manually their <foo>-config script and for which the new infrastructure does exactly the same thing.
* Use <pkg>_CONFIG_SCRIPTS in a number of packages that were doing a bit more than the infrastructure: fixing the includedir and libdir fields. A manual inspection of each of those packages shows that by default, the includedir and libdir are described relatively to prefix and
exec_prefix, so fixing up those is sufficient, and this is what the infrastructure does.* Use <pkg>_CONFIG_SCRIPTS to fix up gpg-error-config installed by the libgpg-error package. This is done separately from the previous patch, because libgpg-error was not previously doing any fix up of its gpg-error-config script.
Best regards,
Thomas
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com