NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
434c9777be
kumquat-buildroot/package/ustr/ustr.mk

33 lines
1.1 KiB
Makefile
Raw Normal View History

ustr: new package [Thomas: - Fix typo in patch description. - Remove trailing whitespace in Config.in. - Fix Config.in comment to match what's specified in the Buildroot manual. - Adjust .mk logic to use BR2_STATIC_LIBS vs. BR2_SHARED_LIBS instead of BR2_PREFER_STATIC_LIB, and therefore support the installation of only the shared library. - Remove the libustr-debug library from the target and staging directories, it's the same as libustr, except that it's compiled with debugging symbols. - Always install only the shared variant of the library for host-ustr.] Signed-off-by: Clayton Shotwell <clshotwe@rockwellcollins.com> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-16 04:53:54 +01:00
################################################################################
#
# ustr
#
################################################################################
package/ustr: really fix ldconfig In 99067c1 (package/ustr: don't run ldconfig), we tried to fix parallel build issues, caused by running ldconfig, by not running ldconfig. We borked that fix, as build issues still crop up from time to time: ldconfig is still run because our override is not accounted for by ustr's buildsystem. Instead of overriding ldconifg at build time, we need to override it at configure time. Just do that. Fixes: http://autobuild.buildroot.org/results/7b1/7b12f00612da4ad8dffe0c8010b95db881630b17/ http://autobuild.buildroot.org/results/242/24209ba13f56889357024b0e460d508b7a03d1d2/ http://autobuild.buildroot.org/results/963/963141370a9b127f473a7fae161656a6b0a4f33b/ (Those are the only three build issues in the more-than-a-month since we initially tried to fix that.) To be noted: upstream has accepted my patch, plus they completely removed calls to ldconfig altogether. Add a comment so we don't forget to remove our workaround when we bump. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-09-26 19:20:14 +02:00
# When bumping the version to a new upstream release, be sure to remove
# the ldconfig hack, below.
ustr: new package [Thomas: - Fix typo in patch description. - Remove trailing whitespace in Config.in. - Fix Config.in comment to match what's specified in the Buildroot manual. - Adjust .mk logic to use BR2_STATIC_LIBS vs. BR2_SHARED_LIBS instead of BR2_PREFER_STATIC_LIB, and therefore support the installation of only the shared library. - Remove the libustr-debug library from the target and staging directories, it's the same as libustr, except that it's compiled with debugging symbols. - Always install only the shared variant of the library for host-ustr.] Signed-off-by: Clayton Shotwell <clshotwe@rockwellcollins.com> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-16 04:53:54 +01:00
USTR_VERSION = 1.0.4
USTR_SOURCE = ustr-$(USTR_VERSION).tar.bz2
Remove trailing slash from all package site URLs The recommended form is without the trailing slash. Buildroot will add a slash between FOO_SITE and FOO_SOURCE as appropriate. Reported-by: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-03-09 23:14:51 +01:00
USTR_SITE = http://www.and.org/ustr/$(USTR_VERSION)
ustr: comma separate licenses Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-12-14 14:11:00 +01:00
USTR_LICENSE = BSD-2c, MIT, LGPLv2+
ustr: fix license name Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-03-09 22:09:33 +01:00
USTR_LICENSE_FILES = LICENSE LICENSE_BSD LICENSE_LGPL LICENSE_MIT
ustr: use Debian patches to compile w/ GCC 5.x To fix issues with compiling with GCC 5.x, switch to utilizing the Debian patches for cross compiling. Debian has been maintaining patches for the ustr package since it appears that the ustr project hasn't been active since 2008. The Debian patches switch from a makefile based build to autotools based build. This also means that the patch that was being carried for cross compiling is no longer needed. ustr is a dependency of libsemanage, which now builds fine again with these patches applied. Fixes: http://autobuild.buildroot.org/results/f46/f46430c45973dfe39976453f5a91a555ed7bfa9a/ http://autobuild.buildroot.org/results/e98/e98c82130efaaed29682cf31c1a754278ff3e547/ ...and many more Signed-off-by: Ryan Barnett <ryanbarnett3@gmail.com> [yann.morin.1998@free.fr: build the shared lib at build time, not install time] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> CC: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-12-08 23:27:57 +01:00
USTR_AUTORECONF = YES
USTR_PATCH = \
http://http.debian.net/debian/pool/main/u/ustr/ustr_$(USTR_VERSION)-5.debian.tar.xz
ustr: new package [Thomas: - Fix typo in patch description. - Remove trailing whitespace in Config.in. - Fix Config.in comment to match what's specified in the Buildroot manual. - Adjust .mk logic to use BR2_STATIC_LIBS vs. BR2_SHARED_LIBS instead of BR2_PREFER_STATIC_LIB, and therefore support the installation of only the shared library. - Remove the libustr-debug library from the target and staging directories, it's the same as libustr, except that it's compiled with debugging symbols. - Always install only the shared variant of the library for host-ustr.] Signed-off-by: Clayton Shotwell <clshotwe@rockwellcollins.com> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-16 04:53:54 +01:00
USTR_INSTALL_STAGING = YES
ustr: use Debian patches to compile w/ GCC 5.x To fix issues with compiling with GCC 5.x, switch to utilizing the Debian patches for cross compiling. Debian has been maintaining patches for the ustr package since it appears that the ustr project hasn't been active since 2008. The Debian patches switch from a makefile based build to autotools based build. This also means that the patch that was being carried for cross compiling is no longer needed. ustr is a dependency of libsemanage, which now builds fine again with these patches applied. Fixes: http://autobuild.buildroot.org/results/f46/f46430c45973dfe39976453f5a91a555ed7bfa9a/ http://autobuild.buildroot.org/results/e98/e98c82130efaaed29682cf31c1a754278ff3e547/ ...and many more Signed-off-by: Ryan Barnett <ryanbarnett3@gmail.com> [yann.morin.1998@free.fr: build the shared lib at build time, not install time] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> CC: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-12-08 23:27:57 +01:00
# ustr only builds the static library by default, but the default
# install rule will install both the static and the shared libraries,
# which means the shared one is build during the install step. :-(
#
# We can however instruct ustr to build both at build time, by adding
# 'all-shared' to the default 'all' rule.
USTR_MAKE_OPTS = all all-shared
ustr: new package [Thomas: - Fix typo in patch description. - Remove trailing whitespace in Config.in. - Fix Config.in comment to match what's specified in the Buildroot manual. - Adjust .mk logic to use BR2_STATIC_LIBS vs. BR2_SHARED_LIBS instead of BR2_PREFER_STATIC_LIB, and therefore support the installation of only the shared library. - Remove the libustr-debug library from the target and staging directories, it's the same as libustr, except that it's compiled with debugging symbols. - Always install only the shared variant of the library for host-ustr.] Signed-off-by: Clayton Shotwell <clshotwe@rockwellcollins.com> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-16 04:53:54 +01:00
package/ustr: really fix ldconfig In 99067c1 (package/ustr: don't run ldconfig), we tried to fix parallel build issues, caused by running ldconfig, by not running ldconfig. We borked that fix, as build issues still crop up from time to time: ldconfig is still run because our override is not accounted for by ustr's buildsystem. Instead of overriding ldconifg at build time, we need to override it at configure time. Just do that. Fixes: http://autobuild.buildroot.org/results/7b1/7b12f00612da4ad8dffe0c8010b95db881630b17/ http://autobuild.buildroot.org/results/242/24209ba13f56889357024b0e460d508b7a03d1d2/ http://autobuild.buildroot.org/results/963/963141370a9b127f473a7fae161656a6b0a4f33b/ (Those are the only three build issues in the more-than-a-month since we initially tried to fix that.) To be noted: upstream has accepted my patch, plus they completely removed calls to ldconfig altogether. Add a comment so we don't forget to remove our workaround when we bump. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-09-26 19:20:14 +02:00
USTR_CONF_OPTS += LDCONFIG=/bin/true
package/ustr: fix ldconfig for host build The host build of the ustr package also needs to not run the ldconfig to prevent a build failure caused by the symlink creating a race condition. Related commit for target build change was 22069232. Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-01-10 17:05:52 +01:00
HOST_USTR_CONF_OPTS += LDCONFIG=/bin/true
package/ustr: don't run ldconfig The ustr Makefile.in (as introduced by the Debian patch we apply), is probably not parallel-safe: 402 install: install-opt install-dbg 403 404 install-opt: install-dirs install-opt-lib install-common 405 406 install-dbg: install-dirs install-dbg-lib install-common 407 408 install-opt-lib install-dbg-lib install-common: install-dirs [--SNIP--] 424 install-opt-lib: $(OPT_LIB_STATIC) $(OPT_LIB_SHARED) ustr.pc 425 @echo Installing files 426 install -m 644 -t $(DESTDIR)$(libdir) $(OPT_LIB_STATIC) 427 install -m 755 -t $(DESTDIR)$(libdir) $(OPT_LIB_SHARED) 428 -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME) 429 ln -s $(OPT_LIB_SHARED) $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME) 430 -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV) 431 ln -s $(OPT_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV) 432 -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV_BSO) 433 ln -s $(OPT_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV_BSO) 434 $(LDCONFIG) -n $(DESTDIR)$(libdir) 435 install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc 436 437 install-dbg-lib: $(DBG_LIB_STATIC) $(DBG_LIB_SHARED) ustr-debug.pc 438 @echo Installing files 439 install -m 644 -t $(DESTDIR)$(libdir) $(DBG_LIB_STATIC) 440 install -m 755 -t $(DESTDIR)$(libdir) $(DBG_LIB_SHARED) 441 -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME) 442 ln -s $(DBG_LIB_SHARED) $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME) 443 -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV) 444 ln -s $(DBG_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV) 445 -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV_BSO) 446 ln -s $(DBG_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV_BSO) 447 $(LDCONFIG) -n $(DESTDIR)$(libdir) 448 install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr-debug.pc As Thomas already noticed [0], the two interesting rules above are not dependent one on the other, so can be run in parallel. So, while one is doing its rm'n'ln dance, the other can be running an ldconfig, which has the side effect of creating the missing symlinks. So, we can see this sequence: install-opt-lib: install-dbg-lib: ldconfig rm -f .../$(OPT_LIB_SHAREDEV) \ `-> symlink(..., .../$(OPT_LIB_SHAREDEV)) ln -s .../$(OPT_LIB_SHAREDEV) In this case, ldconfig uses the opportunity-window between the rm and the ln to create the link; so the ln does not work, as the target already exist. We fix that by not running ldconfig at all in Buildroot, we just pass LDCONFIG=/bin/true . Fixes (hopefully, since I was not even able to reproduce the failure): http://autobuild.buildroot.org/?reason=ustr-1.0.4 http://autobuild.buildroot.org/results/936/93626f55625ed7900c147bfd79ff7802366639b1/ http://autobuild.buildroot.org/results/18b/18b6ec537da9e9055f58a8649c0719dc64df1bcf/ [...] [0] http://lists.busybox.net/pipermail/buildroot/2016-May/161923.html Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Clayton Shotwell <clayton.shotwell@rockwellcollins.com> Cc: Arnout Vandecappelle <arnout@mind.be> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-08-14 16:13:33 +02:00
ustr: use Debian patches to compile w/ GCC 5.x To fix issues with compiling with GCC 5.x, switch to utilizing the Debian patches for cross compiling. Debian has been maintaining patches for the ustr package since it appears that the ustr project hasn't been active since 2008. The Debian patches switch from a makefile based build to autotools based build. This also means that the patch that was being carried for cross compiling is no longer needed. ustr is a dependency of libsemanage, which now builds fine again with these patches applied. Fixes: http://autobuild.buildroot.org/results/f46/f46430c45973dfe39976453f5a91a555ed7bfa9a/ http://autobuild.buildroot.org/results/e98/e98c82130efaaed29682cf31c1a754278ff3e547/ ...and many more Signed-off-by: Ryan Barnett <ryanbarnett3@gmail.com> [yann.morin.1998@free.fr: build the shared lib at build time, not install time] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> CC: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-12-08 23:27:57 +01:00
$(eval $(autotools-package))
$(eval $(host-autotools-package))
Reference in New Issue Copy Permalink