* [Buildroot] [PATCH 23/33] scons: add license info
From: Samuel Martin @ 2012-11-22 0:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/scons/scons.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index 45f2e1e..92cfe93 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -1,6 +1,9 @@
SCONS_VERSION = 2.0.1
SCONS_SOURCE = scons-$(SCONS_VERSION).tar.gz
SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION)
+SCONS_LICENSE = MIT
+SCONS_LICENSE_FILES = LICENSE.txt
+
HOST_SCONS_DEPENDENCIES = $(NEED_PYTHON2)
define HOST_SCONS_BUILD_CMDS
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 22/33] libmad: add license info
From: Samuel Martin @ 2012-11-22 0:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/libmad/libmad.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index 6999b66..1ce52ec 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -8,6 +8,8 @@ LIBMAD_VERSION = 0.15.1b
LIBMAD_SITE = http://downloads.sourceforge.net/project/mad/libmad/$(LIBMAD_VERSION)
LIBMAD_INSTALL_STAGING = YES
LIBMAD_LIBTOOL_PATCH = NO
+LIBMAD_LICENSE = GPLv2
+LIBMAD_LICENSE_FILES = COPYING
define LIBMAD_PREVENT_AUTOMAKE
# Prevent automake from running.
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 21/33] rrdtool: add python binding support
From: Samuel Martin @ 2012-11-22 0:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/rrdtool/Config.in | 8 +++++++
package/rrdtool/rrdtool-fix-python-includes.patch | 29 +++++++++++++++++++++++
package/rrdtool/rrdtool.mk | 19 +++++++++++++--
3 files changed, 54 insertions(+), 2 deletions(-)
create mode 100644 package/rrdtool/rrdtool-fix-python-includes.patch
diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in
index d315b57..ed3f71e 100644
--- a/package/rrdtool/Config.in
+++ b/package/rrdtool/Config.in
@@ -11,5 +11,13 @@ config BR2_PACKAGE_RRDTOOL
http://oss.oetiker.ch/rrdtool/
+if BR2_PACKAGE_RRDTOOL
+
+config BR2_PACKAGE_RRDTOOL_PYTHON
+ bool "Python bindings"
+ depends on BR2_PACKAGE_PYTHON
+
+endif
+
comment "rrdtool requires a toolchain with WCHAR support"
depends on !BR2_USE_WCHAR
diff --git a/package/rrdtool/rrdtool-fix-python-includes.patch b/package/rrdtool/rrdtool-fix-python-includes.patch
new file mode 100644
index 0000000..07ff3df
--- /dev/null
+++ b/package/rrdtool/rrdtool-fix-python-includes.patch
@@ -0,0 +1,29 @@
+Allow to override the python include directories.
+When cross-compiling python extensions, python headers must be taken from the
+staging directory, not the host one.
+
+This patch avoids to run into some weird, ununderstable error about LONG_BIT
+definition, especially when the build and the target machine have different
+bitwises.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+--- rrdtool-1.2.30.orig/acinclude.m4 2012-11-17 11:33:40.194321803 +0100
++++ rrdtool-1.2.30/acinclude.m4 2012-11-17 12:18:12.490326127 +0100
+@@ -467,9 +467,13 @@ AC_MSG_CHECKING(for headers required to
+ dnl deduce PYTHON_INCLUDES
+ py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+ py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+-if test "$py_prefix" != "$py_exec_prefix"; then
+- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++if test "x$am_cv_python_includes" = "x" ; then
++ PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
++ if test "$py_prefix" != "$py_exec_prefix"; then
++ PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++ fi
++else
++ PYTHON_INCLUDES="-I${am_cv_python_includes}"
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
index 7521aba..8799a85 100644
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@@ -11,8 +11,23 @@ RRDTOOL_AUTORECONF = YES
RRDTOOL_INSTALL_STAGING = YES
RRDTOOL_CONF_ENV = rd_cv_ieee_works=yes rd_cv_null_realloc=nope \
ac_cv_func_mmap_fixed_mapped=yes
-RRDTOOL_CONF_OPT = --disable-perl --disable-python --disable-ruby \
- --disable-tcl --program-transform-name=''
+RRDTOOL_CONF_OPT = --program-transform-name='' \
+ --disable-perl \
+ --disable-ruby \
+ --disable-tcl \
+
+ifneq ($(BR2_PACKAGE_RRDTOOL_PYTHON),)
+RRDTOOL_CONF_OPT += --enable-python
+RRDTOOL_CONF_ENV += \
+ am_cv_pathless_PYTHON=python \
+ ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python \
+ am_cv_python_platform=linux2 \
+ am_cv_python_includes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
+RRDTOOL_DEPENDENCIES += python
+else
+RRDTOOL_CONF_OPT += --disable-python
+endif
+
RRDTOOL_MAKE = $(MAKE1)
define RRDTOOL_REMOVE_EXAMPLES
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 20/33] pkg-download.mk: add tarball check in the wget method
From: Samuel Martin @ 2012-11-22 0:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
In case of wrong package source url, the retrieved file is a html page;
this lead to a build failure at the extraction time.
So, in case of tarballs, check the file type of the downloaded material
and remove the temporary file if it is wrong.
As a side effect of this, if the source location has changed since the
package integration in Buildroot, the download will fall back on the
Buildroot backup site.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/pkg-download.mk | 13 +++++++++++--
support/dependencies/dependencies.sh | 2 +-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 6c57244..5e99d7d 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -175,8 +175,17 @@ endef
# the next time the download is tried.
define DOWNLOAD_WGET
test -e $(DL_DIR)/$(2) || \
- ($(WGET) -O $(DL_DIR)/$(2).tmp '$(call qstrip,$(1))' && \
- mv $(DL_DIR)/$(2).tmp $(DL_DIR)/$(2)) || \
+ (($(WGET) -O $(DL_DIR)/$(2).tmp '$(call qstrip,$(1))' ; \
+ case "$(2)" in \
+ *.bz2|*.gz|*.tbz|*.tbz2|*.tgz|*.xz|*.tar) \
+ file $(DL_DIR)/$(2).tmp | grep -q 'HTML\ document' && \
+ (rm -f $(DL_DIR)/$(2).tmp ; \
+ echo "error: Cannot retrieve $(2) from '$(call qstrip,$(1))'." ; \
+ echo "error: Wrong package URL: $(call qstrip,$(1))") || \
+ exit 0 ;; \
+ *) exit 0 ;; \
+ esac) && \
+ mv $(DL_DIR)/$(2).tmp $(DL_DIR)/$(2)) || \
(rm -f $(DL_DIR)/$(2).tmp ; exit 1)
endef
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 9f0f6a9..651fc51 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -131,7 +131,7 @@ if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then
fi;
# Check that a few mandatory programs are installed
-for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio python unzip rsync ${DL_TOOLS} ; do
+for prog in awk bison file flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio python unzip rsync ${DL_TOOLS} ; do
if ! which $prog > /dev/null ; then
/bin/echo -e "\nYou must install '$prog' on your build machine";
if test $prog = "makeinfo" ; then
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 19/33] python2: bump to 2.7.3
From: Samuel Martin @ 2012-11-22 0:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Pyhton 2.7.3 includes several security fixes.
See: http://www.python.org/download/releases/2.7.3/
Also fixes the patch making sqlite optional.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/python/python-2.7-009-python-symlink.patch | 25 -----------------
.../python-2.7-100-optional-test-modules.patch | 3 ++-
package/python/python-2.7-101-optional-pydoc.patch | 3 ++-
package/python/python-2.7-102-optional-2to3.patch | 12 +++------
.../python/python-2.7-103-optional-sqlite.patch | 31 +++++++++++++++++++++-
package/python/python-2.7-104-optional-tk.patch | 3 ++-
.../python/python-2.7-105-optional-curses.patch | 3 ++-
package/python/python-2.7-106-optional-expat.patch | 3 ++-
package/python/python-2.7-110-optional-db.patch | 7 ++---
package/python/python.mk | 2 +-
10 files changed, 48 insertions(+), 44 deletions(-)
delete mode 100644 package/python/python-2.7-009-python-symlink.patch
diff --git a/package/python/python-2.7-009-python-symlink.patch b/package/python/python-2.7-009-python-symlink.patch
deleted file mode 100644
index 1b1d0c8..0000000
--- a/package/python/python-2.7-009-python-symlink.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Use a symlink between python and pythonVERSION
-
-By default, a hard link is used between /usr/bin/python and
-/usr/bin/pythonVERSION. Using hard links for such things is fairly
-uncommon, so let's make a symbolic link instead.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
----
- Makefile.pre.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: Python-2.7.2/Makefile.pre.in
-===================================================================
---- Python-2.7.2.orig/Makefile.pre.in
-+++ Python-2.7.2/Makefile.pre.in
-@@ -796,7 +796,7 @@
- then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
- else true; \
- fi
-- (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
-+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) $(PYTHON))
- -rm -f $(DESTDIR)$(BINDIR)/python-config
- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config)
- -test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC)
diff --git a/package/python/python-2.7-100-optional-test-modules.patch b/package/python/python-2.7-100-optional-test-modules.patch
index fc49d52..a988717 100644
--- a/package/python/python-2.7-100-optional-test-modules.patch
+++ b/package/python/python-2.7-100-optional-test-modules.patch
@@ -4,6 +4,7 @@ The Python standard distribution comes with many test modules, that
are not necessarly useful on embedded targets.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Makefile.pre.in | 40 +++++++++++++++++++++++++++-------------
@@ -55,7 +56,7 @@ Index: Python-2.7.2/Makefile.pre.in
+ ctypes/test distutils/tests unittest/test
+endif
+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-101-optional-pydoc.patch b/package/python/python-2.7-101-optional-pydoc.patch
index 195abcc..ccc937b 100644
--- a/package/python/python-2.7-101-optional-pydoc.patch
+++ b/package/python/python-2.7-101-optional-pydoc.patch
@@ -4,6 +4,7 @@ It removes 0.5 MB of data from the target plus the pydoc script
itself.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Makefile.pre.in | 6 +++++-
@@ -32,7 +33,7 @@ Index: Python-2.7.2/Makefile.pre.in
+LIBSUBDIRS += pydoc_data
+endif
+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-102-optional-2to3.patch b/package/python/python-2.7-102-optional-2to3.patch
index 1e04540..0321619 100644
--- a/package/python/python-2.7-102-optional-2to3.patch
+++ b/package/python/python-2.7-102-optional-2to3.patch
@@ -4,6 +4,7 @@ lib2to3 is a library to convert Python 2.x code to Python 3.x. As
such, it is probably not very useful on embedded system targets.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Makefile.pre.in | 24 +++++++++++++++++-------
@@ -33,7 +34,7 @@ Index: Python-2.7.2/Makefile.pre.in
ctypes/test distutils/tests unittest/test
endif
-@@ -884,6 +882,23 @@
+@@ -884,6 +882,16 @@
LIBSUBDIRS += pydoc_data
endif
@@ -47,14 +48,7 @@ Index: Python-2.7.2/Makefile.pre.in
+endif
+endif
+
-+ifeq (@SQLITE3@,yes)
-+LIBSUBDIRS += sqlite3
-+ifeq (@TEST_MODULES@,yes)
-+LIBSUBDIRS += sqlite3/test
-+endif
-+endif
-+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-103-optional-sqlite.patch b/package/python/python-2.7-103-optional-sqlite.patch
index 4172bae..a915c55 100644
--- a/package/python/python-2.7-103-optional-sqlite.patch
+++ b/package/python/python-2.7-103-optional-sqlite.patch
@@ -1,10 +1,12 @@
Add option to disable the sqlite3 module
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
+ Makefile.pre.in | 24 +++++++++++++++++-------
configure.in | 9 +++++++++
- 1 file changed, 9 insertions(+)
+ 2 file changed, 9 insertions(+)
Index: Python-2.7.2/configure.in
===================================================================
@@ -26,3 +28,30 @@ Index: Python-2.7.2/configure.in
AC_SUBST(PYDOC)
AC_ARG_ENABLE(pydoc,
+Index: Python-2.7.2/Makefile.pre.in
+===================================================================
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -875,7 +874,7 @@
+ lib-tk/test/test_ttk test test/data \
+ test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
+ test/tracedmodules email/test email/test/data \
+- json/tests sqlite3/test bsddb/test \
++ json/tests bsddb/test \
+ ctypes/test distutils/tests unittest/test
+ endif
+
+@@ -884,6 +882,13 @@
+ LIBSUBDIRS += pydoc_data
+ endif
+
++ifeq (@SQLITE3@,yes)
++LIBSUBDIRS += sqlite3
++ifeq (@TEST_MODULES@,yes)
++LIBSUBDIRS += sqlite3/test
++endif
++endif
++
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ @for i in $(SCRIPTDIR) $(LIBDEST); \
+ do \
diff --git a/package/python/python-2.7-104-optional-tk.patch b/package/python/python-2.7-104-optional-tk.patch
index 12f1236..9333e33 100644
--- a/package/python/python-2.7-104-optional-tk.patch
+++ b/package/python/python-2.7-104-optional-tk.patch
@@ -1,6 +1,7 @@
Add an option to disable the tk module
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Makefile.pre.in | 14 ++++++++++----
@@ -42,7 +43,7 @@ Index: Python-2.7.2/Makefile.pre.in
+endif
+endif
+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-105-optional-curses.patch b/package/python/python-2.7-105-optional-curses.patch
index e3705cb..7f8da7c 100644
--- a/package/python/python-2.7-105-optional-curses.patch
+++ b/package/python/python-2.7-105-optional-curses.patch
@@ -1,6 +1,7 @@
Add an option to disable the curses module
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Makefile.pre.in | 6 +++++-
@@ -28,7 +29,7 @@ Index: Python-2.7.2/Makefile.pre.in
+LIBSUBDIRS += curses
+endif
+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-106-optional-expat.patch b/package/python/python-2.7-106-optional-expat.patch
index be1b4a3..2d8ae74 100644
--- a/package/python/python-2.7-106-optional-expat.patch
+++ b/package/python/python-2.7-106-optional-expat.patch
@@ -7,6 +7,7 @@ builtin the Python sources, or no expat at all (which disables the
installation of XML modules).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Makefile.pre.in | 6 +++++-
@@ -35,7 +36,7 @@ Index: Python-2.7.2/Makefile.pre.in
+LIBSUBDIRS += $(XMLLIBSUBDIRS)
+endif
+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-110-optional-db.patch b/package/python/python-2.7-110-optional-db.patch
index 0d5ee0c..b32eea9 100644
--- a/package/python/python-2.7-110-optional-db.patch
+++ b/package/python/python-2.7-110-optional-db.patch
@@ -5,6 +5,7 @@ able to build Python without it, this patch adds an option to disable
the build/installation of this Python module.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Makefile.pre.in | 10 ++++++++--
@@ -28,8 +29,8 @@ Index: Python-2.7.2/Makefile.pre.in
LIBSUBDIRS += test test/data \
test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
test/tracedmodules email/test email/test/data \
-- json/tests sqlite3/test bsddb/test \
-+ json/tests sqlite3/test \
+- json/tests bsddb/test \
++ json/tests \
ctypes/test distutils/tests unittest/test
endif
@@ -44,7 +45,7 @@ Index: Python-2.7.2/Makefile.pre.in
+endif
+endif
+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
Index: Python-2.7.2/configure.in
diff --git a/package/python/python.mk b/package/python/python.mk
index e0ec9bb..6e960cd 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -4,7 +4,7 @@
#
#############################################################
PYTHON_VERSION_MAJOR = 2.7
-PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).2
+PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).3
PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.bz2
PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION)
PYTHON_LICENSE = Python software foundation license v2, others
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 18/33] linux-fusion: bump to version 8.10.4
From: Samuel Martin @ 2012-11-22 0:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Also fix directfb build avoiding the following error to occur
(since FCEF_FOLLOW has been added in linux-fusion-8.9.0):
libtool: compile: /opt/br/output/host/usr/bin/ccache /opt/br/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../lib -I../../include -I../../lib -DDATADIR=\"/usr/share/directfb-1.4.17\" -DMODULEDIR=\"/usr/lib/directfb-1.4-6\" -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -ffast-math -pipe -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -Os -g2 -g3 -fno-inline -Wno-inline -D_GNU_SOURCE -finstrument-functions -std=gnu99 -Werror-implicit-function-declaration -MT call.lo -MD -MP -MF .deps/call.Tpo -c call.c -fPIC -DPIC -o .libs/call.o
call.c: In function 'fusion_call_execute3':
call.c:311:66: error 'FCEF_FOLLOW' undeclared (first use in this function)
call.c:311:66: note: each undeclared identifier is reported only once for each function it appears in
call.c: In function 'fusion_world_flush_calls':
call.c:444:54: error 'FCEF_FOLLOW' undeclared (first use in this function)
make[5]: *** [call.lo] Error 1
make[5]: Leaving directory `/opt/br/output/build/directfb-1.4.17/lib/fusion'
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/linux-fusion/linux-fusion.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index feb1ab3..631f526 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -3,7 +3,7 @@
# linux-fusion
#
#############################################################
-LINUX_FUSION_VERSION = 8.8.1
+LINUX_FUSION_VERSION = 8.10.4
LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz
LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
LINUX_FUSION_INSTALL_STAGING = YES
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 17/33] matchbox packages: fix broken urls
From: Samuel Martin @ 2012-11-22 0:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/matchbox/matchbox-common/matchbox-common.mk | 6 +++---
package/matchbox/matchbox-desktop/matchbox-desktop.mk | 5 +++--
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 2 +-
package/matchbox/matchbox-lib/matchbox-lib.mk | 2 +-
package/matchbox/matchbox-panel/matchbox-panel.mk | 6 +++---
package/matchbox/matchbox-wm/matchbox-wm.mk | 2 +-
6 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
index 2e3cdff..993590c 100644
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox/matchbox-common/matchbox-common.mk
@@ -3,10 +3,10 @@
# MatchBox Common
#
#############################################################
-
-MATCHBOX_COMMON_VERSION = 0.9.1
+MATCHBOX_COMMON_VERSION_MAJOR = 0.9
+MATCHBOX_COMMON_VERSION = $(MATCHBOX_COMMON_VERSION_MAJOR).1
MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2
-MATCHBOX_COMMON_SITE = http://matchbox-project.org/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION)
+MATCHBOX_COMMON_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR)
MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib
ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y)
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
index 5c518e5..c5f5b0d 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -4,9 +4,10 @@
#
#############################################################
-MATCHBOX_DESKTOP_VERSION = 0.9.1
+MATCHBOX_DESKTOP_VERSION_MAJOR = 0.9
+MATCHBOX_DESKTOP_VERSION = $(MATCHBOX_DESKTOP_VERSION_MAJOR).1
MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2
-MATCHBOX_DESKTOP_SITE = http://matchbox-project.org/sources/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION)
+MATCHBOX_DESKTOP_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION_MAJOR)
MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib
MATCHBOX_DESKTOP_CONF_OPT = --enable-expat
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
index c6e9496..2da8dfa 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -6,7 +6,7 @@
MATCHBOX_KEYBOARD_VERSION = 0.1
MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz2
-MATCHBOX_KEYBOARD_SITE = http://matchbox-project.org/sources/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
+MATCHBOX_KEYBOARD_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey
# Workaround bug in configure script
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index de11dfc..c9d7600 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -6,7 +6,7 @@
MATCHBOX_LIB_VERSION = 1.9
MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2
-MATCHBOX_LIB_SITE = http://matchbox-project.org/sources/libmatchbox/$(MATCHBOX_LIB_VERSION)
+MATCHBOX_LIB_SITE = http://projects.o-hand.com/matchbox/sources/libmatchbox/$(MATCHBOX_LIB_VERSION)
MATCHBOX_LIB_INSTALL_STAGING = YES
MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
MATCHBOX_LIB_CONF_OPT = --enable-expat --disable-doxygen-docs
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index db9d1a8..e216fed 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -3,10 +3,10 @@
# MatchBox Panel
#
#############################################################
-
-MATCHBOX_PANEL_VERSION = 0.9.3
+MATCHBOX_PANEL_VERSION_MAJOR = 0.9
+MATCHBOX_PANEL_VERSION = $(MATCHBOX_PANEL_VERSION_MAJOR).3
MATCHBOX_PANEL_SOURCE = matchbox-panel-$(MATCHBOX_PANEL_VERSION).tar.bz2
-MATCHBOX_PANEL_SITE = http://matchbox-project.org/sources/matchbox-panel/$(MATCHBOX_PANEL_VERSION)
+MATCHBOX_PANEL_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-panel/$(MATCHBOX_PANEL_VERSION_MAJOR)
MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib
MATCHBOX_PANEL_CONF_OPT = --enable-expat
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
index ece8866..1a07a58 100644
--- a/package/matchbox/matchbox-wm/matchbox-wm.mk
+++ b/package/matchbox/matchbox-wm/matchbox-wm.mk
@@ -6,7 +6,7 @@
MATCHBOX_WM_VERSION = 1.2
MATCHBOX_WM_SOURCE = matchbox-window-manager-$(MATCHBOX_WM_VERSION).tar.bz2
-MATCHBOX_WM_SITE = http://matchbox-project.org/sources/matchbox-window-manager/$(MATCHBOX_WM_VERSION)
+MATCHBOX_WM_SITE = http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/$(MATCHBOX_WM_VERSION)
MATCHBOX_WM_DEPENDENCIES = matchbox-lib
MATCHBOX_WM_CONF_OPT = --enable-expat
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 16/33] libmad: do not install mad.pc on the target
From: Samuel Martin @ 2012-11-22 0:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/libmad/libmad.mk | 6 ------
1 file changed, 6 deletions(-)
diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index d9ce0ae..6999b66 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -19,14 +19,8 @@ define LIBMAD_INSTALL_STAGING_PC
$(STAGING_DIR)/usr/lib/pkgconfig/mad.pc
endef
-define LIBMAD_INSTALL_TARGET_PC
- $(INSTALL) -D package/libmad/mad.pc \
- $(TARGET_DIR)/usr/lib/pkgconfig/mad.pc
-endef
-
LIBMAD_POST_PATCH_HOOKS += LIBMAD_PREVENT_AUTOMAKE
LIBMAD_POST_INSTALL_STAGING_HOOKS += LIBMAD_INSTALL_STAGING_PC
-LIBMAD_POST_INSTALL_TARGET_HOOKS += LIBMAD_INSTALL_TARGET_PC
LIBMAD_CONF_OPT = \
--disable-debugging \
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 15/33] scons: force to use python2 on the host
From: Samuel Martin @ 2012-11-22 0:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Scons is not yet python2/python3 compliant.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/scons/scons.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index 7cc234e..45f2e1e 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -1,13 +1,14 @@
SCONS_VERSION = 2.0.1
SCONS_SOURCE = scons-$(SCONS_VERSION).tar.gz
SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION)
+HOST_SCONS_DEPENDENCIES = $(NEED_PYTHON2)
define HOST_SCONS_BUILD_CMDS
- (cd $(@D); python setup.py build)
+ (cd $(@D); $(PYTHON2) setup.py build)
endef
define HOST_SCONS_INSTALL_CMDS
- (cd $(@D); python setup.py install --prefix=$(HOST_DIR)/usr \
+ (cd $(@D); $(PYTHON2) setup.py install --prefix=$(HOST_DIR)/usr \
--install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION))
endef
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 14/33] dependencies: build a host python2 if no suitable one can be found
From: Samuel Martin @ 2012-11-22 0:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Some distros choose to change the /usr/bin/python binary, making it pointed
to python3 instead of python2.
This may have some bad consequences for packages that uses some
non-python3-compliant python scripts in their build system (eg. in install
or post-install scripts).
This patch checks for a suitable python2 version (2.6 or 2.7) on the host
system, and declares the following variables:
- PYTHON2: pointing to the host python2 binary;
- NEED_PYTHON2: sets to "host-python" if no python2 binary has been found.
This way, a package using some python2 scripts must:
- adds $(NEED_PYTHON2) to its dependency list;
- sets $(PYTHON2) as the python binary to be used.
A side effect of this patch is getting rid of any host python. Buildroot
can runs on a host without python, or with a too old python2 version, or
with only python3; in such case, $(NEED_PYTHON2) should be added to the
dependency list. So, we can get rid of the python dependency check.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
support/dependencies/check-host-python2.mk | 6 ++++++
support/dependencies/check-host-python2.sh | 13 +++++++++++++
2 files changed, 19 insertions(+)
create mode 100644 support/dependencies/check-host-python2.mk
create mode 100755 support/dependencies/check-host-python2.sh
diff --git a/support/dependencies/check-host-python2.mk b/support/dependencies/check-host-python2.mk
new file mode 100644
index 0000000..ddae701
--- /dev/null
+++ b/support/dependencies/check-host-python2.mk
@@ -0,0 +1,6 @@
+PYTHON2 = $(call suitable-host-package,python2)
+
+ifeq ($(PYTHON2),)
+ NEED_PYTHON2 = host-python
+ PYTHON2 = $(HOST_DIR)/usr/bin/python
+endif
diff --git a/support/dependencies/check-host-python2.sh b/support/dependencies/check-host-python2.sh
new file mode 100755
index 0000000..6ad4b3a
--- /dev/null
+++ b/support/dependencies/check-host-python2.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+candidates="python python2"
+
+for candidate in ${candidates} ; do
+ which ${candidate} &>/dev/null || continue
+ # restrict version of python2 to 2.6 or 2.7
+ if ${candidate} --version 2>&1 | grep -q 'Python 2\.[6-7].*' ; then
+ # found a valid candidate, so quit now
+ echo $(which ${candidate})
+ exit
+ fi
+done
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 13/33] sconeserver: fix imagemagick dependency
From: Samuel Martin @ 2012-11-22 0:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
* only depends on imagemagick when C++ support is enable
* use 'pkg-config Magick++' instead of Magick++-config
Fixes:
http://autobuild.buildroot.net/results/e8a71a731dafb2eaee0454b5b1a51cd6de4ecdc6/build-end.log
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/sconeserver/Config.in | 3 ++
...-dependency-use-pkg-config-instead-of-Mag.patch | 41 ++++++++++++++++++++++
package/sconeserver/sconeserver.mk | 2 +-
3 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 package/sconeserver/sconeserver-180-ImageMagick-dependency-use-pkg-config-instead-of-Mag.patch
diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in
index a7e5c75..74722a0 100644
--- a/package/sconeserver/Config.in
+++ b/package/sconeserver/Config.in
@@ -26,6 +26,9 @@ config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE
config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE
bool "http::sconesite::image"
depends on BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE
+ # sconesite-image requires Magick++.h which is only available if
+ # C++ compiler is working.
+ depends on BR2_INSTALL_LIBSTDCPP
select BR2_PACKAGE_IMAGEMAGICK
help
http::sconesite::image module for Sconeserver
diff --git a/package/sconeserver/sconeserver-180-ImageMagick-dependency-use-pkg-config-instead-of-Mag.patch b/package/sconeserver/sconeserver-180-ImageMagick-dependency-use-pkg-config-instead-of-Mag.patch
new file mode 100644
index 0000000..58298c8
--- /dev/null
+++ b/package/sconeserver/sconeserver-180-ImageMagick-dependency-use-pkg-config-instead-of-Mag.patch
@@ -0,0 +1,41 @@
+From 278cacf17370756a1d620ffa8898c889051d19bf Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Sat, 17 Nov 2012 18:18:17 +0100
+Subject: [PATCH 1/1] ImageMagick dependency: use pkg-config instead of
+ Magick++-config
+
+Magick++-config is nothing more than a wrapper using pkg-config.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ configure.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 241e66b..936130f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -185,7 +185,7 @@ fi
+
+ # Look for ImageMagick settings
+ AC_CHECK_LIB([Magick++],[InitializeMagick],
+- [CPPFLAGS="$CPPFLAGS `Magick++-config --cppflags`"],,
++ [CPPFLAGS="$CPPFLAGS `pkg-config Magick++ --cflags`"],,
+ )
+
+ # Sconesite:image module
+@@ -202,9 +202,9 @@ if test "x$SCONESITE_IMAGE" == "xyes"; then
+ if test "x$ac_cv_lib_Magickpp_InitializeMagick" != "xyes"; then
+ AC_MSG_ERROR([library 'Magick++' is required for Sconesite:image])
+ fi
+- SCONESITE_IMAGE_LIBADD=`Magick++-config --libs`
++ SCONESITE_IMAGE_LIBADD=`pkg-config Magick++ --libs`
+ AC_SUBST(SCONESITE_IMAGE_LIBADD)
+- SCONESITE_IMAGE_LDFLAGS=`Magick++-config --ldflags`
++ SCONESITE_IMAGE_LDFLAGS=`pkg-config Magick++ --libs`
+ AC_SUBST(SCONESITE_IMAGE_LDFLAGS)
+ fi
+
+--
+1.8.0
+
diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
index d6c9639..aa5688a 100644
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -53,7 +53,7 @@ else
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE),y)
- SCONESERVER_DEPENDENCIES += imagemagick
+ SCONESERVER_DEPENDENCIES += imagemagick host-pkgconf
SCONESERVER_CONF_OPT += --with-sconesite-image
else
SCONESERVER_CONF_OPT += --without-sconesite-image
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 12/33] sconeserver: fix configure.in
From: Samuel Martin @ 2012-11-22 0:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Prevent from having '-I/usr/include/mysql' appended to the cflags during
the configuration phase.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
...n-do-not-hardcode-mysql-include-directory.patch | 27 ++++++++++++++++++++++
package/sconeserver/sconeserver.mk | 2 ++
2 files changed, 29 insertions(+)
create mode 100644 package/sconeserver/sconeserver-180-configure.in-do-not-hardcode-mysql-include-directory.patch
diff --git a/package/sconeserver/sconeserver-180-configure.in-do-not-hardcode-mysql-include-directory.patch b/package/sconeserver/sconeserver-180-configure.in-do-not-hardcode-mysql-include-directory.patch
new file mode 100644
index 0000000..9388d21
--- /dev/null
+++ b/package/sconeserver/sconeserver-180-configure.in-do-not-hardcode-mysql-include-directory.patch
@@ -0,0 +1,27 @@
+From 79aafd560037537baba3f08e9ed15a2b926a16de Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Sat, 17 Nov 2012 20:18:51 +0100
+Subject: [PATCH 1/1] configure.in: do not hardcode mysql include directory
+
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 936130f..bc15ef2 100644
+--- a/configure.in
++++ b/configure.in
+@@ -234,7 +234,7 @@ AC_ARG_WITH([mysql],
+ # Need mysqlclient library for mysql
+ if test "x$MYSQL" == "xyes"; then
+ AC_CHECK_LIB([mysqlclient],[mysql_init],
+- [CXXFLAGS="$CXXFLAGS -I/usr/include/mysql"
++ [CXXFLAGS="$CXXFLAGS"
+ MYSQL_LIBADD="-lmysqlclient"
+ AC_SUBST(MYSQL_LIBADD)],
+ [AC_MSG_ERROR([library 'mysqlclient' is required for the mysql module])]
+--
+1.8.0
+
diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
index 15a1edc..d6c9639 100644
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -13,6 +13,8 @@ SCONESERVER_SITE_METHOD = svn
SCONESERVER_LICENSE = GPLv2+
SCONESERVER_LICENSE_FILES = COPYING
+SCONESERVER_AUTORECONF = YES
+
SCONESERVER_DEPENDENCIES += pcre
SCONESERVER_CONF_OPT += --with-ip --with-local
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 11/33] ltp-testsuite: fix build on uClibc exp10
From: Samuel Martin @ 2012-11-22 0:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
...tsuite-20101031-fix-build-on-uClibc-exp10.patch | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch
diff --git a/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch b/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch
new file mode 100644
index 0000000..7a02d95
--- /dev/null
+++ b/package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch
@@ -0,0 +1,22 @@
+Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch
+
+exp10 extension is not part of uClibc, so compute it.
+
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+diff -purN ltp-testsuite-20101031.orig/testcases/realtime/lib/libstats.c ltp-testsuite-20101031/testcases/realtime/lib/libstats.c
+--- ltp-testsuite-20101031.orig/testcases/realtime/lib/libstats.c 2012-10-22 23:19:02.306646174 +0200
++++ ltp-testsuite-20101031/testcases/realtime/lib/libstats.c 2012-10-22 23:25:41.554847766 +0200
+@@ -46,6 +46,11 @@
+ #include <libstats.h>
+ #include <librttest.h>
+
++#ifdef __UCLIBC__
++/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
++#define exp10(x) (exp((x) * log(10)))
++#endif /* __UCLIBC__ */
++
+ int save_stats = 0;
+
+ /* static helper functions */
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 10/33] ltp-testsuite: add warning about bessel function support if uclibc toolchain
From: Samuel Martin @ 2012-11-22 0:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/ltp-testsuite/Config.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
index 86aa4fb..30ba70f 100644
--- a/package/ltp-testsuite/Config.in
+++ b/package/ltp-testsuite/Config.in
@@ -1,3 +1,7 @@
+comment "Note that ltp-testsuite needs a uclibc toolchain with DO_XSI_MATH (bessel functions) enabled"
+ depends on BR2_PACKAGE_LTP_TESTSUITE
+ depends on BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_EXTERNAL_UCLIBC || BR2_TOOLCHAIN_CTNG_uClibc
+
config BR2_PACKAGE_LTP_TESTSUITE
bool "ltp-testsuite"
depends on BR2_TOOLCHAIN_HAS_THREADS
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 09/33] linux-fusion: fix build
From: Samuel Martin @ 2012-11-22 0:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
.../linux-fusion/linux-fusion-fix-include.patch | 52 ++++++++++++++++++++++
1 file changed, 52 insertions(+)
create mode 100644 package/linux-fusion/linux-fusion-fix-include.patch
diff --git a/package/linux-fusion/linux-fusion-fix-include.patch b/package/linux-fusion/linux-fusion-fix-include.patch
new file mode 100644
index 0000000..fe91488
--- /dev/null
+++ b/package/linux-fusion/linux-fusion-fix-include.patch
@@ -0,0 +1,52 @@
+Fix directfb-fusion kernel module build.
+
+This patch avoids the following error occurs:
+
+/usr/bin/make -f scripts/Makefile.build obj=/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion /opt/br/output/host/usr/bin/ccache
+ /opt/br/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -Wp,-MD,/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/.fusioncore_impl.o.d
+ -nostdinc -isystem /opt/br/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.6.3/include -I/opt/br/output/build/linux-3.6/arch/arm/include
+ -Iarch/arm/include/generated -Iinclude -include /opt/br/output/build/linux-3.6/include/linux/kconfig.h -D__KERNEL__ -mlittle-endian -Iarch/arm/mach-versatile/include
+ -Iarch/arm/plat-versatile/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/opt/br/output/build/linux-fusion-8.8.1/linux/include -Wall -Wundef
+ -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration -Wno-format-security -fno-delete-null-pointer-checks -O2 -marm
+ -fno-dwarf2-cfi-asm -mabi=aapcs-linux -mno-thumb-interwork -funwind-tables -D__LINUX_ARM_ARCH__=5 -march=armv5te -mtune=arm9tdmi -msoft-float -Uarm -Wframe-larger-than=1024
+ -fno-stack-protector -Wno-unused-but-set-variable -fomit-frame-pointer -Wdeclaration-after-statement -Wno-pointer-sign -fno-strict-overflow -fconserve-stack -DMODULE
+ -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(fusioncore_impl)" -D"KBUILD_MODNAME=KBUILD_STR(fusion)" -c -o
+/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.o /opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c
+/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c:25:19: fatal error: debug.h: No such file or directory
+compilation terminated.
+make[3]: *** [/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.o] Error 1
+make[2]: *** [_module_/opt/br/output/build/linux-fusion-8.8.1/linux/drivers/char/fusion] Error 2
+make[2]: Leaving directory `/opt/br/output/build/linux-3.6'
+make[1]: *** [modules] Error 2
+make[1]: Leaving directory `/opt/br/output/build/linux-fusion-8.8.1'
+
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+diff -purN linux-fusion-8.8.1.orig/linux/drivers/char/fusion/fusioncore.h linux-fusion-8.8.1/linux/drivers/char/fusion/fusioncore.h
+--- linux-fusion-8.8.1.orig/linux/drivers/char/fusion/fusioncore.h 2012-10-15 21:47:53.881834496 +0200
++++ linux-fusion-8.8.1/linux/drivers/char/fusion/fusioncore.h 2012-10-15 22:05:27.232401023 +0200
+@@ -17,7 +17,7 @@
+
+ #include <linux/stddef.h>
+
+-#include "fusioncore_impl.h"
++#include "single/fusioncore_impl.h"
+
+ typedef enum {
+ FC_OK,
+diff -purN linux-fusion-8.8.1.orig/linux/drivers/char/fusion/single/fusioncore_impl.c linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c
+--- linux-fusion-8.8.1.orig/linux/drivers/char/fusion/single/fusioncore_impl.c 2012-10-15 21:47:53.878501243 +0200
++++ linux-fusion-8.8.1/linux/drivers/char/fusion/single/fusioncore_impl.c 2012-10-15 22:05:38.585511304 +0200
+@@ -22,9 +22,9 @@
+ #include <linux/slab.h>
+ #include <linux/sched.h>
+
+-#include "debug.h"
++#include "../debug.h"
+
+-#include "fusioncore.h"
++#include "../fusioncore.h"
+
+
+
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 08/33] owl-linux: update help text about linux kernel dependencies.
From: Samuel Martin @ 2012-11-22 0:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/owl-linux/Config.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/owl-linux/Config.in b/package/owl-linux/Config.in
index f6e18d5..1dcf5f1 100644
--- a/package/owl-linux/Config.in
+++ b/package/owl-linux/Config.in
@@ -6,6 +6,8 @@ config BR2_PACKAGE_OWL_LINUX
help
Linux kernel driver for the H&D Wireless SPB104 SD-card WiFi SIP.
+ owl-linux requires the hidden kernel option WIRELESS_EXT enabled.
+
http://linux.hd-wireless.se/bin/view/Linux/GettingStarted
comment "owl-linux requires a Linux kernel"
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 07/33] fluxbox: fix build against imlib2
From: Samuel Martin @ 2012-11-22 0:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
* fix missing dependency
* set imlib2 prefix at configure time
* fix configure script to take account of the imlib2 prefix if any
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/fluxbox/fluxbox-fix-configure.patch | 19 +++++++++++++++++++
package/fluxbox/fluxbox.mk | 7 ++++---
2 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 package/fluxbox/fluxbox-fix-configure.patch
diff --git a/package/fluxbox/fluxbox-fix-configure.patch b/package/fluxbox/fluxbox-fix-configure.patch
new file mode 100644
index 0000000..a739f08
--- /dev/null
+++ b/package/fluxbox/fluxbox-fix-configure.patch
@@ -0,0 +1,19 @@
+Avoid to call the imlib2-config that may be installed on the host system
+(even when --with-imlib2-prefix or --with-imlib2-exec-prefix is passed to
+the configure script), which totally screws up the resulting linker flags.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+--- fluxbox-1.3.2.orig/configure.in 2012-10-21 16:11:59.445749396 +0200
++++ fluxbox-1.3.2/configure.in 2012-10-21 16:35:27.658390856 +0200
+@@ -443,8 +443,8 @@ if test x$enable_imlib2 = "xyes"; then
+ [
+ IMLIB2=true
+ AC_DEFINE(HAVE_IMLIB2, [], [Imlib2 support])
+- IMLIB2_LIBS=`imlib2-config --libs`
+- IMLIB2_CFLAGS=`imlib2-config --cflags`
++ IMLIB2_LIBS=`$IMLIB2_CONFIG --libs`
++ IMLIB2_CFLAGS=`$IMLIB2_CONFIG --cflags`
+ LIBS="$LIBS $IMLIB2_LIBS"
+ CXXFLAGS="$CXXFLAGS $IMLIB2_CFLAGS"
+ ], [ AC_MSG_RESULT(no)]
diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
index 15136c9..bb34379 100644
--- a/package/fluxbox/fluxbox.mk
+++ b/package/fluxbox/fluxbox.mk
@@ -7,11 +7,12 @@
FLUXBOX_VERSION = 1.3.2
FLUXBOX_SOURCE = fluxbox-$(FLUXBOX_VERSION).tar.bz2
FLUXBOX_SITE = http://downloads.sourceforge.net/project/fluxbox/fluxbox/$(FLUXBOX_VERSION)
-
+FLUXBOX_AUTORECONF = YES
FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
- --x-libraries=$(STAGING_DIR)/usr/lib
+ --x-libraries=$(STAGING_DIR)/usr/lib \
+ --with-imlib2-prefix=$(STAGING_DIR)/usr
-FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+FLUXBOX_DEPENDENCIES = imlib2 xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
define FLUXBOX_INSTALL_XSESSION_FILE
[ -f $(TARGET_DIR)/root/.xsession ] || $(INSTALL) -m 0755 -D \
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 06/33] sylpheed: fix build disabling gpgme support
From: Samuel Martin @ 2012-11-22 0:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/sylpheed/sylpheed.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index cf55c90..3ac2e1e 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -9,7 +9,7 @@ SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).$(SYLPHEED_VERSION_MINOR)
SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
-SYLPHEED_CONF_OPT = --disable-gtkspell
+SYLPHEED_CONF_OPT = --disable-gtkspell --disable-gpgme
SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 05/33] imagemagick: explicitly disable c++ support if no c++ compiler available
From: Samuel Martin @ 2012-11-22 0:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/imagemagick/imagemagick.mk | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 61a379d..365a073 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -35,6 +35,12 @@ IMAGEMAGICK_CONF_OPT = --program-transform-name='s,,,' \
IMAGEMAGICK_DEPENDENCIES = host-pkgconf
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+IMAGEMAGICK_CONF_OPT = --with-magick-plus-plus
+else
+IMAGEMAGICK_CONF_OPT = --without-magick-plus-plus
+endif
+
ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
IMAGEMAGICK_CONF_OPT += --with-fontconfig
IMAGEMAGICK_DEPENDENCIES += fontconfig
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 04/33] igh-ethercat: disable drivers build with kernel 3.6
From: Samuel Martin @ 2012-11-22 0:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Since hardware specific support is available for some given kernel
releases (mostly for kernel <=3.2), then disable them if kernel 3.6 is
enable. However, this still allows the generic driver build.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/igh-ethercat/Config.in | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/package/igh-ethercat/Config.in b/package/igh-ethercat/Config.in
index 890bb12..4a0fd75 100644
--- a/package/igh-ethercat/Config.in
+++ b/package/igh-ethercat/Config.in
@@ -6,7 +6,12 @@ config BR2_PACKAGE_IGH_ETHERCAT
http://www.etherlab.org/en/ethercat/index.php
-if BR2_PACKAGE_IGH_ETHERCAT
+if BR2_PACKAGE_IGH_ETHERCAT && !BR2_LINUX_KERNEL_3_6
+
+comment "The following drivers are only available for some"
+comment "releases of the kernel (mostly 2.6.x)."
+comment "Further details about the kernel/hardware support at:"
+comment "http://www.etherlab.org/en/ethercat/hardware.php"
config BR2_PACKAGE_IGH_ETHERCAT_8139TOO
bool "8139too driver"
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 03/33] tcpdump: use 'pkg-config pcap' instead of pcap-config
From: Samuel Martin @ 2012-11-22 0:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
...ump-use-pkg-config-instead-of-pcap-config.patch | 68 ++++++++++++++++++++++
package/tcpdump/tcpdump.mk | 3 +-
2 files changed, 70 insertions(+), 1 deletion(-)
create mode 100644 package/tcpdump/tcpdump-use-pkg-config-instead-of-pcap-config.patch
diff --git a/package/tcpdump/tcpdump-use-pkg-config-instead-of-pcap-config.patch b/package/tcpdump/tcpdump-use-pkg-config-instead-of-pcap-config.patch
new file mode 100644
index 0000000..bd12580
--- /dev/null
+++ b/package/tcpdump/tcpdump-use-pkg-config-instead-of-pcap-config.patch
@@ -0,0 +1,68 @@
+Use 'pkg-config pcap' instead of the pcap-config binary which does not
+correctly support cross-compilation.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+--- tcpdump-4.3.0.orig/aclocal.m4 2012-11-17 14:04:17.159100154 +0100
++++ tcpdump-4.3.0/aclocal.m4 2012-11-17 15:28:46.319808067 +0100
+@@ -287,29 +287,13 @@ AC_DEFUN(AC_LBL_LIBPCAP,
+ AC_MSG_CHECKING(for local pcap library)
+ libpcap=FAIL
+ lastdir=FAIL
+- places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
+- egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT)?$'`
+- for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do
+- basedir=`echo $dir | sed -e 's/[[ab]][[0-9]]*$//' | \
+- sed -e 's/-PRE-GIT$//' `
+- if test $lastdir = $basedir ; then
+- dnl skip alphas when an actual release is present
+- continue;
+- fi
+- lastdir=$dir
+- if test -r $dir/libpcap.a ; then
+- libpcap=$dir/libpcap.a
+- d=$dir
+- dnl continue and select the last one that exists
+- fi
+- done
+ if test $libpcap = FAIL ; then
+ AC_MSG_RESULT(not found)
+
+ #
+ # Look for pcap-config.
+ #
+- AC_PATH_TOOL(PCAP_CONFIG, pcap-config)
++ AC_PATH_TOOL(PCAP_CONFIG, pkg-config)
+ if test -n "$PCAP_CONFIG" ; then
+ #
+ # Found - use it to get the include flags for
+@@ -322,9 +322,9 @@ AC_DEFUN(AC_LBL_LIBPCAP,
+ # double-quoted strings inside double-quoted back-quoted
+ # expressions (pfew!)."
+ #
+- cflags=`"$PCAP_CONFIG" --cflags`
++ cflags=`"$PCAP_CONFIG" pcap --cflags`
+ $2="$cflags $$2"
+- libpcap=`"$PCAP_CONFIG" --libs`
++ libpcap=`"$PCAP_CONFIG" pcap --libs`
+ else
+ #
+ # Not found; look for pcap.
+@@ -380,7 +380,7 @@ AC_DEFUN(AC_LBL_LIBPCAP,
+ AC_MSG_ERROR(cannot find pcap.h, see INSTALL)
+ fi
+ AC_MSG_RESULT($libpcap)
+- AC_PATH_PROG(PCAP_CONFIG, pcap-config,, $d)
++ AC_PATH_PROG(PCAP_CONFIG, pkg-config,, $d)
+ if test -n "$PCAP_CONFIG"; then
+ #
+ # The libpcap directory has a pcap-config script.
+@@ -395,7 +395,7 @@ AC_DEFUN(AC_LBL_LIBPCAP,
+ # double-quoted strings inside double-quoted back-quoted
+ # expressions (pfew!)."
+ #
+- additional_libs=`"$PCAP_CONFIG" --additional-libs --static`
++ additional_libs=`"$PCAP_CONFIG" pcap --libs --static`
+ libpcap="$libpcap $additional_libs"
+ fi
+ fi
diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index 96414ef..72def58 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -11,10 +11,11 @@ TCPDUMP_SITE = http://www.tcpdump.org/release
TCPDUMP_LICENSE = BSD-3c
TCPDUMP_LICENSE_FILES = LICENSE
+TCPDUMP_AUTORECONF = YES
TCPDUMP_CONF_ENV = ac_cv_linux_vers=2 td_cv_buggygetaddrinfo=no
TCPDUMP_CONF_OPT = --without-crypto \
$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
-TCPDUMP_DEPENDENCIES = zlib libpcap
+TCPDUMP_DEPENDENCIES = host-pkgconf zlib libpcap
# make install installs an unneeded extra copy of the tcpdump binary
define TCPDUMP_REMOVE_DUPLICATED_BINARY
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 02/33] libpcap: add pcap.pc file
From: Samuel Martin @ 2012-11-22 0:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/libpcap/libpcap.mk | 10 ++++++++++
package/libpcap/pcap.pc | 12 ++++++++++++
2 files changed, 22 insertions(+)
create mode 100644 package/libpcap/pcap.pc
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 7a1d32f..d813b85 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -26,4 +26,14 @@ ifeq ($(BR2_microblaze),y)
LIBPCAP_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC"
endif
+LIBPCAP_USB_SUPPORT = $(if $(BR2_PACKAGE_LIBUSB),-lusb-1.0)
+define LIBPCAP_INSTALL_STAGING_PC
+ sed -e 's/@LIBPCAP_VERSION@/$(LIBPCAP_VERSION)/' \
+ -e 's/@LIBPCAP_USB_SUPPORT@/$(LIBPCAP_USB_SUPPORT)/' \
+ < package/libpcap/pcap.pc \
+ > $(STAGING_DIR)/usr/lib/pkgconfig/pcap.pc
+endef
+
+LIBPCAP_POST_INSTALL_STAGING_HOOKS += LIBPCAP_INSTALL_STAGING_PC
+
$(eval $(autotools-package))
diff --git a/package/libpcap/pcap.pc b/package/libpcap/pcap.pc
new file mode 100644
index 0000000..0bd1917
--- /dev/null
+++ b/package/libpcap/pcap.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: pcap
+Description: System-independent library for user-level network packet capture
+Requires:
+Version: @LIBPCAP_VERSION@
+Libs: -L${libdir} -lpcap
+Libs.private: @LIBPCAP_USB_SUPPORT@ -lpthread
+Cflags: -I${includedir}
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 01/33] libecore: fix build with glibc >=2.16
From: Samuel Martin @ 2012-11-22 0:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
...ecore-ecore_exe-fix-build-with-glibc-2-16.patch | 94 ++++++++++++++++++++++
1 file changed, 94 insertions(+)
create mode 100644 package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch
diff --git a/package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch b/package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch
new file mode 100644
index 0000000..d9b439c
--- /dev/null
+++ b/package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch
@@ -0,0 +1,94 @@
+Backported for commit a0df6712b6afcd07facd32e5a66809170277bdf3
+Fixed the ChangeLog part.
+
+This patch fix build with glibc >=2.16, avoiding the following error occurs:
+
+Making all in ecore
+make[6]: Entering directory `/opt/buildroot/output/build/host-libecore-1.1.0/src/lib/ecore'
+ CC ecore.lo
+ CC ecore_anim.lo
+ CC ecore_app.lo
+ CC ecore_events.lo
+ CC ecore_getopt.lo
+ CC ecore_idle_enterer.lo
+ CC ecore_idle_exiter.lo
+ CC ecore_idler.lo
+ CC ecore_job.lo
+ CC ecore_main.lo
+ CC ecore_pipe.lo
+ CC ecore_poll.lo
+ CC ecore_time.lo
+ CC ecore_timer.lo
+ CC ecore_thread.lo
+ CC ecore_glib.lo
+ CC ecore_throttle.lo
+ CC ecore_signal.lo
+ CC ecore_exe.lo
+ecore_exe.c: In function ?ecore_exe_pipe_run?:
+ecore_exe.c:486:15: warning: implicit declaration of function ?setpriority? [-Wimplicit-function-declaration]
+ecore_exe.c:486:27: error ?PRIO_PROCESS? undeclared (first use in this function)
+ecore_exe.c:486:27: note: each undeclared identifier is reported only once for each function it appears in
+make[6]: *** [ecore_exe.lo] Error 1
+
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+From a0df6712b6afcd07facd32e5a66809170277bdf3 Mon Sep 17 00:00:00 2001
+From: caro <caro>
+Date: Fri, 22 Jun 2012 05:36:00 +0000
+Subject: [PATCH] ecore_exe: fix compilation on fedora 18.
+
+setpriority needs sys/resource.h. See:
+
+http://linux.die.net/man/2/setpriority
+
+I let sys/time.h, it does not hurt on linux and is anyway needed for BSD systems.
+
+
+git-svn-id: http://svn.enlightenment.org/svn/e at 72684 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
+---
+ ChangeLog | 4 ++++
+ src/lib/ecore/ecore_exe.c | 7 ++-----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index a306f75..549ad19 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -763,3 +763,7 @@
+ 2011-11-29 Mike McCormack
+
+ * Allow quitting before entering the glib version of the main loop
++
++2012-06-22 Vincent Torri
++
++ * ecore_exe: fix compilation on fedora 18.
+diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c
+index 7931a96..6db32a9 100644
+--- a/src/lib/ecore/ecore_exe.c
++++ b/src/lib/ecore/ecore_exe.c
+@@ -2,11 +2,6 @@
+ # include <config.h>
+ #endif
+
+-#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
+-# include <sys/time.h>
+-# include <sys/resource.h>
+-#endif
+-
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -14,6 +9,8 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <sys/time.h>
++#include <sys/resource.h>
+
+ #ifdef HAVE_SYS_PRCTL_H
+ # include <sys/prctl.h>
+--
+1.7.12.2
+
--
1.8.0
^ permalink raw reply related
* [Buildroot] [PATCH 00/33] Pull request for 2012.11/bug-fixes
From: Samuel Martin @ 2012-11-22 0:17 UTC (permalink / raw)
To: buildroot
Hi all,
Here is a bug fixes series which targets the 2012.11 released.
Series detail:
- Patches 1 to 16 are random package fixes (help text/source urls/build fixes);
- Patch 17 is linux-fusion package update, which fix directfb build;
- Patch 18 is a python security update;
- Patch 19 is an improvement for the download infrastructure;
- Patch 20 enables rrdtool python bindings;
- Patch 21-33 add license info to most of the packages touched by this series.
IMO, patches 1 to 18 can be integrated for the 2012.11 release.
Patch 19 is more open to be discussed, somehow making echo to what has been
said during the lastest BR dev days.
Patch 20 can be merged in the next branch.
Yours,
Samuel Martin (33):
libecore: fix build with glibc >=2.16
libpcap: add pcap.pc file
tcpdump: use 'pkg-config pcap' instead of pcap-config
igh-ethercat: disable drivers build with kernel 3.6
imagemagick: explicitly disable c++ support if no c++ compiler
available
sylpheed: fix build disabling gpgme support
fluxbox: fix build against imlib2
owl-linux: update help text about linux kernel dependencies.
linux-fusion: fix build
ltp-testsuite: add warning about bessel function support if uclibc
toolchain
ltp-testsuite: fix build on uClibc exp10
sconeserver: fix configure.in
sconeserver: fix imagemagick dependency
dependencies: build a host python2 if no suitable one can be found
scons: force to use python2 on the host
libmad: do not install mad.pc on the target
matchbox packages: fix broken urls
linux-fusion: bump to version 8.10.4
python2: bump to 2.7.3
pkg-download.mk: add tarball check in the wget method
rrdtool: add python binding support
libmad: add license info
scons: add license info
efl packages: add license info
fluxbox: add license info
igh-ethercat: add license info
imagemagick: add license info
imlib2: add license info
ltp-testsuite: add license info
matchbox packages: add license info
owl-linux: add license info
rrdtool: add license info
sylpheed: add license info
package/efl/expedite/expedite.mk | 3 +
...ecore-ecore_exe-fix-build-with-glibc-2-16.patch | 94 ++++++++++++++++++++++
package/efl/libecore/libecore.mk | 3 +
package/efl/libedbus/libedbus.mk | 3 +
package/efl/libedje/libedje.mk | 3 +
package/efl/libeet/libeet.mk | 3 +
package/efl/libefreet/libefreet.mk | 3 +
package/efl/libeina/libeina.mk | 3 +
package/efl/libelementary/libelementary.mk | 3 +
package/efl/libembryo/libembryo.mk | 3 +
package/efl/libethumb/libethumb.mk | 3 +
package/efl/libevas/libevas.mk | 3 +
package/fluxbox/fluxbox-fix-configure.patch | 19 +++++
package/fluxbox/fluxbox.mk | 8 +-
package/igh-ethercat/Config.in | 7 +-
package/igh-ethercat/igh-ethercat.mk | 4 +
package/imagemagick/imagemagick.mk | 9 +++
package/imlib2/imlib2.mk | 4 +-
package/libmad/libmad.mk | 8 +-
package/libpcap/libpcap.mk | 10 +++
package/libpcap/pcap.pc | 12 +++
.../linux-fusion/linux-fusion-fix-include.patch | 43 ++++++++++
package/linux-fusion/linux-fusion.mk | 2 +-
package/ltp-testsuite/Config.in | 4 +
...tsuite-20101031-fix-build-on-uClibc-exp10.patch | 22 +++++
package/ltp-testsuite/ltp-testsuite.mk | 2 +
.../matchbox/matchbox-common/matchbox-common.mk | 9 ++-
.../matchbox/matchbox-desktop/matchbox-desktop.mk | 8 +-
.../matchbox/matchbox-fakekey/matchbox-fakekey.mk | 3 +
.../matchbox-keyboard/matchbox-keyboard.mk | 5 +-
package/matchbox/matchbox-lib/matchbox-lib.mk | 5 +-
package/matchbox/matchbox-panel/matchbox-panel.mk | 9 ++-
.../matchbox-startup-monitor.mk | 3 +
package/matchbox/matchbox-wm/matchbox-wm.mk | 5 +-
package/owl-linux/Config.in | 2 +
package/owl-linux/owl-linux.mk | 2 +
package/pkg-download.mk | 13 ++-
package/python/python-2.7-009-python-symlink.patch | 25 ------
.../python-2.7-100-optional-test-modules.patch | 3 +-
package/python/python-2.7-101-optional-pydoc.patch | 3 +-
package/python/python-2.7-102-optional-2to3.patch | 12 +--
.../python/python-2.7-103-optional-sqlite.patch | 31 ++++++-
package/python/python-2.7-104-optional-tk.patch | 3 +-
.../python/python-2.7-105-optional-curses.patch | 3 +-
package/python/python-2.7-106-optional-expat.patch | 3 +-
package/python/python-2.7-110-optional-db.patch | 7 +-
package/python/python.mk | 2 +-
package/rrdtool/Config.in | 8 ++
package/rrdtool/rrdtool-fix-python-includes.patch | 29 +++++++
package/rrdtool/rrdtool.mk | 22 ++++-
package/sconeserver/Config.in | 3 +
...-dependency-use-pkg-config-instead-of-Mag.patch | 41 ++++++++++
...n-do-not-hardcode-mysql-include-directory.patch | 27 +++++++
package/sconeserver/sconeserver.mk | 4 +-
package/scons/scons.mk | 8 +-
package/sylpheed/sylpheed.mk | 4 +-
...ump-use-pkg-config-instead-of-pcap-config.patch | 68 ++++++++++++++++
package/tcpdump/tcpdump.mk | 3 +-
support/dependencies/check-host-python2.mk | 6 ++
support/dependencies/check-host-python2.sh | 13 +++
support/dependencies/dependencies.sh | 2 +-
61 files changed, 599 insertions(+), 76 deletions(-)
create mode 100644 package/efl/libecore/libecore-ecore_exe-fix-build-with-glibc-2-16.patch
create mode 100644 package/fluxbox/fluxbox-fix-configure.patch
create mode 100644 package/libpcap/pcap.pc
create mode 100644 package/linux-fusion/linux-fusion-fix-include.patch
create mode 100644 package/ltp-testsuite/ltp-testsuite-20101031-fix-build-on-uClibc-exp10.patch
delete mode 100644 package/python/python-2.7-009-python-symlink.patch
create mode 100644 package/rrdtool/rrdtool-fix-python-includes.patch
create mode 100644 package/sconeserver/sconeserver-180-ImageMagick-dependency-use-pkg-config-instead-of-Mag.patch
create mode 100644 package/sconeserver/sconeserver-180-configure.in-do-not-hardcode-mysql-include-directory.patch
create mode 100644 package/tcpdump/tcpdump-use-pkg-config-instead-of-pcap-config.patch
create mode 100644 support/dependencies/check-host-python2.mk
create mode 100755 support/dependencies/check-host-python2.sh
--
1.8.0
^ permalink raw reply
* [Buildroot] [git commit] linux: bump 3.6.x stable version
From: Peter Korsgaard @ 2012-11-21 23:08 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=36d36f0de19bd5f23453dc1391f83843f9042849
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
linux/Config.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/linux/Config.in b/linux/Config.in
index 29a2110..e24273c 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -21,7 +21,7 @@ choice
prompt "Kernel version"
config BR2_LINUX_KERNEL_3_6
- bool "3.6.6"
+ bool "3.6.7"
config BR2_LINUX_KERNEL_SAME_AS_HEADERS
bool "Same as toolchain kernel headers"
@@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
config BR2_LINUX_KERNEL_VERSION
string
- default "3.6.6" if BR2_LINUX_KERNEL_3_6
+ default "3.6.7" if BR2_LINUX_KERNEL_3_6
default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox