[Buildroot] [git commit master] xfont_font-util: convert to the autotools infrastructure

[Buildroot] [git commit master] xfont_font-util: convert to the autotools infrastructure

[Thomas Petazzoni]

commit: http://git.buildroot.net/buildroot/commit/?id=abc1479ea795a18a743ea513e33179058bdfe6b6
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/x11r7/xfont_font-util/xfont_font-util.mk |   74 ++--------------------
 1 files changed, 6 insertions(+), 68 deletions(-)

diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index 38e7e80..88dce38 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -5,76 +5,14 @@
 ################################################################################
 
 XFONT_FONT_UTIL_VERSION = 1.0.1
-XFONT_FONT_UTIL_NAME = font-util-$(XFONT_FONT_UTIL_VERSION)
 XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
 XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_UTIL_AUTORECONF = NO
-XFONT_FONT_UTIL_DIR=$(BUILD_DIR)/$(XFONT_FONT_UTIL_NAME)
-XFONT_FONT_UTIL_CAT:=$(BZCAT)
+XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config
 
-$(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE):
-	 $(call DOWNLOAD,$(XFONT_FONT_UTIL_SITE),$(XFONT_FONT_UTIL_SOURCE))
+define XFONT_FONT_UTIL_POST_INSTALL_FIXES
+ $(@D)/post-install.sh $(STAGING_DIR)
+endef
 
-xfont_font-util-source: $(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE)
-
-$(XFONT_FONT_UTIL_DIR)/.unpacked: $(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE)
-	$(XFONT_FONT_UTIL_CAT) $(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(XFONT_FONT_UTIL_DIR) package/x11r7/xfont_font-util/ \*.patch
-	$(CONFIG_UPDATE) $(XFONT_FONT_UTIL_DIR)
-	touch $@
-
-$(XFONT_FONT_UTIL_DIR)/.configured: $(XFONT_FONT_UTIL_DIR)/.unpacked
-	(cd $(XFONT_FONT_UTIL_DIR) && rm -rf config.cache)
-	(cd $(XFONT_FONT_UTIL_DIR) && \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/usr/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--includedir=/usr/include \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-	)
-	touch $@
-
-$(XFONT_FONT_UTIL_DIR)/.compiled: $(XFONT_FONT_UTIL_DIR)/.configured
-	$(MAKE) -C $(XFONT_FONT_UTIL_DIR)
-	touch $@
-
-$(XFONT_FONT_UTIL_DIR)/.installed: $(XFONT_FONT_UTIL_DIR)/.compiled
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(XFONT_FONT_UTIL_DIR) install
-	touch $@
-
-$(XFONT_FONT_UTIL_DIR)/.hacked: $(XFONT_FONT_UTIL_DIR)/.installed
-	( package/x11r7/xfont_font-util/post-install.sh $(STAGING_DIR) )
-	touch $@
-
-xfont_font-util: host-pkg-config $(XFONT_FONT_UTIL_DIR)/.hacked
-
-xfont_font-util-unpacked: $(XFONT_FONT_UTIL_DIR)/.unpacked
-
-xfont_font-util-clean:
-	-$(MAKE) -C $(XFONT_FONT_UTIL_DIR) clean
-
-xfont_font-util-dirclean:
-	rm -rf $(XFONT_FONT_UTIL_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_XFONT_FONT_UTIL),y)
-TARGETS+=xfont_font-util
-endif
+XFONT_FONT_UTIL_POST_INSTALL_STAGING_HOOKS += XFONT_FONT_UTIL_POST_INSTALL_FIXES
 
+$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util))
\ No newline at end of file
-- 
1.6.3.3

[Buildroot] [git commit master] xfont_font-util: convert to the autotools infrastructure

[Paulius Zaleckas]

On 02/23/2010 10:27 PM, Thomas Petazzoni wrote:
>
> commit: http://git.buildroot.net/buildroot/commit/?id=abc1479ea795a18a743ea513e33179058bdfe6b6
> branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
>
> Signed-off-by: Thomas Petazzoni<thomas.petazzoni@free-electrons.com>
> ---
>   package/x11r7/xfont_font-util/xfont_font-util.mk |   74 ++--------------------
>   1 files changed, 6 insertions(+), 68 deletions(-)
>
> diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
> index 38e7e80..88dce38 100644
> --- a/package/x11r7/xfont_font-util/xfont_font-util.mk
> +++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
> @@ -5,76 +5,14 @@
>   ################################################################################
>
>   XFONT_FONT_UTIL_VERSION = 1.0.1
> -XFONT_FONT_UTIL_NAME = font-util-$(XFONT_FONT_UTIL_VERSION)
>   XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
>   XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font
> -XFONT_FONT_UTIL_AUTORECONF = NO
> -XFONT_FONT_UTIL_DIR=$(BUILD_DIR)/$(XFONT_FONT_UTIL_NAME)
> -XFONT_FONT_UTIL_CAT:=$(BZCAT)
> +XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config

[...]

> -$(XFONT_FONT_UTIL_DIR)/.installed: $(XFONT_FONT_UTIL_DIR)/.compiled
> -	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(XFONT_FONT_UTIL_DIR) install
> -	touch $@
> -

Shouldn't font-utils be installed to STAGING instead of TARGET?
Originally it was installed to STAGING.
I would suggest adding:

XFONT_FONT_UTIL_INSTALL_STAGING = YES
XFONT_FONT_UTIL_INSTALL_TARGET = NO

BR,
Paulius Zaleckas

[Buildroot] [git commit master] xfont_font-util: convert to the autotools infrastructure

[Peter Korsgaard]

>>>>> "Paulius" == Paulius Zaleckas <paulius.zaleckas@gmail.com> writes:

Hi,

 >> -$(XFONT_FONT_UTIL_DIR)/.installed: $(XFONT_FONT_UTIL_DIR)/.compiled
 >> -	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(XFONT_FONT_UTIL_DIR) install
 >> -	touch $@
 >> -

 Paulius> Shouldn't font-utils be installed to STAGING instead of TARGET?
 Paulius> Originally it was installed to STAGING.
 Paulius> I would suggest adding:

 Paulius> XFONT_FONT_UTIL_INSTALL_STAGING = YES
 Paulius> XFONT_FONT_UTIL_INSTALL_TARGET = NO

Why? Isn't xfont-utils a bunch of programs to run on the target? Staging
is normally for libs.

-- 
Bye, Peter Korsgaard

[Buildroot] [git commit master] xfont_font-util: convert to the autotools infrastructure

[Paulius Zaleckas]

On 02/23/2010 11:49 PM, Peter Korsgaard wrote:
>>>>>> "Paulius" == Paulius Zaleckas<paulius.zaleckas@gmail.com>  writes:
>
> Hi,
>
>   >>  -$(XFONT_FONT_UTIL_DIR)/.installed: $(XFONT_FONT_UTIL_DIR)/.compiled
>   >>  -	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(XFONT_FONT_UTIL_DIR) install
>   >>  -	touch $@
>   >>  -
>
>   Paulius>  Shouldn't font-utils be installed to STAGING instead of TARGET?
>   Paulius>  Originally it was installed to STAGING.
>   Paulius>  I would suggest adding:
>
>   Paulius>  XFONT_FONT_UTIL_INSTALL_STAGING = YES
>   Paulius>  XFONT_FONT_UTIL_INSTALL_TARGET = NO
>
> Why? Isn't xfont-utils a bunch of programs to run on the target? Staging
> is normally for libs.
>

Well now we have:

 > XFONT_FONT_UTIL_VERSION = 1.1.1
 > XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
 > XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font
 > XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config
 >
 > define XFONT_FONT_UTIL_POST_INSTALL_FIXES
 >  $(@D)/post-install.sh $(STAGING_DIR)
 > endef
 >
 > XFONT_FONT_UTIL_POST_INSTALL_STAGING_HOOKS += XFONT_FONT_UTIL_POST_INSTALL_FIXES

Why do we need POST_INSTALL_STAGING hook when we installed only to TARGET?

 > $(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util))

Actually I believe it was installed in to staging for some reason...
I have ~200 patches (will post them soon :)) to update X.Org to 7.5 and I
had to change post-install.sh script to new location for pkg-config
or else it would fail building fonts... if I remember correctly.

[Buildroot] [git commit master] xfont_font-util: convert to the autotools infrastructure

[Peter Korsgaard]

>>>>> "Paulius" == Paulius Zaleckas <paulius.zaleckas@gmail.com> writes:

Hi,

 >> Why? Isn't xfont-utils a bunch of programs to run on the target? Staging
 >> is normally for libs.
 >> 

 Paulius> Well now we have:

 >> XFONT_FONT_UTIL_POST_INSTALL_STAGING_HOOKS += XFONT_FONT_UTIL_POST_INSTALL_FIXES

 Paulius> Why do we need POST_INSTALL_STAGING hook when we installed
 Paulius> only to TARGET?

True. The package used to only install into staging dir before Thomas'
commit, which also doesn't make much sense - Thomas?

 >> $(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util))

 Paulius> Actually I believe it was installed in to staging for some reason...

Presumably yes, but I don't right away see why.

 Paulius> I have ~200 patches (will post them soon :)) to update X.Org
 Paulius> to 7.5 and I had to change post-install.sh script to new
 Paulius> location for pkg-config or else it would fail building
 Paulius> fonts... if I remember correctly.

Sounds good!

-- 
Bye, Peter Korsgaard

[Buildroot] [git commit master] xfont_font-util: convert to the autotools infrastructure

[Will Wagner]

On 24/02/2010 20:19, Paulius Zaleckas wrote:
> On 02/23/2010 11:49 PM, Peter Korsgaard wrote:
>>>>>>> "Paulius" == Paulius Zaleckas<paulius.zaleckas@gmail.com>  writes:
>>
>> Hi,
>>
>> >>  -$(XFONT_FONT_UTIL_DIR)/.installed: $(XFONT_FONT_UTIL_DIR)/.compiled
>> >>  -    $(MAKE) DESTDIR=$(STAGING_DIR) -C $(XFONT_FONT_UTIL_DIR) 
>> install
>> >>  -    touch $@
>> >>  -
>>
>>   Paulius>  Shouldn't font-utils be installed to STAGING instead of 
>> TARGET?
>>   Paulius>  Originally it was installed to STAGING.
>>   Paulius>  I would suggest adding:
>>
>>   Paulius>  XFONT_FONT_UTIL_INSTALL_STAGING = YES
>>   Paulius>  XFONT_FONT_UTIL_INSTALL_TARGET = NO
>>
>> Why? Isn't xfont-utils a bunch of programs to run on the target? Staging
>> is normally for libs.
>>
>
> Well now we have:
>
> > XFONT_FONT_UTIL_VERSION = 1.1.1
> > XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
> > XFONT_FONT_UTIL_SITE = 
> http://xorg.freedesktop.org/releases/individual/font
> > XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config
> >
> > define XFONT_FONT_UTIL_POST_INSTALL_FIXES
> >  $(@D)/post-install.sh $(STAGING_DIR)
> > endef
> >
> > XFONT_FONT_UTIL_POST_INSTALL_STAGING_HOOKS += 
> XFONT_FONT_UTIL_POST_INSTALL_FIXES
>
> Why do we need POST_INSTALL_STAGING hook when we installed only to 
> TARGET?

I also have done a similar fix. I believe it is need in staging so that 
the pkgconfig info is correct, otherwise other things don't build

>
> > $(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util))
>
> Actually I believe it was installed in to staging for some reason...
> I have ~200 patches (will post them soon :)) to update X.Org to 7.5 and I
> had to change post-install.sh script to new location for pkg-config
> or else it would fail building fonts... if I remember correctly.

I have also have patches to submit for X.Org 7.5, was just waiting for 
2.10 release before submitting.

> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [git commit master] xfont_font-util: convert to the autotools infrastructure

[Thomas Petazzoni]

On Wed, 24 Feb 2010 22:49:20 +0000
Will Wagner <will_wagner@carallon.com> wrote:

> > Why do we need POST_INSTALL_STAGING hook when we installed only to 
> > TARGET?
> 
> I also have done a similar fix. I believe it is need in staging so
> that the pkgconfig info is correct, otherwise other things don't build

Ok. I've just sent a patch to fix this.

However, the way xfont_font-util is handled today is horrible. The
post-install script removes binaries compiled for the target from the
staging directory, and replaces them by symbolic links to binaries on
the host (making the incorrect assumption that they are available).

So, xfont_font-util needs be compiled for the host (using the new
infrastructure we have).

I haven't looked at the details, why are pkgconfig files needed for
font-utils ?

> I have also have patches to submit for X.Org 7.5, was just waiting
> for 2.10 release before submitting.

Great!

Could you cooperate with Paulius on this ? Like setting up a git tree
somewhere where you can collaborate and show us your code before
submitting it ?

Thanks !

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [git commit master] xfont_font-util: convert to the autotools infrastructure

[William Wagner]

On 23/02/2010 20:27, Thomas Petazzoni wrote:
> commit: http://git.buildroot.net/buildroot/commit/?id=abc1479ea795a18a743ea513e33179058bdfe6b6
> branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
>
> Signed-off-by: Thomas Petazzoni<thomas.petazzoni@free-electrons.com>
> ---
>   package/x11r7/xfont_font-util/xfont_font-util.mk |   74 ++--------------------
>   1 files changed, 6 insertions(+), 68 deletions(-)
>
> diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
> index 38e7e80..88dce38 100644
> --- a/package/x11r7/xfont_font-util/xfont_font-util.mk
> +++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
> @@ -5,76 +5,14 @@
>   ################################################################################
>
>   XFONT_FONT_UTIL_VERSION = 1.0.1
> -XFONT_FONT_UTIL_NAME = font-util-$(XFONT_FONT_UTIL_VERSION)
>   XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
>   XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font
> -XFONT_FONT_UTIL_AUTORECONF = NO
> -XFONT_FONT_UTIL_DIR=$(BUILD_DIR)/$(XFONT_FONT_UTIL_NAME)
> -XFONT_FONT_UTIL_CAT:=$(BZCAT)
> +XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config
>
> -$(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE):
> -	 $(call DOWNLOAD,$(XFONT_FONT_UTIL_SITE),$(XFONT_FONT_UTIL_SOURCE))
> +define XFONT_FONT_UTIL_POST_INSTALL_FIXES
> + $(@D)/post-install.sh $(STAGING_DIR)
> +endef
>
>    
Have just pulled this change and it does not work. The problem is that 
$(@D) is output/build/xfont_font-util-1.0.1 as the rule we are currently 
evaluating is 
output/build/xfont_font-util-1.0.1/.stamp_staging_installed but the 
script is in package/x11r7/xfont_font-util

The attached patch fixes this issue


-- 
------------------------------------------------------------------------
Will Wagner                                     will_wagner at carallon.com
Development Manager                      Office Tel: +44 (0)20 7371 2032
Carallon Ltd, Studio G20, Shepherds Building, Rockley Rd, London W14 0DA
------------------------------------------------------------------------

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 0001-fix-call-of-post-install-sh.patch
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100225/c89d0c7b/attachment-0001.diff>

[Buildroot] [git commit master] xfont_font-util: convert to the autotools infrastructure

[Peter Korsgaard]

>>>>> "William" == William Wagner <will_wagner@carallon.com> writes:

 William> Have just pulled this change and it does not work. The problem is that
 William> $(@D) is output/build/xfont_font-util-1.0.1 as the rule we are
 William> currently evaluating is
 William> output/build/xfont_font-util-1.0.1/.stamp_staging_installed but the
 William> script is in package/x11r7/xfont_font-util

 William> The attached patch fixes this issue

Committed, thanks!

-- 
Bye, Peter Korsgaard

[Buildroot] [git commit master] xfont_font-util: convert to the autotools infrastructure

[Paulius Zaleckas]

On 02/25/2010 09:44 AM, Thomas Petazzoni wrote:
> On Wed, 24 Feb 2010 22:49:20 +0000
> Will Wagner<will_wagner@carallon.com>  wrote:
>
>>> Why do we need POST_INSTALL_STAGING hook when we installed only to
>>> TARGET?
>>
>> I also have done a similar fix. I believe it is need in staging so
>> that the pkgconfig info is correct, otherwise other things don't build
>
> Ok. I've just sent a patch to fix this.
>
> However, the way xfont_font-util is handled today is horrible. The
> post-install script removes binaries compiled for the target from the
> staging directory, and replaces them by symbolic links to binaries on
> the host (making the incorrect assumption that they are available).
>
> So, xfont_font-util needs be compiled for the host (using the new
> infrastructure we have).
>
> I haven't looked at the details, why are pkgconfig files needed for
> font-utils ?
>
>> I have also have patches to submit for X.Org 7.5, was just waiting
>> for 2.10 release before submitting.
>
> Great!
>
> Could you cooperate with Paulius on this ? Like setting up a git tree
> somewhere where you can collaborate and show us your code before
> submitting it ?

Sure. I will push my changes to some public git repo during the weekend.

>
> Thanks !
>
> Thomas

[Buildroot] [git commit master] xfont_font-util: convert to the autotools infrastructure

[Thomas Petazzoni]

On Thu, 25 Feb 2010 17:13:38 +0000
William Wagner <will_wagner@carallon.com> wrote:

> Have just pulled this change and it does not work. The problem is
> that $(@D) is output/build/xfont_font-util-1.0.1 as the rule we are
> currently evaluating is 
> output/build/xfont_font-util-1.0.1/.stamp_staging_installed but the 
> script is in package/x11r7/xfont_font-util

I apologize for the mess. I thought I did test the build after making
the changes, but obviously for xfont_font-util I didn't, which is bad.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com