From: Ming Liu <ming.liu@windriver.com>
To: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 2/2] groff: fix bindir transaction error
Date: Thu, 3 Jul 2014 19:00:26 +0800 [thread overview]
Message-ID: <53B537CA.9050800@windriver.com> (raw)
In-Reply-To: <1404381016.6362.78.camel@ted>
On 07/03/2014 05:50 PM, Richard Purdie wrote:
> 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?
I think that is because there are many other Makefiles where only bindir
is used to indicate the binary directory without DESTDIR, dozen of them
except only one in this case, to name but a few:
......
groff-1.18.1.4/contrib/eqn2graph/Makefile.sub: $(INSTALL_SCRIPT)
eqn2graph $(bindir)/eqn2graph
groff-1.18.1.4/src/roff/nroff/Makefile.sub: $(INSTALL_SCRIPT) nroff
$(bindir)/$(NAMEPREFIX)nroff
groff-1.18.1.4/src/utils/afmtodit/Makefile.sub: $(INSTALL_SCRIPT)
afmtodit $(bindir)/afmtodit
......
the best,
thank you
>
> Cheers,
>
> Richard
>
>> Signed-off-by: Ming Liu <ming.liu@windriver.com>
>> ---
>> .../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 <ming.liu@windriver.com>
>> +---
>> + 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
>>
>
>
>
prev parent reply other threads:[~2014-07-03 11:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-03 9:30 [PATCH 1/2] groff: Fix build on Fedora 17 for 1.18.1.4 Ming Liu
2014-07-03 9:30 ` [PATCH 2/2] groff: fix bindir transaction error Ming Liu
2014-07-03 9:50 ` Richard Purdie
2014-07-03 11:00 ` Ming Liu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53B537CA.9050800@windriver.com \
--to=ming.liu@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=richard.purdie@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox