Patchwork [2/2] groff: fix bindir transaction error

login
register
mail settings
Submitter Ming Liu
Date July 3, 2014, 9:30 a.m.
Message ID <1404379801-16174-2-git-send-email-ming.liu@windriver.com>
Download mbox | patch
Permalink /patch/74885/
State Accepted
Commit 42806c7c7b2024273ac249ff4be3c51f69a60aa7
Headers show

Comments

Ming Liu - July 3, 2014, 9:30 a.m.
bindir is transfered to Makefile as ${D}${bindir}, hence it should not
use DESTDIR as the prefix directory any more during the install.

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
Richard Purdie - July 3, 2014, 9:50 a.m.
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 <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
>
Ming Liu - July 3, 2014, 11 a.m.
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
>>
>
>
>

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