From 48a0e027885868a47408e1119b1b1636e4a2a48c Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 20 Jan 2012 17:11:37 +0000 Subject: [tools] quilt: make relocatable, search resources relative to STAGING_DIR git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29829 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- tools/quilt/patches/000-fix_compile.patch | 18 ------------------ tools/quilt/patches/000-relocatable.patch | 20 ++++++++++++++++++++ tools/quilt/patches/001-fix_compile.patch | 18 ++++++++++++++++++ 3 files changed, 38 insertions(+), 18 deletions(-) delete mode 100644 tools/quilt/patches/000-fix_compile.patch create mode 100644 tools/quilt/patches/000-relocatable.patch create mode 100644 tools/quilt/patches/001-fix_compile.patch (limited to 'tools/quilt') diff --git a/tools/quilt/patches/000-fix_compile.patch b/tools/quilt/patches/000-fix_compile.patch deleted file mode 100644 index 51a4f5e206..0000000000 --- a/tools/quilt/patches/000-fix_compile.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -273,13 +273,10 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu - lib/backup-files.o :: Makefile - - configure : configure.ac aclocal.m4 -- autoconf -- @echo "Please run ./configure" -- @false -+ @touch $@ - - Makefile : Makefile.in configure -- @echo "Please run ./configure" -- @false -+ @touch $@ - - compat_leftover := $(filter-out $(COMPAT),$(shell $(FIND) compat -maxdepth 1 -type f -perm +111)) - diff --git a/tools/quilt/patches/000-relocatable.patch b/tools/quilt/patches/000-relocatable.patch new file mode 100644 index 0000000000..19ff5fd6ad --- /dev/null +++ b/tools/quilt/patches/000-relocatable.patch @@ -0,0 +1,20 @@ +--- a/bin/quilt.in ++++ b/bin/quilt.in +@@ -7,9 +7,15 @@ + # See the COPYING and AUTHORS files for more details. + + export TEXTDOMAIN=quilt +-export TEXTDOMAINDIR=@LOCALEDIR@ + +-: ${QUILT_DIR=@QUILT_DIR@} ${QUILT_LIB=@QUILT_LIB@} ++if test -n "$STAGING_DIR"; then ++ export TEXTDOMAINDIR="$STAGING_DIR/../host/share/locale" ++ : ${QUILT_DIR=$STAGING_DIR/../host/share/quilt} ${QUILT_LIB=$STAGING_DIR/../host/lib/quilt} ++else ++ export TEXTDOMAINDIR=@LOCALEDIR@ ++ : ${QUILT_DIR=@QUILT_DIR@} ${QUILT_LIB=@QUILT_LIB@} ++fi ++ + export QUILT_DIR QUILT_LIB + + if [ -z "$QUILTRC" ] diff --git a/tools/quilt/patches/001-fix_compile.patch b/tools/quilt/patches/001-fix_compile.patch new file mode 100644 index 0000000000..51a4f5e206 --- /dev/null +++ b/tools/quilt/patches/001-fix_compile.patch @@ -0,0 +1,18 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -273,13 +273,10 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu + lib/backup-files.o :: Makefile + + configure : configure.ac aclocal.m4 +- autoconf +- @echo "Please run ./configure" +- @false ++ @touch $@ + + Makefile : Makefile.in configure +- @echo "Please run ./configure" +- @false ++ @touch $@ + + compat_leftover := $(filter-out $(COMPAT),$(shell $(FIND) compat -maxdepth 1 -type f -perm +111)) + -- cgit v1.2.3