diff options
| author | Vicente Olivert Riera <Vincent.Riera@imgtec.com> | 2014-09-24 09:44:19 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-09-28 22:30:05 +0200 |
| commit | 339df19f7a851ea7c92bc8d01c577e7d5fe20023 (patch) | |
| tree | b37223d63d4bccabd4339f334f0e574a6e835d1e /package/keyutils/keyutils.mk | |
| parent | 155a48bac214bd600f4aaa4211469d9c8f2b48f5 (diff) | |
| download | buildroot-339df19f7a851ea7c92bc8d01c577e7d5fe20023.tar.gz buildroot-339df19f7a851ea7c92bc8d01c577e7d5fe20023.zip | |
keyutils: Bump version to 1.5.9, fix patches and
- Bump version to 1.5.9
- Remove patches already included in this version
- Use make parameters instead of environment variables
- Add an upstream patch to fix building statically
- Adapt old patches to the new version
- Add a hash file
Fixes:
http://autobuild.buildroot.net/results/ced/ced596bd1c73286f7044f5a8e11b6588fc973f11/
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/keyutils/keyutils.mk')
| -rw-r--r-- | package/keyutils/keyutils.mk | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk index 7097529c3b..ad730166b8 100644 --- a/package/keyutils/keyutils.mk +++ b/package/keyutils/keyutils.mk @@ -4,29 +4,35 @@ # ################################################################################ -KEYUTILS_VERSION = 1.5.5 +KEYUTILS_VERSION = 1.5.9 KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2 KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils KEYUTILS_LICENSE = GPLv2+ LGPLv2.1+ KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL KEYUTILS_INSTALL_STAGING = YES -KEYUTILS_MAKE_ENV = \ - INSTALL=$(INSTALL) \ - LIBDIR=/usr/lib \ - USRLIBDIR=/usr/lib \ - LN=$(HOSTLN) \ +KEYUTILS_MAKE_PARAMS = \ + INSTALL=$(INSTALL) \ + LIBDIR=/usr/lib \ + USRLIBDIR=/usr/lib \ + CFLAGS="$(TARGET_CFLAGS)" \ + CPPFLAGS="$(TARGET_CPPFLAGS) -I." \ + LNS="$(HOSTLN) -sf" + +ifeq ($(BR2_PREFER_STATIC_LIB),y) +KEYUTILS_MAKE_PARAMS += NO_SOLIB=1 +endif define KEYUTILS_BUILD_CMDS - $(KEYUTILS_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) endef define KEYUTILS_INSTALL_STAGING_CMDS - $(KEYUTILS_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) DESTDIR=$(STAGING_DIR) install endef define KEYUTILS_INSTALL_TARGET_CMDS - $(KEYUTILS_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) |
