From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dan.rpsys.net (5751f4a1.skybroadband.com [87.81.244.161]) by mail.openembedded.org (Postfix) with ESMTP id BEEB765CF7 for ; Thu, 3 Jul 2014 09:50:30 +0000 (UTC) Received: from localhost (dan.rpsys.net [127.0.0.1]) by dan.rpsys.net (8.14.4/8.14.4/Debian-2.1ubuntu4) with ESMTP id s639oP2D026247; Thu, 3 Jul 2014 10:50:26 +0100 X-Virus-Scanned: Debian amavisd-new at dan.rpsys.net Received: from dan.rpsys.net ([127.0.0.1]) by localhost (dan.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id wrURggjlkxfw; Thu, 3 Jul 2014 10:50:25 +0100 (BST) Received: from [192.168.3.10] (rpvlan0 [192.168.3.10]) (authenticated bits=0) by dan.rpsys.net (8.14.4/8.14.4/Debian-2.1ubuntu1) with ESMTP id s639oNli026231 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Thu, 3 Jul 2014 10:50:24 +0100 Message-ID: <1404381016.6362.78.camel@ted> From: Richard Purdie To: Ming Liu Date: Thu, 03 Jul 2014 10:50:16 +0100 In-Reply-To: <1404379801-16174-2-git-send-email-ming.liu@windriver.com> References: <1404379801-16174-1-git-send-email-ming.liu@windriver.com> <1404379801-16174-2-git-send-email-ming.liu@windriver.com> X-Mailer: Evolution 3.8.4-0ubuntu1 Mime-Version: 1.0 Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH 2/2] groff: fix bindir transaction error X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2014 09:50:36 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Thu, 2014-07-03 at 17:30 +0800, Ming Liu wrote: > bindir is transfered to Makefile as ${D}${bindir}, hence it should not > use DESTDIR as the prefix directory any more during the install. This feels wrong, we really want to have DESTDIR support in the Makefile. Can we stop passing ${D} as part of bindir instead? Cheers, Richard > Signed-off-by: Ming Liu > --- > .../groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch | 39 ++++++++++++++++++++++ > meta/recipes-extended/groff/groff_1.18.1.4.bb | 4 ++- > 2 files changed, 42 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch > > diff --git a/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch b/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch > new file mode 100644 > index 0000000..559ae72 > --- /dev/null > +++ b/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch > @@ -0,0 +1,39 @@ > +Upstream-Status: Inappropriate [embedded] > + > +Signed-off-by: Ming Liu > +--- > + Makefile.sub | 10 +++++----- > + 1 file changed, 5 insertions(+), 5 deletions(-) > + > +--- a/contrib/groffer/Makefile.sub > ++++ b/contrib/groffer/Makefile.sub > +@@ -38,16 +38,16 @@ groffer: groffer.sh groffer2.sh version. > + $(RM) $@; > + sed \ > + -e "s|@g@|$(g)|g" \ > +- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ > ++ -e "s|@BINDIR@|$(bindir)|g" \ > + -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ > + -e "s|@VERSION@|$(version)$(revision)|g" \ > + $(srcdir)/groffer.sh >$@; > + chmod +x $@ > + > + install_data: groffer > +- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) > +- -$(RM) $(DESTDIR)$(bindir)/groffer > +- $(INSTALL_SCRIPT) groffer $(DESTDIR)$(bindir)/groffer > ++ -test -d $(bindir) || $(mkinstalldirs) $(bindir) > ++ -$(RM) $(bindir)/groffer > ++ $(INSTALL_SCRIPT) groffer $(bindir)/groffer > + -test -d $(DESTDIR)$(libdir)/groff/groffer || \ > + $(mkinstalldirs) $(DESTDIR)$(libdir)/groff/groffer > + -$(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh > +@@ -58,7 +58,7 @@ install_data: groffer > + $(DESTDIR)$(libdir)/groff/groffer/version.sh > + > + uninstall_sub: > +- -$(RM) $(DESTDIR)$(bindir)/groffer > ++ -$(RM) $(bindir)/groffer > + -$(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh > + -$(RM) $(DESTDIR)$(libdir)/groff/groffer/version.sh > + -rmdir $(DESTDIR)$(libdir)/groff/groffer > diff --git a/meta/recipes-extended/groff/groff_1.18.1.4.bb b/meta/recipes-extended/groff/groff_1.18.1.4.bb > index 6871949..38e1d36 100644 > --- a/meta/recipes-extended/groff/groff_1.18.1.4.bb > +++ b/meta/recipes-extended/groff/groff_1.18.1.4.bb > @@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e43fc16fccd8519fba405f0a0ff6e8a3" > SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ > file://groff-1.18.1.4-remove-mom.patch;striplevel=1 \ > file://man-local.patch \ > - file://mdoc-local.patch" > + file://mdoc-local.patch \ > + file://groff-1.18.1.4-fix-bindir.patch \ > +" > > inherit autotools texinfo > > -- > 1.8.4.1 >