Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [pull request v8 (for next)] Pull request for branch yem-new-packages
@ 2013-05-14 21:45 Yann E. MORIN
  2013-05-14 21:45 ` [Buildroot] [PATCH 1/3] package/pmake: force argv[0]=${0} in the pmake wrapper Yann E. MORIN
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Yann E. MORIN @ 2013-05-14 21:45 UTC (permalink / raw)
  To: buildroot

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Hello All!

This series deals with adding some packages required to build QEMU on
the target.

Regards,
Yann E. MORIN


Changes v7 -> v8:
  - fix pmake wrapper, makes libedit2 actually build (noticed by Peter)
  - add snappy (latter needed by ceph, not yet in due to missing deps so far)

Changes v6 -> v7:
  - simple resend as requested by Peter on IRC, for -next (2013.08)

Changes v5 -> v6:
  - removed libedit2 patches, grab them at download time (Arnout)

Changes v4 -> v5:
  - fixed the ceph build after the boost changes
  - rebased ontop current master

Changes v3 -> v4:
  - removed pmake patches, grab them at download time (Arnout, Thomas)

Changes v2 -> v3:
  - rebased on-top latest tree, drop already applied packages
  - bumped usbredir version (needed later for qemu 1.3.x)

Changes v1 -> v2:
  - vde2: do not require C++ (Peter)
  - usbredir: select libusb (Peter)
  - ceph: use 'select' instead of 'depends on'
  - cegui06: add comment


The following changes since commit 594f07e85221fcf7bf7228804e9c7499a69fd5f0:

  beaglebone: enable NFS root support (2013-05-14 22:51:18 +0200)

are available in the git repository at:

  git://gitorious.org/buildroot/buildroot.git yem-new-packages

for you to fetch changes up to 593d227bcb531b484e9a613baee53d3acaf9370b:

  package/snappy: new package (2013-05-14 23:37:33 +0200)

----------------------------------------------------------------
Tag base for branch "yem-target-qemu"

----------------------------------------------------------------
Yann E. MORIN (3):
      package/pmake: force argv[0]=${0} in the pmake wrapper
      package/libedit2: new package
      package/snappy: new package

 package/Config.in            |  2 ++
 package/libedit2/Config.in   |  9 ++++++
 package/libedit2/libedit2.mk | 76 ++++++++++++++++++++++++++++++++++++++++++++
 package/libedit2/libedit2.pc | 13 ++++++++
 package/pmake/pmake.mk       |  2 +-
 package/snappy/Config.in     |  9 ++++++
 package/snappy/snappy.mk     | 13 ++++++++
 7 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 package/libedit2/Config.in
 create mode 100644 package/libedit2/libedit2.mk
 create mode 100644 package/libedit2/libedit2.pc
 create mode 100644 package/snappy/Config.in
 create mode 100644 package/snappy/snappy.mk

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

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

* [Buildroot] [PATCH 1/3] package/pmake: force argv[0]=${0} in the pmake wrapper
  2013-05-14 21:45 [Buildroot] [pull request v8 (for next)] Pull request for branch yem-new-packages Yann E. MORIN
@ 2013-05-14 21:45 ` Yann E. MORIN
  2013-05-30 20:58   ` Peter Korsgaard
  2013-05-14 21:45 ` [Buildroot] [PATCH 2/3] package/libedit2: new package Yann E. MORIN
  2013-05-14 21:45 ` [Buildroot] [PATCH 3/3] package/snappy: " Yann E. MORIN
  2 siblings, 1 reply; 11+ messages in thread
From: Yann E. MORIN @ 2013-05-14 21:45 UTC (permalink / raw)
  To: buildroot

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

This forces bmake to call the wrapper, not itself.
Also, use consistent "${0/*}" instead of "${0/pmake}".

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/pmake/pmake.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pmake/pmake.mk b/package/pmake/pmake.mk
index 7b2e5a6..50613e8 100644
--- a/package/pmake/pmake.mk
+++ b/package/pmake/pmake.mk
@@ -39,7 +39,7 @@ define HOST_PMAKE_INSTALL_CMDS
 	for mk in $(@D)/mk/*; do                                        \
 	    $(INSTALL) -m 0644 $${mk} $(HOST_DIR)/usr/share/pmake/mk;   \
 	done
-	printf '#!/bin/sh\nexec $${0%%/*}/bmake -m $${0%%/pmake}/../../usr/share/pmake/mk "$$@"\n'  \
+	printf '#!/bin/bash\nexec -a "$${0}" $${0%%/*}/bmake -m $${0%%/*}/../../usr/share/pmake/mk "$$@"\n'  \
 	       >$(HOST_DIR)/usr/bin/pmake
 	chmod 0755 $(HOST_DIR)/usr/bin/pmake
 endef
-- 
1.8.1.2

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

* [Buildroot] [PATCH 2/3] package/libedit2: new package
  2013-05-14 21:45 [Buildroot] [pull request v8 (for next)] Pull request for branch yem-new-packages Yann E. MORIN
  2013-05-14 21:45 ` [Buildroot] [PATCH 1/3] package/pmake: force argv[0]=${0} in the pmake wrapper Yann E. MORIN
@ 2013-05-14 21:45 ` Yann E. MORIN
  2013-05-14 22:27   ` Arnout Vandecappelle
  2013-05-30 21:03   ` Peter Korsgaard
  2013-05-14 21:45 ` [Buildroot] [PATCH 3/3] package/snappy: " Yann E. MORIN
  2 siblings, 2 replies; 11+ messages in thread
From: Yann E. MORIN @ 2013-05-14 21:45 UTC (permalink / raw)
  To: buildroot

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
---
 package/Config.in            |  1 +
 package/libedit2/Config.in   |  9 ++++++
 package/libedit2/libedit2.mk | 76 ++++++++++++++++++++++++++++++++++++++++++++
 package/libedit2/libedit2.pc | 13 ++++++++
 4 files changed, 99 insertions(+)
 create mode 100644 package/libedit2/Config.in
 create mode 100644 package/libedit2/libedit2.mk
 create mode 100644 package/libedit2/libedit2.pc

diff --git a/package/Config.in b/package/Config.in
index 6b6ce9d..828b5b5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -619,6 +619,7 @@ menu "Text and terminal handling"
 source "package/enchant/Config.in"
 source "package/libfribidi/Config.in"
 source "package/icu/Config.in"
+source "package/libedit2/Config.in"
 source "package/libiconv/Config.in"
 source "package/linenoise/Config.in"
 source "package/ncurses/Config.in"
diff --git a/package/libedit2/Config.in b/package/libedit2/Config.in
new file mode 100644
index 0000000..1e7b95d
--- /dev/null
+++ b/package/libedit2/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBEDIT2
+	bool "libedit2"
+	select BR2_PACKAGE_LIBBSD
+	select BR2_PACKAGE_NCURSES
+	help
+	  The editline library (from BSD) provides generic line editing
+	  and history functions. It slightly resembles GNU readline.
+	  
+	  http://ftp.netbsd.org/pub/NetBSD/NetBSD-release-5-0/src/lib/libedit/
diff --git a/package/libedit2/libedit2.mk b/package/libedit2/libedit2.mk
new file mode 100644
index 0000000..0916c2e
--- /dev/null
+++ b/package/libedit2/libedit2.mk
@@ -0,0 +1,76 @@
+#############################################################
+#
+# libedit2
+#
+#############################################################
+
+# Note: libedit2 does not have a regular homepage, and it seems
+# there is no place where to download a tarball from. That's
+# why we use the Debian way-back machine.
+LIBEDIT2_VERSION_MAJOR   = 2
+LIBEDIT2_VERSION_MINOR   = 11
+LIBEDIT2_VERSION_EXTRA   = -20080614
+LIBEDIT2_VERSION         = $(LIBEDIT2_VERSION_MAJOR).$(LIBEDIT2_VERSION_MINOR)
+LIBEDIT2_SOURCE          = libedit_$(LIBEDIT2_VERSION)$(LIBEDIT2_VERSION_EXTRA).orig.tar.bz2
+LIBEDIT2_SITE            = http://snapshot.debian.org/archive/debian/20120601T033558Z/pool/main/libe/libedit
+LIBEDIT2_SUBDIR          = libedit
+LIBEDIT2_PATCH           = libedit_2.11-20080614-5.debian.tar.bz2
+LIBEDIT2_INSTALL_STAGING = YES
+LIBEDIT2_DEPENDENCIES    = host-pmake libbsd ncurses
+
+define LIBEDIT2_POST_PATCH_PERMISSIONS
+	chmod +x $(@D)/libedit/makelist
+endef
+
+LIBEDIT2_POST_PATCH_HOOKS += LIBEDIT2_POST_PATCH_PERMISSIONS
+
+define LIBEDIT2_FIX_VIS_H_INCLUDE
+	$(SED) 's,^#include <vis\.h>$$,#include <bsd/vis\.h>,;' \
+	       $(@D)/libedit/filecomplete.c                     \
+	       $(@D)/libedit/history.c                          \
+	       $(@D)/libedit/readline.c
+endef
+LIBEDIT2_POST_PATCH_HOOKS += LIBEDIT2_FIX_VIS_H_INCLUDE
+
+LIBEDIT2_PMAKE_OPTS = MKPROFILE=no MKCATPAGES=no MLINKS= MANPAGES= NOGCCERROR=1         \
+                      SHLIB_SHFLAGS="-Wl,-soname,libedit.so.${LIBEDIT2_VERSION_MAJOR}"  \
+
+define LIBEDIT2_BUILD_CMDS
+	cd $(@D)/$(LIBEDIT2_SUBDIR); \
+	$(TARGET_CONFIGURE_OPTS) LDADD="-lbsd -lcurses" pmake $(LIBEDIT2_PMAKE_OPTS)
+endef
+
+LIBEDIT2_MAN_LINKS = el_init el_end el_reset el_gets el_getc el_push el_parse   \
+                     el_set el_get el_source el_resize el_line el_insertstr     \
+                     el_deletestr history_init history_end history
+
+# $1: DESTDIR to install into
+# Can't use pmake to install, it wants to be root. sigh... :-(
+# We need to create the .so links, otherwise we can't link; and waiting for
+# ldconfig is too late as it's done just before building the images.
+define LIBEDIT2_INSTALL_CMDS
+	$(INSTALL) -D -m 0644 package/libedit2/libedit2.pc $(1)/usr/lib/pkgconfig/libedit2.pc
+	ln -sf libedit2.pc $(1)/usr/lib/pkgconfig/libedit.pc
+	$(INSTALL) -D -m 0644 $(@D)/libedit/libedit.a $(1)/usr/lib/libedit.a
+	$(INSTALL) -D -m 0644 $(@D)/libedit/libedit_pic.a $(1)/usr/lib/libedit_pic.a
+	$(INSTALL) -D -m 0644 $(@D)/libedit/libedit.so.2.11 $(1)/usr/lib/libedit.so.2.11
+	$(INSTALL) -D -m 0644 $(@D)/libedit/histedit.h $(1)/usr/include/histedit.h
+	ln -sf libedit.so.$(LIBEDIT2_VERSION) $(1)/usr/lib/libedit.so.$(LIBEDIT2_VERSION_MAJOR)
+	ln -sf libedit.so.$(LIBEDIT2_VERSION_MAJOR) $(1)/usr/lib/libedit.so
+	$(INSTALL) -D -m 0644 $(@D)/libedit/readline/readline.h $(1)/usr/include/editline/readline.h
+	$(INSTALL) -v -D -m 0644 $(@D)/libedit/editline.3 $(1)/usr/share/man/man3/editline.3el
+	$(INSTALL) -v -D -m 0644 $(@D)/libedit/editrc.5 $(1)/usr/share/man/man5/editrc.5el
+	for lnk in $(LIBEDIT2_MAN_LINKS); do                            \
+	    ln -sfv editline.3el $(1)/usr/share/man/man3/$${lnk}.3el;   \
+	done
+endef
+
+define LIBEDIT2_INSTALL_STAGING_CMDS
+	$(call LIBEDIT2_INSTALL_CMDS,$(STAGING_DIR))
+endef
+
+define LIBEDIT2_INSTALL_TARGET_CMDS
+	$(call LIBEDIT2_INSTALL_CMDS,$(TARGET_DIR))
+endef
+
+$(eval $(generic-package))
diff --git a/package/libedit2/libedit2.pc b/package/libedit2/libedit2.pc
new file mode 100644
index 0000000..47ac871
--- /dev/null
+++ b/package/libedit2/libedit2.pc
@@ -0,0 +1,13 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libedit
+Description: Not just a replacement library for libreadline and libhistory.
+Version: 2.11
+Requires: libbsd ncurses
+Requires.private:
+Libs: -L${libdir} -ledit
+Libs.private:
+Cflags: -I${includedir}
-- 
1.8.1.2

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

* [Buildroot] [PATCH 3/3] package/snappy: new package
  2013-05-14 21:45 [Buildroot] [pull request v8 (for next)] Pull request for branch yem-new-packages Yann E. MORIN
  2013-05-14 21:45 ` [Buildroot] [PATCH 1/3] package/pmake: force argv[0]=${0} in the pmake wrapper Yann E. MORIN
  2013-05-14 21:45 ` [Buildroot] [PATCH 2/3] package/libedit2: new package Yann E. MORIN
@ 2013-05-14 21:45 ` Yann E. MORIN
  2013-05-30 21:04   ` Peter Korsgaard
  2 siblings, 1 reply; 11+ messages in thread
From: Yann E. MORIN @ 2013-05-14 21:45 UTC (permalink / raw)
  To: buildroot

From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/Config.in        |  1 +
 package/snappy/Config.in |  9 +++++++++
 package/snappy/snappy.mk | 13 +++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/snappy/Config.in
 create mode 100644 package/snappy/snappy.mk

diff --git a/package/Config.in b/package/Config.in
index 828b5b5..51e9f93 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -383,6 +383,7 @@ endmenu
 menu "Compression and decompression"
 source "package/libarchive/Config.in"
 source "package/lzo/Config.in"
+source "package/snappy/Config.in"
 source "package/zlib/Config.in"
 endmenu
 
diff --git a/package/snappy/Config.in b/package/snappy/Config.in
new file mode 100644
index 0000000..62136ca
--- /dev/null
+++ b/package/snappy/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_SNAPPY
+	bool "snappy"
+	help
+	  Snappy is a compression/decompression library. It does not aim for
+	  maximum compression, or compatibility with any other compression
+	  library; instead, it aims for very high speeds and reasonable
+	  compression.
+
+	  http://code.google.com/p/snappy/
diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk
new file mode 100644
index 0000000..2704b97
--- /dev/null
+++ b/package/snappy/snappy.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# snappy
+#
+#############################################################
+
+SNAPPY_VERSION		= 1.1.0
+SNAPPY_SITE		= http://snappy.googlecode.com/files/
+SNAPPY_LICENSE		= BSD-3c
+SNAPPY_LICENSE_FILES	= COPYING
+SNAPPY_INSTALL_STAGING	= YES
+
+$(eval $(autotools-package))
-- 
1.8.1.2

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

* [Buildroot] [PATCH 2/3] package/libedit2: new package
  2013-05-14 21:45 ` [Buildroot] [PATCH 2/3] package/libedit2: new package Yann E. MORIN
@ 2013-05-14 22:27   ` Arnout Vandecappelle
  2013-05-14 22:42     ` Yann E. MORIN
  2013-05-30 21:03   ` Peter Korsgaard
  1 sibling, 1 reply; 11+ messages in thread
From: Arnout Vandecappelle @ 2013-05-14 22:27 UTC (permalink / raw)
  To: buildroot

  Why is it called libedit2? Both NetBSD and Debian call it libedit...


On 14/05/13 23:45, Yann E. MORIN wrote:
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Arnout Vandecappelle <arnout@mind.be>
[snip]
> diff --git a/package/libedit2/libedit2.mk b/package/libedit2/libedit2.mk
> new file mode 100644
> index 0000000..0916c2e
> --- /dev/null
> +++ b/package/libedit2/libedit2.mk
> @@ -0,0 +1,76 @@
> +#############################################################
> +#
> +# libedit2
> +#
> +#############################################################
> +
> +# Note: libedit2 does not have a regular homepage, and it seems
> +# there is no place where to download a tarball from. That's
> +# why we use the Debian way-back machine.
> +LIBEDIT2_VERSION_MAJOR   = 2
> +LIBEDIT2_VERSION_MINOR   = 11
> +LIBEDIT2_VERSION_EXTRA   = -20080614
> +LIBEDIT2_VERSION         = $(LIBEDIT2_VERSION_MAJOR).$(LIBEDIT2_VERSION_MINOR)

  Why not
LIBEDIT2_VERSION         = $(LIBEDIT2_VERSION_MAJOR).11-20080614
?

> +LIBEDIT2_SOURCE          = libedit_$(LIBEDIT2_VERSION)$(LIBEDIT2_VERSION_EXTRA).orig.tar.bz2
> +LIBEDIT2_SITE            = http://snapshot.debian.org/archive/debian/20120601T033558Z/pool/main/libe/libedit
> +LIBEDIT2_SUBDIR          = libedit
> +LIBEDIT2_PATCH           = libedit_2.11-20080614-5.debian.tar.bz2

  Should be

LIBEDIT2_PATCH           = libedit_2.$(LIBEDIT2_VERSION)-5.debian.tar.bz2

> +LIBEDIT2_INSTALL_STAGING = YES
> +LIBEDIT2_DEPENDENCIES    = host-pmake libbsd ncurses
> +
> +define LIBEDIT2_POST_PATCH_PERMISSIONS
> +	chmod +x $(@D)/libedit/makelist

  Huh? Does pmake require this to be executable? How weird...

> +endef
> +
> +LIBEDIT2_POST_PATCH_HOOKS += LIBEDIT2_POST_PATCH_PERMISSIONS
> +
> +define LIBEDIT2_FIX_VIS_H_INCLUDE
> +	$(SED) 's,^#include <vis\.h>$$,#include <bsd/vis\.h>,;' \
> +	       $(@D)/libedit/filecomplete.c                     \
> +	       $(@D)/libedit/history.c                          \
> +	       $(@D)/libedit/readline.c
> +endef
> +LIBEDIT2_POST_PATCH_HOOKS += LIBEDIT2_FIX_VIS_H_INCLUDE
> +
> +LIBEDIT2_PMAKE_OPTS = MKPROFILE=no MKCATPAGES=no MLINKS= MANPAGES= NOGCCERROR=1         \
> +                      SHLIB_SHFLAGS="-Wl,-soname,libedit.so.${LIBEDIT2_VERSION_MAJOR}"  \
> +
> +define LIBEDIT2_BUILD_CMDS
> +	cd $(@D)/$(LIBEDIT2_SUBDIR); \
> +	$(TARGET_CONFIGURE_OPTS) LDADD="-lbsd -lcurses" pmake $(LIBEDIT2_PMAKE_OPTS)
> +endef
> +
> +LIBEDIT2_MAN_LINKS = el_init el_end el_reset el_gets el_getc el_push el_parse   \
> +                     el_set el_get el_source el_resize el_line el_insertstr     \
> +                     el_deletestr history_init history_end history
> +
> +# $1: DESTDIR to install into
> +# Can't use pmake to install, it wants to be root. sigh... :-(

  How about using host-fakeroot?


  Regards,
  Arnout


> +# We need to create the .so links, otherwise we can't link; and waiting for
> +# ldconfig is too late as it's done just before building the images.
> +define LIBEDIT2_INSTALL_CMDS
> +	$(INSTALL) -D -m 0644 package/libedit2/libedit2.pc $(1)/usr/lib/pkgconfig/libedit2.pc
> +	ln -sf libedit2.pc $(1)/usr/lib/pkgconfig/libedit.pc
> +	$(INSTALL) -D -m 0644 $(@D)/libedit/libedit.a $(1)/usr/lib/libedit.a
> +	$(INSTALL) -D -m 0644 $(@D)/libedit/libedit_pic.a $(1)/usr/lib/libedit_pic.a
> +	$(INSTALL) -D -m 0644 $(@D)/libedit/libedit.so.2.11 $(1)/usr/lib/libedit.so.2.11
> +	$(INSTALL) -D -m 0644 $(@D)/libedit/histedit.h $(1)/usr/include/histedit.h
> +	ln -sf libedit.so.$(LIBEDIT2_VERSION) $(1)/usr/lib/libedit.so.$(LIBEDIT2_VERSION_MAJOR)
> +	ln -sf libedit.so.$(LIBEDIT2_VERSION_MAJOR) $(1)/usr/lib/libedit.so
> +	$(INSTALL) -D -m 0644 $(@D)/libedit/readline/readline.h $(1)/usr/include/editline/readline.h
> +	$(INSTALL) -v -D -m 0644 $(@D)/libedit/editline.3 $(1)/usr/share/man/man3/editline.3el
> +	$(INSTALL) -v -D -m 0644 $(@D)/libedit/editrc.5 $(1)/usr/share/man/man5/editrc.5el
> +	for lnk in $(LIBEDIT2_MAN_LINKS); do                            \
> +	    ln -sfv editline.3el $(1)/usr/share/man/man3/$${lnk}.3el;   \
> +	done
> +endef
> +
> +define LIBEDIT2_INSTALL_STAGING_CMDS
> +	$(call LIBEDIT2_INSTALL_CMDS,$(STAGING_DIR))
> +endef
> +
> +define LIBEDIT2_INSTALL_TARGET_CMDS
> +	$(call LIBEDIT2_INSTALL_CMDS,$(TARGET_DIR))
> +endef
> +
> +$(eval $(generic-package))
> diff --git a/package/libedit2/libedit2.pc b/package/libedit2/libedit2.pc
> new file mode 100644
> index 0000000..47ac871
> --- /dev/null
> +++ b/package/libedit2/libedit2.pc
> @@ -0,0 +1,13 @@
> +prefix=/usr
> +exec_prefix=${prefix}
> +libdir=${exec_prefix}/lib
> +includedir=${prefix}/include
> +
> +Name: libedit
> +Description: Not just a replacement library for libreadline and libhistory.
> +Version: 2.11
> +Requires: libbsd ncurses
> +Requires.private:
> +Libs: -L${libdir} -ledit
> +Libs.private:
> +Cflags: -I${includedir}
>


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

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

* [Buildroot] [PATCH 2/3] package/libedit2: new package
  2013-05-14 22:27   ` Arnout Vandecappelle
@ 2013-05-14 22:42     ` Yann E. MORIN
  2013-05-15  7:01       ` Arnout Vandecappelle
  0 siblings, 1 reply; 11+ messages in thread
From: Yann E. MORIN @ 2013-05-14 22:42 UTC (permalink / raw)
  To: buildroot

Arnout, All,

On 2013-05-15 00:27 +0200, Arnout Vandecappelle spake thusly:
>  Why is it called libedit2? Both NetBSD and Debian call it libedit...

Debian actually calls it:
    libedit2        
    libedit-dev
See: http://packages.debian.org/search?keywords=libedit

> On 14/05/13 23:45, Yann E. MORIN wrote:
> >From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> >
> >Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> >Cc: Arnout Vandecappelle <arnout@mind.be>
> [snip]
> >diff --git a/package/libedit2/libedit2.mk b/package/libedit2/libedit2.mk
> >new file mode 100644
> >index 0000000..0916c2e
> >--- /dev/null
> >+++ b/package/libedit2/libedit2.mk
> >@@ -0,0 +1,76 @@
> >+#############################################################
> >+#
> >+# libedit2
> >+#
> >+#############################################################
> >+
> >+# Note: libedit2 does not have a regular homepage, and it seems
> >+# there is no place where to download a tarball from. That's
> >+# why we use the Debian way-back machine.
> >+LIBEDIT2_VERSION_MAJOR   = 2
> >+LIBEDIT2_VERSION_MINOR   = 11
> >+LIBEDIT2_VERSION_EXTRA   = -20080614
> >+LIBEDIT2_VERSION         = $(LIBEDIT2_VERSION_MAJOR).$(LIBEDIT2_VERSION_MINOR)
> 
>  Why not
> LIBEDIT2_VERSION         = $(LIBEDIT2_VERSION_MAJOR).11-20080614
> ?

Pshhh... Why not. :-)

> >+LIBEDIT2_SOURCE          = libedit_$(LIBEDIT2_VERSION)$(LIBEDIT2_VERSION_EXTRA).orig.tar.bz2
> >+LIBEDIT2_SITE            = http://snapshot.debian.org/archive/debian/20120601T033558Z/pool/main/libe/libedit
> >+LIBEDIT2_SUBDIR          = libedit
> >+LIBEDIT2_PATCH           = libedit_2.11-20080614-5.debian.tar.bz2
> 
>  Should be
> 
> LIBEDIT2_PATCH           = libedit_2.$(LIBEDIT2_VERSION)-5.debian.tar.bz2

Almost: s/_2\.//
Otherwise: indeed! :-)

> >+LIBEDIT2_INSTALL_STAGING = YES
> >+LIBEDIT2_DEPENDENCIES    = host-pmake libbsd ncurses
> >+
> >+define LIBEDIT2_POST_PATCH_PERMISSIONS
> >+	chmod +x $(@D)/libedit/makelist
> 
>  Huh? Does pmake require this to be executable? How weird...

As far as I remember, yes. I'll double check to be sure (hey! this has
been first dealt with last August! I don't remember all the details,
hence I should have added a comment. I'm served. :-) )

> >+endef
> >+
> >+LIBEDIT2_POST_PATCH_HOOKS += LIBEDIT2_POST_PATCH_PERMISSIONS
> >+
> >+define LIBEDIT2_FIX_VIS_H_INCLUDE
> >+	$(SED) 's,^#include <vis\.h>$$,#include <bsd/vis\.h>,;' \
> >+	       $(@D)/libedit/filecomplete.c                     \
> >+	       $(@D)/libedit/history.c                          \
> >+	       $(@D)/libedit/readline.c
> >+endef
> >+LIBEDIT2_POST_PATCH_HOOKS += LIBEDIT2_FIX_VIS_H_INCLUDE
> >+
> >+LIBEDIT2_PMAKE_OPTS = MKPROFILE=no MKCATPAGES=no MLINKS= MANPAGES= NOGCCERROR=1         \
> >+                      SHLIB_SHFLAGS="-Wl,-soname,libedit.so.${LIBEDIT2_VERSION_MAJOR}"  \
> >+
> >+define LIBEDIT2_BUILD_CMDS
> >+	cd $(@D)/$(LIBEDIT2_SUBDIR); \
> >+	$(TARGET_CONFIGURE_OPTS) LDADD="-lbsd -lcurses" pmake $(LIBEDIT2_PMAKE_OPTS)
> >+endef
> >+
> >+LIBEDIT2_MAN_LINKS = el_init el_end el_reset el_gets el_getc el_push el_parse   \
> >+                     el_set el_get el_source el_resize el_line el_insertstr     \
> >+                     el_deletestr history_init history_end history
> >+
> >+# $1: DESTDIR to install into
> >+# Can't use pmake to install, it wants to be root. sigh... :-(
> 
>  How about using host-fakeroot?

Meh... No other package depend on host-fakeroot so far, I did not want
to be the first. And since pmake is anyway a pita to work with, the less
we have to use it, the better we'll feel, I can promise you! :-)

I will update with your comments before resubmitting later tomorrow
evening (might not even be before the WE now, I'll be very busy with
real life matters until saturday morrning...

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

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

* [Buildroot] [PATCH 2/3] package/libedit2: new package
  2013-05-14 22:42     ` Yann E. MORIN
@ 2013-05-15  7:01       ` Arnout Vandecappelle
  2013-05-15 20:56         ` Yann E. MORIN
  0 siblings, 1 reply; 11+ messages in thread
From: Arnout Vandecappelle @ 2013-05-15  7:01 UTC (permalink / raw)
  To: buildroot

On 15/05/13 00:42, Yann E. MORIN wrote:
> Arnout, All,
>
> On 2013-05-15 00:27 +0200, Arnout Vandecappelle spake thusly:
>>   Why is it called libedit2? Both NetBSD and Debian call it libedit...
>
> Debian actually calls it:
>      libedit2
>      libedit-dev
> See: http://packages.debian.org/search?keywords=libedit

  The digit after the libxxx binary is the library soname, which isn't 
relevant for us. You should consider the source package name as the 
upstream name.

  Putting a digit behind the name should only be necessary for major 
non-backward-compatible API changes, like qt5 or gstreamer1.

  Regards,
  Arnout

[snip]


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

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

* [Buildroot] [PATCH 2/3] package/libedit2: new package
  2013-05-15  7:01       ` Arnout Vandecappelle
@ 2013-05-15 20:56         ` Yann E. MORIN
  0 siblings, 0 replies; 11+ messages in thread
From: Yann E. MORIN @ 2013-05-15 20:56 UTC (permalink / raw)
  To: buildroot

Arnout, All,

On 2013-05-15 09:01 +0200, Arnout Vandecappelle spake thusly:
> On 15/05/13 00:42, Yann E. MORIN wrote:
> >Arnout, All,
> >
> >On 2013-05-15 00:27 +0200, Arnout Vandecappelle spake thusly:
> >>  Why is it called libedit2? Both NetBSD and Debian call it libedit...
> >
> >Debian actually calls it:
> >     libedit2
> >     libedit-dev
> >See: http://packages.debian.org/search?keywords=libedit
> 
>  The digit after the libxxx binary is the library soname, which isn't
> relevant for us. You should consider the source package name as the upstream
> name.

Fair enough. Will rename. Thanks! :-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

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

* [Buildroot] [PATCH 1/3] package/pmake: force argv[0]=${0} in the pmake wrapper
  2013-05-14 21:45 ` [Buildroot] [PATCH 1/3] package/pmake: force argv[0]=${0} in the pmake wrapper Yann E. MORIN
@ 2013-05-30 20:58   ` Peter Korsgaard
  0 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2013-05-30 20:58 UTC (permalink / raw)
  To: buildroot

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 Yann> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
 Yann> This forces bmake to call the wrapper, not itself.
 Yann> Also, use consistent "${0/*}" instead of "${0/pmake}".

Committed to next, thanks.

-- 
Bye, Peter Korsgaard

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

* [Buildroot] [PATCH 2/3] package/libedit2: new package
  2013-05-14 21:45 ` [Buildroot] [PATCH 2/3] package/libedit2: new package Yann E. MORIN
  2013-05-14 22:27   ` Arnout Vandecappelle
@ 2013-05-30 21:03   ` Peter Korsgaard
  1 sibling, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2013-05-30 21:03 UTC (permalink / raw)
  To: buildroot

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 Yann> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
 Yann> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 Yann> Cc: Arnout Vandecappelle <arnout@mind.be>

Renamed to libedit as pointed out by Arnout and committed to next,
thanks.

-- 
Bye, Peter Korsgaard

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

* [Buildroot] [PATCH 3/3] package/snappy: new package
  2013-05-14 21:45 ` [Buildroot] [PATCH 3/3] package/snappy: " Yann E. MORIN
@ 2013-05-30 21:04   ` Peter Korsgaard
  0 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2013-05-30 21:04 UTC (permalink / raw)
  To: buildroot

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 Yann> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
 Yann> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

 Yann> ---
 Yann>  package/Config.in        |  1 +
 Yann>  package/snappy/Config.in |  9 +++++++++
 Yann>  package/snappy/snappy.mk | 13 +++++++++++++
 Yann>  3 files changed, 23 insertions(+)
 Yann>  create mode 100644 package/snappy/Config.in
 Yann>  create mode 100644 package/snappy/snappy.mk

 Yann> diff --git a/package/Config.in b/package/Config.in
 Yann> index 828b5b5..51e9f93 100644
 Yann> --- a/package/Config.in
 Yann> +++ b/package/Config.in
 Yann> @@ -383,6 +383,7 @@ endmenu
 Yann>  menu "Compression and decompression"
 Yann>  source "package/libarchive/Config.in"
 Yann>  source "package/lzo/Config.in"
 Yann> +source "package/snappy/Config.in"
 Yann>  source "package/zlib/Config.in"
 Yann>  endmenu
 
 Yann> diff --git a/package/snappy/Config.in b/package/snappy/Config.in
 Yann> new file mode 100644
 Yann> index 0000000..62136ca
 Yann> --- /dev/null
 Yann> +++ b/package/snappy/Config.in
 Yann> @@ -0,0 +1,9 @@
 Yann> +config BR2_PACKAGE_SNAPPY
 Yann> +	bool "snappy"
 Yann> +	help

It's implemented in C++, so it needs to depend on BR2_INSTALL_LIBSTDCPP.

Committed to next with that fixed, thanks.

-- 
Bye, Peter Korsgaard

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

end of thread, other threads:[~2013-05-30 21:04 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-14 21:45 [Buildroot] [pull request v8 (for next)] Pull request for branch yem-new-packages Yann E. MORIN
2013-05-14 21:45 ` [Buildroot] [PATCH 1/3] package/pmake: force argv[0]=${0} in the pmake wrapper Yann E. MORIN
2013-05-30 20:58   ` Peter Korsgaard
2013-05-14 21:45 ` [Buildroot] [PATCH 2/3] package/libedit2: new package Yann E. MORIN
2013-05-14 22:27   ` Arnout Vandecappelle
2013-05-14 22:42     ` Yann E. MORIN
2013-05-15  7:01       ` Arnout Vandecappelle
2013-05-15 20:56         ` Yann E. MORIN
2013-05-30 21:03   ` Peter Korsgaard
2013-05-14 21:45 ` [Buildroot] [PATCH 3/3] package/snappy: " Yann E. MORIN
2013-05-30 21:04   ` Peter Korsgaard

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