All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] Misc set of patches, from Patchwork Day
@ 2013-03-24 18:19 Thomas Petazzoni
  2013-03-24 18:19 ` [Buildroot] [PATCH 1/9] rt-tests: mention that NPTL thread implementation is needed Thomas Petazzoni
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2013-03-24 18:19 UTC (permalink / raw)
  To: buildroot

Hello,

Here is a set of misc patches, accumulated during this Patchwork
Day. I took patches from the patchwork, updated them, fixed them, and
I'm now submitting them for inclusion.

Thanks,

Thomas

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 1/9] rt-tests: mention that NPTL thread implementation is needed
  2013-03-24 18:19 [Buildroot] Misc set of patches, from Patchwork Day Thomas Petazzoni
@ 2013-03-24 18:19 ` Thomas Petazzoni
  2013-03-24 18:19 ` [Buildroot] [PATCH 2/9] dtach: new package Thomas Petazzoni
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2013-03-24 18:19 UTC (permalink / raw)
  To: buildroot

This patch superseds http://patchwork.ozlabs.org/patch/150161/, but
does it in a different way. Since we don't have a way of selecting the
thread implementation for external toolchains, and it sounds a bit too
heavy to add new config options just for the sake of rt-tests, we
instead simply add some help text to the rt-tests package explaining
that NPTL thread implementation is needed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/rt-tests/Config.in |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in
index 0999ebf..a040139 100644
--- a/package/rt-tests/Config.in
+++ b/package/rt-tests/Config.in
@@ -14,6 +14,12 @@ config BR2_PACKAGE_RT_TESTS
 	  installed if a Python interpreter has been selected in the
 	  Buildroot configuration.
 
+	  Note that this package requires a toolchain built with the
+	  NPTL implementation of the pthread API (this is always the
+	  case with glibc/eglibc toolchains, but may not necessarily
+	  be the case with uClibc toolchains, since the thread
+	  implementation is configurable).
+
 	  http://rt.wiki.kernel.org
 
 comment "rt-tests requires a toolchain with threads support"
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 2/9] dtach: new package
  2013-03-24 18:19 [Buildroot] Misc set of patches, from Patchwork Day Thomas Petazzoni
  2013-03-24 18:19 ` [Buildroot] [PATCH 1/9] rt-tests: mention that NPTL thread implementation is needed Thomas Petazzoni
@ 2013-03-24 18:19 ` Thomas Petazzoni
  2013-03-24 18:19 ` [Buildroot] [PATCH 3/9] gd: add patch to fix gdlib-config script Thomas Petazzoni
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2013-03-24 18:19 UTC (permalink / raw)
  To: buildroot

From: Justin Maggard <jmaggard@netgear.com>

Signed-off-by: Justin Maggard <jmaggard@netgear.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Changes from v1 to v2:
 * Remove scrollback feature patch. We don't take feature patches in
   Buildroot.
 * Fixup commit title.
 * Fixed the site URL to use downloads.sourceforge.net
 * Use $(eval autotools-package)
---
 package/Config.in       |    1 +
 package/dtach/Config.in |    8 ++++++++
 package/dtach/dtach.mk  |   17 +++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 package/dtach/Config.in
 create mode 100644 package/dtach/dtach.mk

diff --git a/package/Config.in b/package/Config.in
index 94e279b..c66e139 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -774,6 +774,7 @@ source "package/bash/Config.in"
 source "package/dash/Config.in"
 endif
 source "package/dialog/Config.in"
+source "package/dtach/Config.in"
 source "package/file/Config.in"
 source "package/gnupg/Config.in"
 source "package/inotify-tools/Config.in"
diff --git a/package/dtach/Config.in b/package/dtach/Config.in
new file mode 100644
index 0000000..033536b
--- /dev/null
+++ b/package/dtach/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_DTACH
+	bool "dtach"
+	help
+	  dtach is a tiny program that emulates the detach feature of screen,
+	  allowing you to run a program in an environment that is protected
+	  from the controlling terminal and attach to it later.
+
+	  http://dtach.sourceforge.net/
diff --git a/package/dtach/dtach.mk b/package/dtach/dtach.mk
new file mode 100644
index 0000000..77ad7c0
--- /dev/null
+++ b/package/dtach/dtach.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# dtach
+#
+#############################################################
+
+DTACH_VERSION = 0.8
+DTACH_SITE = http://downloads.sourceforge.net/project/dtach/dtach/$(DTACH_VERSION)
+DTACH_LICENSE = GPLv2+
+DTACH_LICENSE_FILES = COPYING
+
+# The Makefile does not have an install target.
+define DTACH_INSTALL_TARGET_CMDS
+        $(INSTALL) -D -m 0755 $(@D)/dtach $(TARGET_DIR)/usr/bin/dtach
+endef
+
+$(eval $(autotools-package))
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 3/9] gd: add patch to fix gdlib-config script
  2013-03-24 18:19 [Buildroot] Misc set of patches, from Patchwork Day Thomas Petazzoni
  2013-03-24 18:19 ` [Buildroot] [PATCH 1/9] rt-tests: mention that NPTL thread implementation is needed Thomas Petazzoni
  2013-03-24 18:19 ` [Buildroot] [PATCH 2/9] dtach: new package Thomas Petazzoni
@ 2013-03-24 18:19 ` Thomas Petazzoni
  2013-03-24 18:19 ` [Buildroot] [PATCH 4/9] gnuplot: new package Thomas Petazzoni
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2013-03-24 18:19 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/gd/gd-gdlib-config.patch |   32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/gd/gd-gdlib-config.patch

diff --git a/package/gd/gd-gdlib-config.patch b/package/gd/gd-gdlib-config.patch
new file mode 100644
index 0000000..bfff88b
--- /dev/null
+++ b/package/gd/gd-gdlib-config.patch
@@ -0,0 +1,32 @@
+Fix gdlib-config
+
+Since the @LIBICONV@ macro doesn't get replaced at compile time, we
+end up installing an invalid gdlib-config: the gdlib-config --libs
+says that one should link against @LIBICONV@ which obviously doesn't
+work.
+
+Use the OpenWRT patch from
+https://dev.openwrt.org/browser/packages/libs/gd/patches/101-gdlib-config.patch
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+--- a/config/gdlib-config.in
++++ b/config/gdlib-config.in
+@@ -71,7 +71,7 @@ while test $# -gt 0; do
+ 	echo @LDFLAGS@
+ 	;;
+     --libs)
+-	echo @LIBS@ @LIBICONV@
++	echo @LIBS@
+ 	;;
+     --cflags|--includes)
+ 	echo -I at includedir@
+@@ -84,7 +84,7 @@ while test $# -gt 0; do
+ 	echo "includedir: $includedir"
+ 	echo "cflags:     -I at includedir@"
+ 	echo "ldflags:    @LDFLAGS@"
+-	echo "libs:       @LIBS@ @LIBICONV@"
++	echo "libs:       @LIBS@"
+ 	echo "libdir:     $libdir"
+ 	echo "features:   @FEATURES@"
+ 	;;
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 4/9] gnuplot: new package
  2013-03-24 18:19 [Buildroot] Misc set of patches, from Patchwork Day Thomas Petazzoni
                   ` (2 preceding siblings ...)
  2013-03-24 18:19 ` [Buildroot] [PATCH 3/9] gd: add patch to fix gdlib-config script Thomas Petazzoni
@ 2013-03-24 18:19 ` Thomas Petazzoni
  2013-03-24 18:19 ` [Buildroot] [PATCH 5/9] neon: add license informations Thomas Petazzoni
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2013-03-24 18:19 UTC (permalink / raw)
  To: buildroot

From: Anthony Viallard <viallard@syscom-instruments.com>

[Thomas: Improved by adding support to use readline functionality, gd
functionality, and various fixes.]

Signed-off-by: Anthony Viallard <viallard@syscom-instruments.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                                  |    1 +
 package/gnuplot/Config.in                          |    6 ++
 ...ot-0001-configure-add-without-demo-option.patch |   66 ++++++++++++++++++++
 .../gnuplot-0002-use-gdlib-config-properly.patch   |   27 ++++++++
 package/gnuplot/gnuplot.mk                         |   50 +++++++++++++++
 5 files changed, 150 insertions(+)
 create mode 100644 package/gnuplot/Config.in
 create mode 100644 package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch
 create mode 100644 package/gnuplot/gnuplot-0002-use-gdlib-config-properly.patch
 create mode 100644 package/gnuplot/gnuplot.mk

diff --git a/package/Config.in b/package/Config.in
index c66e139..5f33e45 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -106,6 +106,7 @@ endmenu
 menu "Graphic libraries and applications (graphic/text)"
 
 comment "Graphic applications"
+source "package/gnuplot/Config.in"
 source "package/rrdtool/Config.in"
 
 comment "graphic libraries"
diff --git a/package/gnuplot/Config.in b/package/gnuplot/Config.in
new file mode 100644
index 0000000..603c194
--- /dev/null
+++ b/package/gnuplot/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_GNUPLOT
+	bool "gnuplot"
+	help
+	  A portable command-line driven graphing utility.
+
+	  http://www.gnuplot.info/
diff --git a/package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch b/package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch
new file mode 100644
index 0000000..ccca4e3
--- /dev/null
+++ b/package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch
@@ -0,0 +1,66 @@
+Add options to enable/disable docs and demos
+
+Originally written by Anthony Viallard
+<viallard@syscom-instruments.com>.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: gnuplot-4.6.0/configure.in
+===================================================================
+--- gnuplot-4.6.0.orig/configure.in	2012-03-08 05:34:42.000000000 +0100
++++ gnuplot-4.6.0/configure.in	2013-01-07 11:50:03.003804463 +0100
+@@ -748,6 +748,16 @@
+ AC_ARG_WITH(lisp-files,dnl
+ [  --without-lisp-files    do not build emacs lisp files])
+ 
++dnl Whether we want to build the demo files
++dnl Does nothing here, is passed on to the demo subdir
++AC_ARG_ENABLE(demo,dnl
++[  --disable-demo    do not build demo files])
++
++dnl Whether we want to build the doc files
++dnl Does nothing here, is passed on to the doc subdir
++AC_ARG_ENABLE(doc,dnl
++[  --disable-doc    do not build doc files])
++
+ dnl Sort help/subtopic tables by row or column
+ AC_ARG_WITH(row-help,dnl
+ [  --with-row-help         format help and subtopic tables by row (default)
+@@ -1200,6 +1210,24 @@
+ fi
+ AC_SUBST(LISPDIR)
+ 
++dnl build demo files
++if test "$enable_demo" != no; then
++  AC_CONFIG_SUBDIRS(demo)
++  DEMOSUBDIR=demo
++else
++  DEMOSUBDIR=
++fi
++AC_SUBST(DEMOSUBDIR)
++
++dnl build doc files
++if test "$enable_doc" != no; then
++  AC_CONFIG_SUBDIRS(docs)
++  DOCSUBDIR=docs
++else
++  DOCSUBDIR=
++fi
++AC_SUBST(DOCSUBDIR)
++
+ dnl Substitute variables
+ AC_SUBST(PACKAGE)
+ AC_SUBST(VERSION_MAJOR)
+Index: gnuplot-4.6.0/Makefile.am
+===================================================================
+--- gnuplot-4.6.0.orig/Makefile.am	2013-01-04 14:07:02.239120935 +0100
++++ gnuplot-4.6.0/Makefile.am	2013-01-07 11:51:12.034846363 +0100
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+ AUTOMAKE_OPTIONS = foreign 1.2h
+ 
+-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
++SUBDIRS = config m4 term src $(DOCSUBDIR) $(LISPDIR) man $(DEMOSUBDIR) tutorial share
+ 
+ EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
+ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \
diff --git a/package/gnuplot/gnuplot-0002-use-gdlib-config-properly.patch b/package/gnuplot/gnuplot-0002-use-gdlib-config-properly.patch
new file mode 100644
index 0000000..690a826
--- /dev/null
+++ b/package/gnuplot/gnuplot-0002-use-gdlib-config-properly.patch
@@ -0,0 +1,27 @@
+Fix usage of gdlib-config
+
+gnuplot configure.in script properly takes care of finding
+gdlib-config using AC_PATH_PROG... but then directly uses gdlib-config
+instead of going through the GDLIB_CONFIG variable that AC_PATH_PROG
+has defined. Which means that whenever a gdlib-config binary not in
+the PATH is being used, it does not use it.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -537,9 +537,9 @@
+ if test "$with_gd" != no; then
+   AC_PATH_PROG([GDLIB_CONFIG], [gdlib-config])
+   if test -n "$GDLIB_CONFIG"; then
+-    libgd_CPPFLAGS=`gdlib-config --cflags`
+-    libgd_LDFLAGS=`gdlib-config --ldflags`
+-    libgd_LIBS=`gdlib-config --libs`
++    libgd_CPPFLAGS=`$GDLIB_CONFIG --cflags`
++    libgd_LDFLAGS=`$GDLIB_CONFIG --ldflags`
++    libgd_LIBS=`$GDLIB_CONFIG --libs`
+   elif test -d "$with_gd"; then
+     libgd_CPPFLAGS="-I$with_gd/include"
+     libgd_LDFLAGS="-L$with_gd/lib"
diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk
new file mode 100644
index 0000000..a68c7ae
--- /dev/null
+++ b/package/gnuplot/gnuplot.mk
@@ -0,0 +1,50 @@
+#############################################################
+#
+# gnuplot
+#
+#############################################################
+
+GNUPLOT_VERSION = 4.6.2
+GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION)
+GNUPLOT_LICENSE = gnuplot license (open source)
+GNUPLOT_LICENSE_FILES = Copyright
+
+GNUPLOT_AUTORECONF = YES
+
+GNUPLOT_CONF_OPT = --without-x \
+		--disable-raise-console \
+		--disable-mouse \
+	        --without-tutorial \
+		--disable-demo \
+	        --without-row-help \
+		--disable-history-file \
+	        --without-lisp-files \
+	        --disable-wxwidgets \
+	        --without-lua \
+		--without-latex \
+	        --without-cairo
+
+ifeq ($(BR2_PACKAGE_GD),y)
+GNUPLOT_CONF_OPT += --with-gd
+GNUPLOT_DEPENDENCIES += gd
+GNUPLOT_CONF_ENV += \
+	ac_cv_path_GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config
+else
+GNUPLOT_CONF_OPT += --without-gd
+endif
+
+ifeq ($(BR2_PACKAGE_READLINE),y)
+GNUPLOT_CONF_OPT += --with-readline=gnu
+GNUPLOT_DEPENDENCIES += readline
+else
+GNUPLOT_CONF_OPT += --without-readline
+endif
+
+# Remove Javascript scripts, lua scripts, PostScript files
+define GNUPLOT_REMOVE_UNNEEDED_FILES
+	$(RM) -rf $(TARGET_DIR)/usr/share/gnuplot
+endef
+
+GNUPLOT_POST_INSTALL_TARGET_HOOKS += GNUPLOT_REMOVE_UNNEEDED_FILES
+
+$(eval $(autotools-package))
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 5/9] neon: add license informations
  2013-03-24 18:19 [Buildroot] Misc set of patches, from Patchwork Day Thomas Petazzoni
                   ` (3 preceding siblings ...)
  2013-03-24 18:19 ` [Buildroot] [PATCH 4/9] gnuplot: new package Thomas Petazzoni
@ 2013-03-24 18:19 ` Thomas Petazzoni
  2013-03-24 18:19 ` [Buildroot] [PATCH 6/9] apr: various improvements Thomas Petazzoni
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2013-03-24 18:19 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/neon/neon.mk |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index cec72f8..58e01e1 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -5,6 +5,8 @@
 #############################################################
 NEON_VERSION = 0.29.6
 NEON_SITE = http://www.webdav.org/neon/
+NEON_LICENSE = LGPLv2+ (library), GPLv2+ (manual and tests)
+NEON_LICENSE_FILES = src/COPYING.LIB src/COPYING README
 NEON_INSTALL_STAGING = YES
 NEON_CONF_OPT = --without-gssapi --disable-rpath
 NEON_CONFIG_SCRIPTS = neon-config
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 6/9] apr: various improvements
  2013-03-24 18:19 [Buildroot] Misc set of patches, from Patchwork Day Thomas Petazzoni
                   ` (4 preceding siblings ...)
  2013-03-24 18:19 ` [Buildroot] [PATCH 5/9] neon: add license informations Thomas Petazzoni
@ 2013-03-24 18:19 ` Thomas Petazzoni
  2013-03-24 18:19 ` [Buildroot] [PATCH 7/9] apr-util: " Thomas Petazzoni
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2013-03-24 18:19 UTC (permalink / raw)
  To: buildroot

This commit:
 * Adds licensing informations
 * Ensures the apr-1-config script gets fixed appropriately
 * Remove the usr/build-1/ directory from the target, since it is only
   used during the compilation of packages that rely on APR.
 * Fix up a few paths in usr/build-1/ so that the compilation of
   apr-util works properly on top of this apr package.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/apr/apr.mk |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/package/apr/apr.mk b/package/apr/apr.mk
index e502490..a9dcb40 100644
--- a/package/apr/apr.mk
+++ b/package/apr/apr.mk
@@ -5,6 +5,8 @@
 #############################################################
 APR_VERSION = 1.4.6
 APR_SITE = http://archive.apache.org/dist/apr
+APR_LICENSE = Apache-2.0
+APR_LICENSE_FILES = LICENSE
 APR_INSTALL_STAGING = YES
 APR_CONF_ENV = \
 	ac_cv_file__dev_zero=yes \
@@ -14,5 +16,21 @@ APR_CONF_ENV = \
 	apr_cv_tcp_nodelay_with_cork=yes \
 	ac_cv_sizeof_struct_iovec=8 \
 	apr_cv_mutex_recursive=yes
+APR_CONFIG_SCRIPTS = apr-1-config
+
+define APR_CLEANUP_UNNEEDED_FILES
+	$(RM) -rf $(TARGET_DIR)/usr/build-1/
+endef
+
+APR_POST_INSTALL_TARGET_HOOKS += APR_CLEANUP_UNNEEDED_FILES
+
+define APR_FIXUP_RULES_MK
+	$(SED) 's%apr_builddir=%apr_builddir=$(STAGING_DIR)%' \
+		$(STAGING_DIR)/usr/build-1/apr_rules.mk
+	$(SED) 's%apr_builders=%apr_builders=$(STAGING_DIR)%' \
+		$(STAGING_DIR)/usr/build-1/apr_rules.mk
+endef
+
+APR_POST_INSTALL_STAGING_HOOKS += APR_FIXUP_RULES_MK
 
 $(eval $(autotools-package))
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 7/9] apr-util: various improvements
  2013-03-24 18:19 [Buildroot] Misc set of patches, from Patchwork Day Thomas Petazzoni
                   ` (5 preceding siblings ...)
  2013-03-24 18:19 ` [Buildroot] [PATCH 6/9] apr: various improvements Thomas Petazzoni
@ 2013-03-24 18:19 ` Thomas Petazzoni
  2013-03-24 18:19 ` [Buildroot] [PATCH 8/9] log4cxx: new package Thomas Petazzoni
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2013-03-24 18:19 UTC (permalink / raw)
  To: buildroot

This commit:
 * Adds licensing informations.
 * Uses the apr-1-config script instead of pointing apr-util to the
   apr build directory.
 * Ensures apu-1-config gets fixed properly using the
   <pkg>_CONFIG_SCRIPTS mechanism.
 * Ensures that libiconv gets built before apr-util if available, so
   that character set conversion features of apr-util can be enabled.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/apr-util/apr-util.mk |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk
index b9ff904..94b1817 100644
--- a/package/apr-util/apr-util.mk
+++ b/package/apr-util/apr-util.mk
@@ -5,9 +5,16 @@
 #############################################################
 APR_UTIL_VERSION = 1.4.1
 APR_UTIL_SITE = http://archive.apache.org/dist/apr
+APR_UTIL_LICENSE = Apache-2.0
+APR_UTIL_LICENSE_FILES = LICENSE
 APR_UTIL_INSTALL_STAGING = YES
 APR_UTIL_DEPENDENCIES = apr sqlite neon zlib
 APR_UTIL_CONF_OPT = \
-	--with-apr=$(BUILD_DIR)/apr-$(APR_VERSION) \
+	--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config
+APR_UTIL_CONFIG_SCRIPTS = apu-1-config
+
+# When iconv is available, then use it to provide charset conversion
+# features.
+APR_UTIL_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 $(eval $(autotools-package))
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 8/9] log4cxx: new package
  2013-03-24 18:19 [Buildroot] Misc set of patches, from Patchwork Day Thomas Petazzoni
                   ` (6 preceding siblings ...)
  2013-03-24 18:19 ` [Buildroot] [PATCH 7/9] apr-util: " Thomas Petazzoni
@ 2013-03-24 18:19 ` Thomas Petazzoni
  2013-03-24 18:19 ` [Buildroot] [PATCH 9/9] xcursor-transparent-theme: " Thomas Petazzoni
  2013-03-24 19:40 ` [Buildroot] Misc set of patches, from Patchwork Day Peter Korsgaard
  9 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2013-03-24 18:19 UTC (permalink / raw)
  To: buildroot

Initial work done by Aleksandar Zivkovic at
http://patchwork.ozlabs.org/patch/171109/.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/Config.in                                  |    1 +
 package/log4cxx/Config.in                          |   15 +++++++
 package/log4cxx/log4cxx-0001-charset-fixes.patch   |   43 +++++++++++++++++++
 .../log4cxx/log4cxx-0002-missing-includes.patch    |   44 ++++++++++++++++++++
 .../log4cxx/log4cxx-0003-missing-includes.patch    |   21 ++++++++++
 package/log4cxx/log4cxx.mk                         |   20 +++++++++
 6 files changed, 144 insertions(+)
 create mode 100644 package/log4cxx/Config.in
 create mode 100644 package/log4cxx/log4cxx-0001-charset-fixes.patch
 create mode 100644 package/log4cxx/log4cxx-0002-missing-includes.patch
 create mode 100644 package/log4cxx/log4cxx-0003-missing-includes.patch
 create mode 100644 package/log4cxx/log4cxx.mk

diff --git a/package/Config.in b/package/Config.in
index 5f33e45..bdfc0f2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -568,6 +568,7 @@ source "package/libtpl/Config.in"
 source "package/libseccomp/Config.in"
 source "package/liburcu/Config.in"
 source "package/linux-pam/Config.in"
+source "package/log4cxx/Config.in"
 source "package/lttng-libust/Config.in"
 source "package/mpc/Config.in"
 source "package/mpfr/Config.in"
diff --git a/package/log4cxx/Config.in b/package/log4cxx/Config.in
new file mode 100644
index 0000000..b9c9990
--- /dev/null
+++ b/package/log4cxx/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LOG4CXX
+	bool "log4cxx"
+	select BR2_PACKAGE_APR
+	select BR2_PACKAGE_APR_UTIL
+	# apr really needs shared library support
+	depends on !BR2_PREFER_STATIC_LIB
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Apache log4cxx is a logging framework for C++ patterned
+	  after Apache log4j.
+
+	  http://apache.linux-mirror.org/logging/log4cxx/0.10.0
+
+comment "log4cxx requires C++ support in toolchain"
+	depends on !BR2_INSTALL_LIBSTDCPP
\ No newline at end of file
diff --git a/package/log4cxx/log4cxx-0001-charset-fixes.patch b/package/log4cxx/log4cxx-0001-charset-fixes.patch
new file mode 100644
index 0000000..75567fd
--- /dev/null
+++ b/package/log4cxx/log4cxx-0001-charset-fixes.patch
@@ -0,0 +1,43 @@
+Fix build when iconv support is not available
+
+When iconv support is not available, the apr-util library does not
+provide character set conversion features, and therefore APR_HAS_XLATE
+is false.
+
+However, on Linux !defined(_WIN32) is always true, but the part of the
+code that defines the APRCharsetDecoder and APRCharsetEncoder are only
+enclosed in a #if APR_HAS_XLATE, without the "|| defined(_WIN32)"
+which leads to build failures: the APRCharsetEncoder and
+APRCharsetDecoder classes are used without being defined.
+
+This patch removes the || !defined(_WIN32) so that when iconv support
+is not here, we fall back to raising an exception at runtime.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/src/main/cpp/charsetdecoder.cpp
+===================================================================
+--- a/src/main/cpp/charsetdecoder.cpp
++++ b/src/main/cpp/charsetdecoder.cpp
+@@ -476,7 +476,7 @@
+         StringHelper::equalsIgnoreCase(charset, LOG4CXX_STR("ISO-LATIN-1"), LOG4CXX_STR("iso-latin-1"))) {
+         return new ISOLatinCharsetDecoder();
+     }
+-#if APR_HAS_XLATE || !defined(_WIN32)
++#if APR_HAS_XLATE
+     return new APRCharsetDecoder(charset);
+ #else    
+     throw IllegalArgumentException(charset);
+Index: b/src/main/cpp/charsetencoder.cpp
+===================================================================
+--- a/src/main/cpp/charsetencoder.cpp
++++ b/src/main/cpp/charsetencoder.cpp
+@@ -484,7 +484,7 @@
+     } else if (StringHelper::equalsIgnoreCase(charset, LOG4CXX_STR("UTF-16LE"), LOG4CXX_STR("utf-16le"))) {
+         return new UTF16LECharsetEncoder();
+     }
+-#if APR_HAS_XLATE || !defined(_WIN32)
++#if APR_HAS_XLATE
+     return new APRCharsetEncoder(charset);
+ #else    
+     throw IllegalArgumentException(charset);
diff --git a/package/log4cxx/log4cxx-0002-missing-includes.patch b/package/log4cxx/log4cxx-0002-missing-includes.patch
new file mode 100644
index 0000000..dd4da11
--- /dev/null
+++ b/package/log4cxx/log4cxx-0002-missing-includes.patch
@@ -0,0 +1,44 @@
+commit bcaf1f8a682d641cee325142099c371464fd5946
+Author: Curtis William Arnold <carnold@apache.org>
+Date:   Tue May 20 16:05:37 2008 +0000
+
+    LOGCXX-286: gcc 4.3 requires #include <cstring>
+    
+    git-svn-id: https://svn.apache.org/repos/asf/logging/log4cxx/trunk at 658304 13f79535-47bb-0310-9956-ffa450edef68
+
+diff --git a/src/examples/cpp/console.cpp b/src/examples/cpp/console.cpp
+index 6a01d8a..a673a10 100755
+--- a/src/examples/cpp/console.cpp
++++ b/src/examples/cpp/console.cpp
+@@ -22,6 +22,7 @@
+ #include <log4cxx/logmanager.h>
+ #include <iostream>
+ #include <locale.h>
++#include <cstring>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
+diff --git a/src/main/cpp/inputstreamreader.cpp b/src/main/cpp/inputstreamreader.cpp
+index 52b1c0a..cb45181 100644
+--- a/src/main/cpp/inputstreamreader.cpp
++++ b/src/main/cpp/inputstreamreader.cpp
+@@ -20,6 +20,7 @@
+ #include <log4cxx/helpers/exception.h>
+ #include <log4cxx/helpers/pool.h>
+ #include <log4cxx/helpers/bytebuffer.h>
++#include <cstring>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
+diff --git a/src/main/cpp/socketoutputstream.cpp b/src/main/cpp/socketoutputstream.cpp
+index 185f835..c61eb11 100644
+--- a/src/main/cpp/socketoutputstream.cpp
++++ b/src/main/cpp/socketoutputstream.cpp
+@@ -19,6 +19,7 @@
+ #include <log4cxx/helpers/socketoutputstream.h>
+ #include <log4cxx/helpers/socket.h>
+ #include <log4cxx/helpers/bytebuffer.h>
++#include <cstring>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
diff --git a/package/log4cxx/log4cxx-0003-missing-includes.patch b/package/log4cxx/log4cxx-0003-missing-includes.patch
new file mode 100644
index 0000000..cd21bba
--- /dev/null
+++ b/package/log4cxx/log4cxx-0003-missing-includes.patch
@@ -0,0 +1,21 @@
+commit ce62c00ea5f9bf2f0740ecde5b245c9b7edc80ff
+Author: Curtis William Arnold <carnold@apache.org>
+Date:   Mon Apr 27 03:53:50 2009 +0000
+
+    LOGCXX-332: fails to build with gcc 4.4
+    
+    git-svn-id: https://svn.apache.org/repos/asf/logging/log4cxx/trunk at 768863 13f79535-47bb-0310-9956-ffa450edef68
+
+diff --git a/src/examples/cpp/console.cpp b/src/examples/cpp/console.cpp
+index a673a10..f44c944 100755
+--- a/src/examples/cpp/console.cpp
++++ b/src/examples/cpp/console.cpp
+@@ -23,6 +23,8 @@
+ #include <iostream>
+ #include <locale.h>
+ #include <cstring>
++#include <cstdio>
++#include <stdint.h>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk
new file mode 100644
index 0000000..83afded
--- /dev/null
+++ b/package/log4cxx/log4cxx.mk
@@ -0,0 +1,20 @@
+#############################################################
+#
+# log4cxx
+#
+#############################################################
+
+LOG4CXX_VERSION = 0.10.0
+LOG4CXX_SITE = http://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION)
+LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz
+LOG4CXX_INSTALL_STAGING = YES
+LOG4CXX_LICENSE = Apache-2.0
+LOG4CXX_LICENSE_FILES = LICENSE
+
+LOG4CXX_CONF_OPT = \
+	--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \
+	--with-apr-util=$(STAGING_DIR)/usr/bin/apu-1-config
+
+LOG4CXX_DEPENDENCIES = apr apr-util
+
+$(eval $(autotools-package))
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] [PATCH 9/9] xcursor-transparent-theme: new package
  2013-03-24 18:19 [Buildroot] Misc set of patches, from Patchwork Day Thomas Petazzoni
                   ` (7 preceding siblings ...)
  2013-03-24 18:19 ` [Buildroot] [PATCH 8/9] log4cxx: new package Thomas Petazzoni
@ 2013-03-24 18:19 ` Thomas Petazzoni
  2013-03-24 19:40 ` [Buildroot] Misc set of patches, from Patchwork Day Peter Korsgaard
  9 siblings, 0 replies; 11+ messages in thread
From: Thomas Petazzoni @ 2013-03-24 18:19 UTC (permalink / raw)
  To: buildroot

Based on work originally done by Aleksandar Zivkovic at
http://patchwork.ozlabs.org/patch/171109/.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/x11r7/Config.in                            |    1 +
 package/x11r7/xcursor-transparent-theme/Config.in  |    7 ++++
 .../x11r7/xcursor-transparent-theme/index.theme    |    2 ++
 ...cursor-transparent-theme-0001-fix-symlink.patch |   37 ++++++++++++++++++++
 .../xcursor-transparent-theme.mk                   |   18 ++++++++++
 5 files changed, 65 insertions(+)
 create mode 100644 package/x11r7/xcursor-transparent-theme/Config.in
 create mode 100644 package/x11r7/xcursor-transparent-theme/index.theme
 create mode 100644 package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme-0001-fix-symlink.patch
 create mode 100644 package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 5d0f991..7b32ac7 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -268,6 +268,7 @@ if BR2_PACKAGE_XORG7
 	menu "X11R7 Other data"
 		source package/x11r7/xdata_xbitmaps/Config.in
 		source package/x11r7/xdata_xcursor-themes/Config.in
+		source package/x11r7/xcursor-transparent-theme/Config.in
 		source package/x11r7/xkeyboard-config/Config.in
 	endmenu
 endif
diff --git a/package/x11r7/xcursor-transparent-theme/Config.in b/package/x11r7/xcursor-transparent-theme/Config.in
new file mode 100644
index 0000000..8282db8
--- /dev/null
+++ b/package/x11r7/xcursor-transparent-theme/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XCURSOR_TRANSPARENT_THEME
+	bool "xcursor-transparent-theme"
+	select BR2_PACKAGE_XLIB_LIBXCURSOR
+	help
+	  Completely transparent theme for hiding the X11 cursor.
+
+	  No upstream site.
diff --git a/package/x11r7/xcursor-transparent-theme/index.theme b/package/x11r7/xcursor-transparent-theme/index.theme
new file mode 100644
index 0000000..5300850
--- /dev/null
+++ b/package/x11r7/xcursor-transparent-theme/index.theme
@@ -0,0 +1,2 @@
+[Icon Theme]
+Inherits=xcursor-transparent
diff --git a/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme-0001-fix-symlink.patch b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme-0001-fix-symlink.patch
new file mode 100644
index 0000000..9cf351f
--- /dev/null
+++ b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme-0001-fix-symlink.patch
@@ -0,0 +1,37 @@
+Do not symlink to a host directory
+
+The installation of xcursor-transparent-theme creates many symbolic
+links to the 'transp' cursor file, but it does so using an absolute
+directory, that happens to point to the installation location, which
+is incorrect when cross-compiling.
+
+Also add the -f option so that the package can be reinstalled even if
+it has already been installed.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/cursors/Makefile.am
+===================================================================
+--- a/cursors/Makefile.am
++++ b/cursors/Makefile.am
+@@ -91,6 +91,6 @@
+ 	$(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ 
+ 	for CURSOR in $(CURSOR_NAMES); do \
+ 		echo '-- Installing cursor '$$CURSOR; \
+-		ln -s $(DESTDIR)$(CURSOR_DIR)/transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \
++		ln -sf transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \
+ 	done
+ 
+Index: b/cursors/Makefile.in
+===================================================================
+--- a/cursors/Makefile.in
++++ b/cursors/Makefile.in
+@@ -177,7 +177,7 @@
+ 	$(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ 
+ 	for CURSOR in $(CURSOR_NAMES); do \
+ 		echo '-- Installing cursor '$$CURSOR; \
+-		ln -s $(DESTDIR)$(CURSOR_DIR)/transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \
++		ln -sf transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \
+ 	done
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
new file mode 100644
index 0000000..3ad985b
--- /dev/null
+++ b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# xcursor-transparent-theme - No description available
+#
+#############################################################
+
+XCURSOR_TRANSPARENT_THEME_VERSION = 0.1.1
+XCURSOR_TRANSPARENT_THEME_SITE = http://downloads.yoctoproject.org/releases/matchbox/utils/
+XCURSOR_TRANSPARENT_THEME_DEPENDENCIES = xlib_libXcursor host-xapp_xcursorgen
+
+define ICONS_DEFAULT_CONFIG_INSTALL
+        $(INSTALL) -m 0755 -D package/x11r7/xcursor-transparent-theme/index.theme \
+		$(TARGET_DIR)/usr/share/icons/default/index.theme
+endef
+
+XCURSOR_TRANSPARENT_THEME_POST_INSTALL_TARGET_HOOKS += ICONS_DEFAULT_CONFIG_INSTALL
+
+$(eval $(autotools-package))
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Buildroot] Misc set of patches, from Patchwork Day
  2013-03-24 18:19 [Buildroot] Misc set of patches, from Patchwork Day Thomas Petazzoni
                   ` (8 preceding siblings ...)
  2013-03-24 18:19 ` [Buildroot] [PATCH 9/9] xcursor-transparent-theme: " Thomas Petazzoni
@ 2013-03-24 19:40 ` Peter Korsgaard
  9 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2013-03-24 19:40 UTC (permalink / raw)
  To: buildroot

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

 Thomas> Hello,

 Thomas> Here is a set of misc patches, accumulated during this
 Thomas> Patchwork Day. I took patches from the patchwork, updated them,
 Thomas> fixed them, and I'm now submitting them for inclusion.

Committed series, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2013-03-24 19:40 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-24 18:19 [Buildroot] Misc set of patches, from Patchwork Day Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 1/9] rt-tests: mention that NPTL thread implementation is needed Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 2/9] dtach: new package Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 3/9] gd: add patch to fix gdlib-config script Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 4/9] gnuplot: new package Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 5/9] neon: add license informations Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 6/9] apr: various improvements Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 7/9] apr-util: " Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 8/9] log4cxx: new package Thomas Petazzoni
2013-03-24 18:19 ` [Buildroot] [PATCH 9/9] xcursor-transparent-theme: " Thomas Petazzoni
2013-03-24 19:40 ` [Buildroot] Misc set of patches, from Patchwork Day Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.