diff options
| -rw-r--r-- | patches/liblockfile-1.08/0001-Makefile-make-ar-overwritable.patch | 34 | ||||
| -rw-r--r-- | patches/liblockfile-1.08/series | 1 | ||||
| -rw-r--r-- | rules/liblockfile.in | 4 | ||||
| -rw-r--r-- | rules/liblockfile.make | 88 |
4 files changed, 56 insertions, 71 deletions
diff --git a/patches/liblockfile-1.08/0001-Makefile-make-ar-overwritable.patch b/patches/liblockfile-1.08/0001-Makefile-make-ar-overwritable.patch new file mode 100644 index 000000000..65ec7fd8d --- /dev/null +++ b/patches/liblockfile-1.08/0001-Makefile-make-ar-overwritable.patch @@ -0,0 +1,34 @@ +From a1c4d6082291b660ce4fda90f65d791e2fc84081 Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde <mkl@pengutronix.de> +Date: Wed, 15 Jul 2009 21:57:59 +0200 +Subject: [PATCH] [Makefile] make ar overwritable + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + Makefile.in | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 7ae5406..84fc5b7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -10,6 +10,7 @@ NVER = 0.1 + CFLAGS = @CFLAGS@ -I. + LDFLAGS = @LDFLAGS@ + CC = @CC@ ++AR = ar + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +@@ -29,7 +30,7 @@ shared: liblockfile.so dotlockfile + nfslib: nfslock.so.$(VER) + + liblockfile.a: lockfile.o +- ar rv liblockfile.a lockfile.o ++ $(AR) rv liblockfile.a lockfile.o + + liblockfile.so: liblockfile.a + $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \ +-- +1.6.3.3 + diff --git a/patches/liblockfile-1.08/series b/patches/liblockfile-1.08/series new file mode 100644 index 000000000..1de6f45b3 --- /dev/null +++ b/patches/liblockfile-1.08/series @@ -0,0 +1 @@ +0001-Makefile-make-ar-overwritable.patch diff --git a/rules/liblockfile.in b/rules/liblockfile.in index cf0eff956..bbbe68288 100644 --- a/rules/liblockfile.in +++ b/rules/liblockfile.in @@ -1,8 +1,8 @@ ## SECTION=disk_and_file + config LIBLOCKFILE tristate - depends on BROKEN - prompt "liblockfile, dotlockfile [BROKEN]" + prompt "liblockfile, dotlockfile" help Dotlockfile is a command line utility to safely create, test and remove lockfiles. Lockfiles are created in an diff --git a/rules/liblockfile.make b/rules/liblockfile.make index 4fc39338b..0679c8120 100644 --- a/rules/liblockfile.make +++ b/rules/liblockfile.make @@ -1,8 +1,8 @@ # -*-makefile-*- -# $Id: template 3502 2005-12-11 12:46:17Z rsc $ # # Copyright (C) 2006 by Bjoern Buerger -# +# 2009 by Marc Kleine-Budde <mkl@pengutronix.de> +# # See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions @@ -17,108 +17,58 @@ PACKAGES-$(PTXCONF_LIBLOCKFILE) += liblockfile # # Paths and names # -LIBLOCKFILE_VERSION := 1.06 -LIBLOCKFILE := liblockfile_$(LIBLOCKFILE_VERSION) +LIBLOCKFILE_VERSION := 1.08 LIBLOCKFILE_SUFFIX := tar.gz -LIBLOCKFILE_URL := $(PTXCONF_SETUP_DEBMIRROR)/pool/main/libl/liblockfile/$(LIBLOCKFILE).$(LIBLOCKFILE_SUFFIX) -LIBLOCKFILE_SOURCE := $(SRCDIR)/$(LIBLOCKFILE).$(LIBLOCKFILE_SUFFIX) +LIBLOCKFILE := liblockfile-$(LIBLOCKFILE_VERSION) +LIBLOCKFILE_TARBALL := liblockfile_$(LIBLOCKFILE_VERSION).orig.$(LIBLOCKFILE_SUFFIX) +LIBLOCKFILE_URL := $(PTXCONF_SETUP_DEBMIRROR)/pool/main/libl/liblockfile/$(LIBLOCKFILE_TARBALL) +LIBLOCKFILE_SOURCE := $(SRCDIR)/$(LIBLOCKFILE_TARBALL) LIBLOCKFILE_DIR := $(BUILDDIR)/liblockfile-$(LIBLOCKFILE_VERSION) - +LIBLOCKFILE_LICENSE := GPLv2+, LGPLv2+ # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- -liblockfile_get: $(STATEDIR)/liblockfile.get - -$(STATEDIR)/liblockfile.get: $(liblockfile_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(LIBLOCKFILE_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, LIBLOCKFILE) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -liblockfile_extract: $(STATEDIR)/liblockfile.extract - -$(STATEDIR)/liblockfile.extract: $(liblockfile_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(LIBLOCKFILE_DIR)) - @$(call extract, LIBLOCKFILE) - @$(call patchin, LIBLOCKFILE) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -liblockfile_prepare: $(STATEDIR)/liblockfile.prepare - -LIBLOCKFILE_PATH := PATH=$(CROSS_PATH) -LIBLOCKFILE_ENV := $(CROSS_ENV) +LIBLOCKFILE_PATH := PATH=$(CROSS_PATH) +LIBLOCKFILE_ENV := $(CROSS_ENV) +LIBLOCKFILE_MAKEVARS := ROOT=$(PKGDIR)/$(LIBLOCKFILE) $(CROSS_ENV_AR) # # autoconf # -LIBLOCKFILE_AUTOCONF := $(CROSS_AUTOCONF_USR) - -$(STATEDIR)/liblockfile.prepare: $(liblockfile_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(LIBLOCKFILE_DIR)/config.cache) - cd $(LIBLOCKFILE_DIR) && \ - $(LIBLOCKFILE_PATH) $(LIBLOCKFILE_ENV) \ - ./configure $(LIBLOCKFILE_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -liblockfile_compile: $(STATEDIR)/liblockfile.compile - -$(STATEDIR)/liblockfile.compile: $(liblockfile_compile_deps_default) - @$(call targetinfo, $@) - cd $(LIBLOCKFILE_DIR) && $(LIBLOCKFILE_PATH) make - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -liblockfile_install: $(STATEDIR)/liblockfile.install - -$(STATEDIR)/liblockfile.install: $(liblockfile_install_deps_default) - @$(call targetinfo, $@) - @$(call install, LIBLOCKFILE,,,ROOT=$(SYSROOT)) - @$(call touch, $@) +LIBLOCKFILE_AUTOCONF := $(CROSS_AUTOCONF_USR) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -liblockfile_targetinstall: $(STATEDIR)/liblockfile.targetinstall - -$(STATEDIR)/liblockfile.targetinstall: $(liblockfile_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/liblockfile.targetinstall: + @$(call targetinfo) @$(call install_init, liblockfile) @$(call install_fixup, liblockfile,PACKAGE,liblockfile) @$(call install_fixup, liblockfile,PRIORITY,optional) @$(call install_fixup, liblockfile,VERSION,$(LIBLOCKFILE_VERSION)) @$(call install_fixup, liblockfile,SECTION,base) - @$(call install_fixup, liblockfile,AUTHOR,"Bjoern Buerger <b.buerger\@pengutronix.de>") + @$(call install_fixup, liblockfile,AUTHOR,"Bjoern Buerger <b.buerger@pengutronix.de>") @$(call install_fixup, liblockfile,DEPENDS,) @$(call install_fixup, liblockfile,DESCRIPTION,missing) - @$(call install_copy, liblockfile, 0, 0, 0755, $(LIBLOCKFILE_DIR)/dotlockfile, /usr/bin/dotlockfile) + @$(call install_copy, liblockfile, 0, 0, 0755, -, \ + /usr/bin/dotlockfile) @$(call install_finish, liblockfile) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |