Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [pull request] Pull request for branch libaio-conversion
@ 2010-04-05 20:39 Thomas Petazzoni
  2010-04-05 20:39 ` [Buildroot] [PATCH 1/1] libaio: convert to the GENTARGETS infrastructure Thomas Petazzoni
  0 siblings, 1 reply; 7+ messages in thread
From: Thomas Petazzoni @ 2010-04-05 20:39 UTC (permalink / raw)
  To: buildroot

The following changes since commit 6cdcc4d7d8134f4b60f0eb9039090f9ad4c38366:
  Peter Korsgaard (1):
        gcc: hide shared libgcc option if BR2_PREFER_STATIC_LIB is enabled

are available in the git repository at:

  git://git.busybox.net/~tpetazzoni/git/buildroot libaio-conversion

Thomas Petazzoni (1):
      libaio: convert to the GENTARGETS infrastructure

 package/libaio/libaio.mk |   52 +++++++++++----------------------------------
 1 files changed, 13 insertions(+), 39 deletions(-)

Thanks,
-- 
Thomas Petazzoni

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 1/1] libaio: convert to the GENTARGETS infrastructure
  2010-04-05 20:39 [Buildroot] [pull request] Pull request for branch libaio-conversion Thomas Petazzoni
@ 2010-04-05 20:39 ` Thomas Petazzoni
  2010-04-05 21:44   ` Peter Korsgaard
  0 siblings, 1 reply; 7+ messages in thread
From: Thomas Petazzoni @ 2010-04-05 20:39 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libaio/libaio.mk |   52 +++++++++++----------------------------------
 1 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk
index f1bb603..58cdf6c 100644
--- a/package/libaio/libaio.mk
+++ b/package/libaio/libaio.mk
@@ -3,48 +3,22 @@
 # libaio
 #
 #############################################################
-LIBAIO_VERSION=0.3.106-avr32
+LIBAIO_VERSION=0.3.109
 LIBAIO_SOURCE=libaio-$(LIBAIO_VERSION).tar.bz2
-LIBAIO_SITE=http://avr32linux.org/twiki/pub/Main/LibAio/
-LIBAIO_DIR=$(BUILD_DIR)/libaio-$(LIBAIO_VERSION)
-LIBAIO_SOVER=1.0.1
+LIBAIO_SITE=ftp://ftp.kernel.org/pub/linux/libs/aio/
+LIBAIO_INSTALL_STAGING=YES
 
-LIBAIO_ARCH:=$(ARCH)
-LIBAIO_MAKEOPTS:= $(TARGET_CONFIGURE_OPTS) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS) -nostdlib -nostartfiles -I. -fPIC" LDFLAGS="$(TARGET_LDFLAGS)"
+define LIBAIO_BUILD_CMDS
+  $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
 
-$(DL_DIR)/$(LIBAIO_SOURCE):
-	$(call DOWNLOAD,$(LIBAIO_SITE),$(LIBAIO_SOURCE))
+define LIBAIO_INSTALL_STAGING_CMDS
+  $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
+endef
 
-$(LIBAIO_DIR)/.unpacked: $(DL_DIR)/$(LIBAIO_SOURCE)
-	$(BZCAT) $(DL_DIR)/$(LIBAIO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(LIBAIO_DIR) package/libaio libaio\*.patch
-	touch $@
+define LIBAIO_INSTALL_TARGET_CMDS
+  $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
 
-$(LIBAIO_DIR)/src/libaio.so.$(LIBAIO_SOVER): $(LIBAIO_DIR)/.unpacked
-	$(MAKE) -C $(LIBAIO_DIR) $(LIBAIO_MAKEOPTS)
+$(eval $(call GENTARGETS,package,libaio))
 
-$(STAGING_DIR)/usr/lib/libaio.so: $(LIBAIO_DIR)/src/libaio.so.$(LIBAIO_SOVER)
-	$(MAKE) -C $(LIBAIO_DIR) $(LIBAIO_MAKEOPTS) prefix=$(STAGING_DIR)/usr install
-
-$(TARGET_DIR)/usr/lib/libaio.so: $(STAGING_DIR)/usr/lib/libaio.so
-	cp -dpf $(STAGING_DIR)/usr/lib/libaio.so* $(TARGET_DIR)/usr/lib/
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libaio.so
-
-libaio: $(TARGET_DIR)/usr/lib/libaio.so
-
-libaio-source: $(DL_DIR)/$(LIBAIO_SOURCE)
-
-libaio-clean:
-	-$(MAKE) -C $(LIBAIO_DIR) $(LIBAIO_MAKEOPTS) clean
-
-libaio-dirclean:
-	rm -rf $(LIBAIO_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LIBAIO),y)
-TARGETS+=libaio
-endif
-- 
1.6.3.3

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 1/1] libaio: convert to the GENTARGETS infrastructure
  2010-04-05 20:39 ` [Buildroot] [PATCH 1/1] libaio: convert to the GENTARGETS infrastructure Thomas Petazzoni
@ 2010-04-05 21:44   ` Peter Korsgaard
  2010-04-06  6:38     ` Thomas Petazzoni
  0 siblings, 1 reply; 7+ messages in thread
From: Peter Korsgaard @ 2010-04-05 21:44 UTC (permalink / raw)
  To: buildroot

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Thomas> ---
 Thomas>  package/libaio/libaio.mk |   52 +++++++++++----------------------------------
 Thomas>  1 files changed, 13 insertions(+), 39 deletions(-)

 Thomas> diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk
 Thomas> index f1bb603..58cdf6c 100644
 Thomas> --- a/package/libaio/libaio.mk
 Thomas> +++ b/package/libaio/libaio.mk
 Thomas> @@ -3,48 +3,22 @@
 Thomas>  # libaio
 Thomas>  #
 Thomas>  #############################################################
 Thomas> -LIBAIO_VERSION=0.3.106-avr32
 Thomas> +LIBAIO_VERSION=0.3.109
 Thomas>  LIBAIO_SOURCE=libaio-$(LIBAIO_VERSION).tar.bz2
 Thomas> -LIBAIO_SITE=http://avr32linux.org/twiki/pub/Main/LibAio/
 Thomas> -LIBAIO_DIR=$(BUILD_DIR)/libaio-$(LIBAIO_VERSION)
 Thomas> -LIBAIO_SOVER=1.0.1
 Thomas> +LIBAIO_SITE=ftp://ftp.kernel.org/pub/linux/libs/aio/

We have BR2_KERNEL_MIRROR, might be good to use.

 Thomas> +define LIBAIO_INSTALL_STAGING_CMDS
 Thomas> +  $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
 Thomas> +endef

Are you missing a patch? I don't see any DESTDIR handling in the libaio
build system, and I get:

make[1]: Entering directory `/tmp/br/build/libaio-0.3.109'
make[2]: Entering directory `/tmp/br/build/libaio-0.3.109/src'
install -D -m 644 libaio.h /usr/include/libaio.h
install: cannot create regular file `/usr/include/libaio.h': Permission denied
make[2]: *** [install] Error 1
make[2]: Leaving directory `/tmp/br/build/libaio-0.3.109/src'
make[1]: *** [install] Error 2
make[1]: Leaving directory `/tmp/br/build/libaio-0.3.109'
make: *** [/tmp/br/build/libaio-0.3.109/.stamp_staging_installed] Error 2

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 1/1] libaio: convert to the GENTARGETS infrastructure
  2010-04-05 21:44   ` Peter Korsgaard
@ 2010-04-06  6:38     ` Thomas Petazzoni
  0 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2010-04-06  6:38 UTC (permalink / raw)
  To: buildroot

On Mon, 05 Apr 2010 23:44:39 +0200
Peter Korsgaard <jacmet@uclibc.org> wrote:

> We have BR2_KERNEL_MIRROR, might be good to use.

Right.

> Are you missing a patch? I don't see any DESTDIR handling in the libaio
> build system, and I get:

Damn, forgot to git add the two patches I borrowed from OpenEmbedded.

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [pull request] Pull request for branch libaio-conversion
@ 2010-04-06 19:10 Thomas Petazzoni
  0 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2010-04-06 19:10 UTC (permalink / raw)
  To: buildroot

The following changes since commit 6cdcc4d7d8134f4b60f0eb9039090f9ad4c38366:
  Peter Korsgaard (1):
        gcc: hide shared libgcc option if BR2_PREFER_STATIC_LIB is enabled

are available in the git repository at:

  git://git.busybox.net/~tpetazzoni/git/buildroot libaio-conversion

Thomas Petazzoni (1):
      libaio: convert to the GENTARGETS infrastructure

 package/libaio/libaio-0.3.109-arches.patch  |  660 +++++++++++++++++++++++++++
 package/libaio/libaio-0.3.109-destdir.patch |   17 +
 package/libaio/libaio.mk                    |   52 +--
 3 files changed, 690 insertions(+), 39 deletions(-)
 create mode 100644 package/libaio/libaio-0.3.109-arches.patch
 create mode 100644 package/libaio/libaio-0.3.109-destdir.patch

Thanks,
-- 
Thomas Petazzoni

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [pull request] Pull request for branch libaio-conversion
@ 2010-04-08 22:05 Thomas Petazzoni
  2010-04-08 22:42 ` Peter Korsgaard
  0 siblings, 1 reply; 7+ messages in thread
From: Thomas Petazzoni @ 2010-04-08 22:05 UTC (permalink / raw)
  To: buildroot

The following changes since commit 633049d80064e8c156ff58e1fc776f2f9afe9163:
  Gustavo Zacarias (1):
        Enable e300c2, e300c3 and e500mc powerpc optimizations

are available in the git repository at:

  git://git.busybox.net/~tpetazzoni/git/buildroot libaio-conversion

Thomas Petazzoni (1):
      libaio: convert to the GENTARGETS infrastructure

 package/libaio/libaio-0.3.109-arches.patch  |  671 +++++++++++++++++++++++++++
 package/libaio/libaio-0.3.109-destdir.patch |   24 +
 package/libaio/libaio.mk                    |   52 +--
 3 files changed, 708 insertions(+), 39 deletions(-)
 create mode 100644 package/libaio/libaio-0.3.109-arches.patch
 create mode 100644 package/libaio/libaio-0.3.109-destdir.patch

Thanks,
-- 
Thomas Petazzoni

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [pull request] Pull request for branch libaio-conversion
  2010-04-08 22:05 Thomas Petazzoni
@ 2010-04-08 22:42 ` Peter Korsgaard
  0 siblings, 0 replies; 7+ messages in thread
From: Peter Korsgaard @ 2010-04-08 22:42 UTC (permalink / raw)
  To: buildroot

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> The following changes since commit 633049d80064e8c156ff58e1fc776f2f9afe9163:
 Thomas>   Gustavo Zacarias (1):
 Thomas>         Enable e300c2, e300c3 and e500mc powerpc optimizations

 Thomas> are available in the git repository at:

 Thomas>   git://git.busybox.net/~tpetazzoni/git/buildroot libaio-conversion

 Thomas> Thomas Petazzoni (1):
 Thomas>       libaio: convert to the GENTARGETS infrastructure

Committed, thanks!

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2010-04-08 22:42 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-05 20:39 [Buildroot] [pull request] Pull request for branch libaio-conversion Thomas Petazzoni
2010-04-05 20:39 ` [Buildroot] [PATCH 1/1] libaio: convert to the GENTARGETS infrastructure Thomas Petazzoni
2010-04-05 21:44   ` Peter Korsgaard
2010-04-06  6:38     ` Thomas Petazzoni
  -- strict thread matches above, loose matches on Subject: below --
2010-04-06 19:10 [Buildroot] [pull request] Pull request for branch libaio-conversion Thomas Petazzoni
2010-04-08 22:05 Thomas Petazzoni
2010-04-08 22:42 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox