* [Buildroot] [pull request] Pull request for branch misc-fixes
@ 2012-11-17 22:23 Thomas Petazzoni
2012-11-17 22:23 ` [Buildroot] [PATCH 01/10] python: use default configure commands to get shared build Thomas Petazzoni
` (10 more replies)
0 siblings, 11 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2012-11-17 22:23 UTC (permalink / raw)
To: buildroot
The following changes since commit ee3a96137b6cbb8f970c540c61f75300a44ea803:
lua-msgpack-native: fix fetch (2012-11-17 10:15:24 +0100)
are available in the git repository at:
git://git.free-electrons.com/users/thomas-petazzoni/buildroot.git misc-fixes
for you to fetch changes up to e269850f46106974a04c05f22889e61202608453:
dbus: uses fork(), requires MMU (2012-11-17 23:23:17 +0100)
----------------------------------------------------------------
Thomas Petazzoni (8):
python: use default configure commands to get shared build
libatomic_ops: bump to version 7.2
gnutls: fix build failure due to non-existing gets in recent C libraries
gsl: fix build on !i386 uClibc
libffi: make thread support optional
php: fix C++ link issue
attr: fix static build
dbus: uses fork(), requires MMU
Vellemans Noel (2):
libxml2: add support for building host library with python support
mesa3d: requires host-libxml2 and host-python to generate some files
...r-0001-attr-Fix-static-build-installation.patch | 30 ++++++++
package/bluez_utils/Config.in | 1 +
package/connman/Config.in | 1 +
package/dbus/Config.in | 2 +
package/efl/libedbus/Config.in | 1 +
...001-gets-no-longer-exists-in-e-glibc-2.16.patch | 56 +++++++++++++++
package/gsl/gsl.mk | 13 ++++
package/gvfs/Config.in | 2 +
package/libatomic_ops/libatomic_ops.mk | 2 +-
...ffi-0003-Make-thread-support-conditionnal.patch | 73 ++++++++++++++++++++
package/libxml2/Config.in | 3 +
package/libxml2/libxml2.mk | 10 ++-
package/network-manager/Config.in | 1 +
package/ofono/Config.in | 1 +
package/php/php.mk | 4 ++
package/python/python.mk | 14 +---
package/qt/Config.in | 1 +
package/samba/Config.in | 1 +
package/systemd/Config.in | 1 +
package/x11r7/mesa3d/Config.in | 1 +
package/x11r7/mesa3d/mesa3d.mk | 4 +-
system/Config.in | 1 +
22 files changed, 207 insertions(+), 16 deletions(-)
create mode 100644 package/attr/attr-0001-attr-Fix-static-build-installation.patch
create mode 100644 package/gnutls/gnutls-0001-gets-no-longer-exists-in-e-glibc-2.16.patch
create mode 100644 package/libffi/libffi-0003-Make-thread-support-conditionnal.patch
Thanks,
--
Thomas Petazzoni
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 01/10] python: use default configure commands to get shared build
2012-11-17 22:23 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
@ 2012-11-17 22:23 ` Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 02/10] libxml2: add support for building host library with python support Thomas Petazzoni
` (9 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2012-11-17 22:23 UTC (permalink / raw)
To: buildroot
Commit 3c90f754961c6d99059c0b6d0a66bc797a3c017b made Python use a
special ./configure command in order to avoid --enable-shared
--disable-static being passed, because it was causing issues when
building certain modules for a 64 bits system.
However, not having a shared libpython2.7 library for the host
prevents the libxml2 Python binding to get built.
So instead, we use the default configure command, but we add
--enable-static which is needed for Python to build correctly.
Note that we tested the build of Python on a 64 bits host as well as
the build of Python for a 64 bits target, and both went fine, with all
modules built properly.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/python/python.mk | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/package/python/python.mk b/package/python/python.mk
index 87237bb..e0ec9bb 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -17,6 +17,7 @@ PYTHON_LICENSE_FILES = LICENSE
# third-party Python modules.
HOST_PYTHON_CONF_OPT += \
+ --enable-static \
--without-cxx-main \
--disable-sqlite3 \
--disable-tk \
@@ -38,19 +39,6 @@ HOST_PYTHON_MAKE_ENV = \
HOST_PYTHON_AUTORECONF = YES
-define HOST_PYTHON_CONFIGURE_CMDS
- (cd $(@D) && rm -rf config.cache; \
- $(HOST_CONFIGURE_OPTS) \
- CFLAGS="$(HOST_CFLAGS)" \
- LDFLAGS="$(HOST_LDFLAGS)" \
- $(HOST_PYTHON_CONF_ENV) \
- ./configure \
- --prefix="$(HOST_DIR)/usr" \
- --sysconfdir="$(HOST_DIR)/etc" \
- $(HOST_PYTHON_CONF_OPT) \
- )
-endef
-
PYTHON_DEPENDENCIES = host-python libffi
HOST_PYTHON_DEPENDENCIES = host-expat host-zlib
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 02/10] libxml2: add support for building host library with python support
2012-11-17 22:23 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
2012-11-17 22:23 ` [Buildroot] [PATCH 01/10] python: use default configure commands to get shared build Thomas Petazzoni
@ 2012-11-17 22:24 ` Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 03/10] mesa3d: requires host-libxml2 and host-python to generate some files Thomas Petazzoni
` (8 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2012-11-17 22:24 UTC (permalink / raw)
To: buildroot
From: Vellemans Noel <noel.vellemans@visionbms.com>
Patch based on the initial work of Will Wagner (Thanks Will).
libxml2 host library with python support is required to build mesa3d (7.10.1)
Signed-off-by: Vellemans Noel <noel.vellemans@visionbms.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/libxml2/Config.in | 3 +++
package/libxml2/libxml2.mk | 10 +++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/package/libxml2/Config.in b/package/libxml2/Config.in
index ebd63fe..ea62663 100644
--- a/package/libxml2/Config.in
+++ b/package/libxml2/Config.in
@@ -4,3 +4,6 @@ config BR2_PACKAGE_LIBXML2
XML C Parser
http://xmlsoft.org/
+
+config BR2_PACKAGE_HOST_LIBXML2_PYTHON
+ bool
\ No newline at end of file
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 71f2bd1..fde3735 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -26,7 +26,15 @@ LIBXML2_POST_INSTALL_STAGING_HOOKS += LIBXML2_STAGING_LIBXML2_CONFIG_FIXUP
HOST_LIBXML2_DEPENDENCIES = host-pkgconf
-HOST_LIBXML2_CONF_OPT = --without-debug --without-python
+HOST_LIBXML2_CONF_OPT = --without-debug
+
+ifeq ($(BR2_PACKAGE_HOST_LIBXML2_PYTHON),y)
+HOST_LIBXML2_DEPENDENCIES += host-python
+HOST_LIBXML2_CONF_OPT += --with-python=$(HOST_DIR)/usr
+else
+HOST_LIBXML2_CONF_OPT += --without-python
+endif
+
define LIBXML2_REMOVE_CONFIG_SCRIPTS
$(RM) -f $(TARGET_DIR)/usr/bin/xml2-config
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 03/10] mesa3d: requires host-libxml2 and host-python to generate some files
2012-11-17 22:23 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
2012-11-17 22:23 ` [Buildroot] [PATCH 01/10] python: use default configure commands to get shared build Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 02/10] libxml2: add support for building host library with python support Thomas Petazzoni
@ 2012-11-17 22:24 ` Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 04/10] libatomic_ops: bump to version 7.2 Thomas Petazzoni
` (7 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2012-11-17 22:24 UTC (permalink / raw)
To: buildroot
From: Vellemans Noel <noel.vellemans@visionbms.com>
mesa3d now generates some C files at build time (related to the OpenGL
API) from XML files. This generation process is done using Python
scripts that require the libxml2 Python module.
Patch based on the initial work of Will Wagner (Thanks Will).
Signed-off-by: Vellemans Noel <noel.vellemans@visionbms.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/x11r7/mesa3d/Config.in | 1 +
package/x11r7/mesa3d/mesa3d.mk | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/package/x11r7/mesa3d/Config.in b/package/x11r7/mesa3d/Config.in
index 47ded29..e5b426e 100644
--- a/package/x11r7/mesa3d/Config.in
+++ b/package/x11r7/mesa3d/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_DRI2PROTO
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_EXPAT
+ select BR2_PACKAGE_HOST_LIBXML2_PYTHON
depends on BR2_PACKAGE_XSERVER_xorg
depends on BR2_INSTALL_LIBSTDCPP
help
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index 8d311e1..b16d5e6 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -28,6 +28,8 @@ MESA3D_DEPENDENCIES = \
xproto_dri2proto \
libdrm \
expat \
- host-xutil_makedepend
+ host-xutil_makedepend \
+ host-libxml2 \
+ host-python
$(eval $(autotools-package))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 04/10] libatomic_ops: bump to version 7.2
2012-11-17 22:23 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (2 preceding siblings ...)
2012-11-17 22:24 ` [Buildroot] [PATCH 03/10] mesa3d: requires host-libxml2 and host-python to generate some files Thomas Petazzoni
@ 2012-11-17 22:24 ` Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 05/10] gnutls: fix build failure due to non-existing gets in recent C libraries Thomas Petazzoni
` (6 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2012-11-17 22:24 UTC (permalink / raw)
To: buildroot
The 1.2 we were using doesn't build on ARM Thumb platforms:
http://autobuild.buildroot.org/results/94ef6be7dcb31021462e7313724217627d4b29df/build-end.log
Moreover, the 7.2 version is the one used by Debian/Ubuntu, and it has
been tested to build fine with the two packages that depend on
libatomic_ops: libdrm and pulseaudio.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/libatomic_ops/libatomic_ops.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk
index 6d50d0a..8f66f88 100644
--- a/package/libatomic_ops/libatomic_ops.mk
+++ b/package/libatomic_ops/libatomic_ops.mk
@@ -4,7 +4,7 @@
#
#############################################################
-LIBATOMIC_OPS_VERSION = 1.2
+LIBATOMIC_OPS_VERSION = 7.2
LIBATOMIC_OPS_SOURCE = libatomic_ops-$(LIBATOMIC_OPS_VERSION).tar.gz
LIBATOMIC_OPS_SITE = http://www.hpl.hp.com/research/linux/atomic_ops/download
LIBATOMIC_OPS_INSTALL_STAGING = YES
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 05/10] gnutls: fix build failure due to non-existing gets in recent C libraries
2012-11-17 22:23 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (3 preceding siblings ...)
2012-11-17 22:24 ` [Buildroot] [PATCH 04/10] libatomic_ops: bump to version 7.2 Thomas Petazzoni
@ 2012-11-17 22:24 ` Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 06/10] gsl: fix build on !i386 uClibc Thomas Petazzoni
` (5 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2012-11-17 22:24 UTC (permalink / raw)
To: buildroot
Fixes:
http://autobuild.buildroot.org/results/7414989c182f8fd5b3ac849b7897b8e15df0024f/build-end.log
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
...001-gets-no-longer-exists-in-e-glibc-2.16.patch | 56 ++++++++++++++++++++
1 file changed, 56 insertions(+)
create mode 100644 package/gnutls/gnutls-0001-gets-no-longer-exists-in-e-glibc-2.16.patch
diff --git a/package/gnutls/gnutls-0001-gets-no-longer-exists-in-e-glibc-2.16.patch b/package/gnutls/gnutls-0001-gets-no-longer-exists-in-e-glibc-2.16.patch
new file mode 100644
index 0000000..802e7ac
--- /dev/null
+++ b/package/gnutls/gnutls-0001-gets-no-longer-exists-in-e-glibc-2.16.patch
@@ -0,0 +1,56 @@
+From 855f72c4fe7f4bbf2137ab60357ae3b27bb65185 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 17 Nov 2012 17:45:41 +0100
+Subject: [PATCH] gets() no longer exists in (e)glibc >= 2.16
+
+gnutls has already updated gnulib upstream in more recent versions
+(3.x) but apparently not in the 2.x branch that we are using.
+
+This patch comes from OpenEmbedded, and has originally been written by
+Khem Raj <raj.khem@gmail.com>.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ gl/stdio.in.h | 2 ++
+ lib/gl/stdio.in.h | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/gl/stdio.in.h b/gl/stdio.in.h
+index 9dc7c4a..8cb19d7 100644
+--- a/gl/stdio.in.h
++++ b/gl/stdio.in.h
+@@ -710,11 +710,13 @@ _GL_CXXALIAS_RPL (gets, char *, (char *s));
+ _GL_CXXALIAS_SYS (gets, char *, (char *s));
+ # undef gets
+ # endif
++# if defined gets
+ _GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+ so any use of gets warrants an unconditional warning. Assume it is
+ always declared, since it is required by C89. */
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++# endif
+ #endif
+
+
+diff --git a/lib/gl/stdio.in.h b/lib/gl/stdio.in.h
+index 03bea2a..cb6483b 100644
+--- a/lib/gl/stdio.in.h
++++ b/lib/gl/stdio.in.h
+@@ -710,11 +710,13 @@ _GL_CXXALIAS_RPL (gets, char *, (char *s));
+ _GL_CXXALIAS_SYS (gets, char *, (char *s));
+ # undef gets
+ # endif
++# if defined gets
+ _GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+ so any use of gets warrants an unconditional warning. Assume it is
+ always declared, since it is required by C89. */
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++# endif
+ #endif
+
+
+--
+1.7.9.5
+
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 06/10] gsl: fix build on !i386 uClibc
2012-11-17 22:23 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (4 preceding siblings ...)
2012-11-17 22:24 ` [Buildroot] [PATCH 05/10] gnutls: fix build failure due to non-existing gets in recent C libraries Thomas Petazzoni
@ 2012-11-17 22:24 ` Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 07/10] libffi: make thread support optional Thomas Petazzoni
` (4 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2012-11-17 22:24 UTC (permalink / raw)
To: buildroot
uClibc pretends to implement <fenv.h> as it installs the header, but
in practice, it only implements the functions for i386. This makes gsl
unhappy as it detects fenv.h, but then cannot use the fenv functions.
Fixes:
http://autobuild.buildroot.org/results/732cc07faeca2a9098dc5106e8f654eb1323451a/build-end.log
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/gsl/gsl.mk | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk
index 7196859..6591591 100644
--- a/package/gsl/gsl.mk
+++ b/package/gsl/gsl.mk
@@ -10,4 +10,17 @@ GSL_INSTALL_STAGING = YES
GSL_LICENSE = GPLv3
GSL_LICENSE_FILES = COPYING
+# uClibc pretends to have fenv support as it installs <fenv.h>, but in
+# practice, it only implements it for i386. Problem reported upstream
+# at: http://lists.busybox.net/pipermail/uclibc/2012-October/047067.html.
+# So we tell gsl that fenv related functions are not available in this
+# case.
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+ifneq ($(BR2_i386),y)
+GSL_CONF_ENV = \
+ ac_cv_have_decl_feenableexcept=no \
+ ac_cv_have_decl_fesettrapenable=no
+endif
+endif
+
$(eval $(autotools-package))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 07/10] libffi: make thread support optional
2012-11-17 22:23 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (5 preceding siblings ...)
2012-11-17 22:24 ` [Buildroot] [PATCH 06/10] gsl: fix build on !i386 uClibc Thomas Petazzoni
@ 2012-11-17 22:24 ` Thomas Petazzoni
2012-11-17 22:46 ` Peter Korsgaard
2012-11-17 22:24 ` [Buildroot] [PATCH 08/10] php: fix C++ link issue Thomas Petazzoni
` (3 subsequent siblings)
10 siblings, 1 reply; 13+ messages in thread
From: Thomas Petazzoni @ 2012-11-17 22:24 UTC (permalink / raw)
To: buildroot
Fixes:
http://autobuild.buildroot.org/results/7ee57d01917ea72d1811469e482513dda2ceb1ea/build-end.log
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
...ffi-0003-Make-thread-support-conditionnal.patch | 73 ++++++++++++++++++++
1 file changed, 73 insertions(+)
create mode 100644 package/libffi/libffi-0003-Make-thread-support-conditionnal.patch
diff --git a/package/libffi/libffi-0003-Make-thread-support-conditionnal.patch b/package/libffi/libffi-0003-Make-thread-support-conditionnal.patch
new file mode 100644
index 0000000..90d98d6
--- /dev/null
+++ b/package/libffi/libffi-0003-Make-thread-support-conditionnal.patch
@@ -0,0 +1,73 @@
+From a7f6342120060564a829704cceb843e53e0b34a9 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 17 Nov 2012 18:44:16 +0100
+Subject: [PATCH 3/3] Make thread support conditionnal
+
+When libffi is linked against a C library that does not have thread
+support, it is not necessary to use a mutex to protect global
+variables, since the application calling libffi cannot be
+multi-threaded.
+
+Therefore, make the libffi thread support conditionnal: when we're
+building against uClibc with no thread support, don't use the
+pthread_mutex.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ src/closures.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/closures.c b/src/closures.c
+index 1b37827..3d151f6 100644
+--- a/src/closures.c
++++ b/src/closures.c
+@@ -70,7 +70,10 @@
+
+ # elif FFI_MMAP_EXEC_WRIT /* !FFI_EXEC_TRAMPOLINE_TABLE */
+
++#if defined(__UCLIBC__) && !defined(__HAS_NO_THREADS__)
+ #define USE_LOCKS 1
++#endif
++
+ #define USE_DL_PREFIX 1
+ #ifdef __GNUC__
+ #ifndef USE_BUILTIN_FFS
+@@ -116,7 +119,10 @@
+ #include <mntent.h>
+ #endif /* HAVE_MNTENT */
+ #include <sys/param.h>
++
++#if defined(__UCLIBC__) && !defined(__HAS_NO_THREADS__)
+ #include <pthread.h>
++#endif
+
+ /* We don't want sys/mman.h to be included after we redefine mmap and
+ dlmunmap. */
+@@ -214,8 +220,10 @@ static int dlmunmap(void *, size_t);
+
+ #if !(defined(X86_WIN32) || defined(X86_WIN64) || defined(__OS2__)) || defined (__CYGWIN__) || defined(__INTERIX)
+
++#if defined(__UCLIBC__) && !defined(__HAS_NO_THREADS__)
+ /* A mutex used to synchronize access to *exec* variables in this file. */
+ static pthread_mutex_t open_temp_exec_file_mutex = PTHREAD_MUTEX_INITIALIZER;
++#endif
+
+ /* A file descriptor of a temporary file from which we'll map
+ executable pages. */
+@@ -473,9 +481,13 @@ dlmmap (void *start, size_t length, int prot,
+
+ if (execsize == 0 || execfd == -1)
+ {
++#if defined(__UCLIBC__) && !defined(__HAS_NO_THREADS__)
+ pthread_mutex_lock (&open_temp_exec_file_mutex);
++#endif
+ ptr = dlmmap_locked (start, length, prot, flags, offset);
++#if defined(__UCLIBC__) && !defined(__HAS_NO_THREADS__)
+ pthread_mutex_unlock (&open_temp_exec_file_mutex);
++#endif
+
+ return ptr;
+ }
+--
+1.7.9.5
+
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 08/10] php: fix C++ link issue
2012-11-17 22:23 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (6 preceding siblings ...)
2012-11-17 22:24 ` [Buildroot] [PATCH 07/10] libffi: make thread support optional Thomas Petazzoni
@ 2012-11-17 22:24 ` Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 09/10] attr: fix static build Thomas Petazzoni
` (2 subsequent siblings)
10 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2012-11-17 22:24 UTC (permalink / raw)
To: buildroot
The intl module is implemented in C++, but PHP fails to use g++ as the
compiler for the final link. As a workaround, tell it to link
with libstdc++.
Fixes:
http://autobuild.buildroot.org/results/13eefdf2121fa1aea7a844bbed8b6cbce3b45996/build-end.log
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/php/php.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/package/php/php.mk b/package/php/php.mk
index 6ac9f29..0dfb6db 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -102,6 +102,10 @@ endif
ifeq ($(BR2_PACKAGE_PHP_EXT_INTL),y)
PHP_CONF_OPT += --enable-intl --with-icu-dir=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += icu
+ # The intl module is implemented in C++, but PHP fails to use
+ # g++ as the compiler for the final link. As a workaround,
+ # tell it to link libstdc++.
+ PHP_CONF_ENV += EXTRA_LIBS="-lstdc++"
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 09/10] attr: fix static build
2012-11-17 22:23 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (7 preceding siblings ...)
2012-11-17 22:24 ` [Buildroot] [PATCH 08/10] php: fix C++ link issue Thomas Petazzoni
@ 2012-11-17 22:24 ` Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 10/10] dbus: uses fork(), requires MMU Thomas Petazzoni
2012-11-17 22:54 ` [Buildroot] [pull request] Pull request for branch misc-fixes Peter Korsgaard
10 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2012-11-17 22:24 UTC (permalink / raw)
To: buildroot
Fixes:
http://autobuild.buildroot.org/results/58a3d4113172813183d43fddc1248b35bd0c4994/build-end.log
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
...r-0001-attr-Fix-static-build-installation.patch | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 package/attr/attr-0001-attr-Fix-static-build-installation.patch
diff --git a/package/attr/attr-0001-attr-Fix-static-build-installation.patch b/package/attr/attr-0001-attr-Fix-static-build-installation.patch
new file mode 100644
index 0000000..ed51dbb
--- /dev/null
+++ b/package/attr/attr-0001-attr-Fix-static-build-installation.patch
@@ -0,0 +1,30 @@
+From 1d510e6049e7c7cb7ed4e87780b2c1a997d47b64 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 17 Nov 2012 19:36:39 +0100
+Subject: [PATCH] attr: Fix static build installation
+
+When doing a static build the .lai file is not created, so do not try
+to install it.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ include/buildmacros | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/include/buildmacros b/include/buildmacros
+index ab89182..d81e62b 100644
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -98,8 +98,7 @@ endif
+
+ INSTALL_LTLIB_STATIC = \
+ cd $(TOPDIR)/$(LIBNAME)/.libs; \
+- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
+- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR)
++ ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR);
+
+ INSTALL_MAN = \
+ @for d in $(MAN_PAGES); do \
+--
+1.7.9.5
+
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 10/10] dbus: uses fork(), requires MMU
2012-11-17 22:23 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (8 preceding siblings ...)
2012-11-17 22:24 ` [Buildroot] [PATCH 09/10] attr: fix static build Thomas Petazzoni
@ 2012-11-17 22:24 ` Thomas Petazzoni
2012-11-17 22:54 ` [Buildroot] [pull request] Pull request for branch misc-fixes Peter Korsgaard
10 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2012-11-17 22:24 UTC (permalink / raw)
To: buildroot
In order to solve
http://autobuild.buildroot.org/results/34f6843137efda20626af72714c110280ec577d7/build-end.log,
this patch makes the D-Bus package as well as all the packages that
select the D-Bus package 'depends on BR2_USE_MMU'.
In addition, for the specific case of gvfs, the missing
BR2_TOOLCHAIN_HAS_THREADS dependency is added (threads are required by
D-Bus, so they are also required by gvfs which selects D-Bus).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/bluez_utils/Config.in | 1 +
package/connman/Config.in | 1 +
package/dbus/Config.in | 2 ++
package/efl/libedbus/Config.in | 1 +
package/gvfs/Config.in | 2 ++
package/network-manager/Config.in | 1 +
package/ofono/Config.in | 1 +
package/qt/Config.in | 1 +
package/samba/Config.in | 1 +
package/systemd/Config.in | 1 +
system/Config.in | 1 +
11 files changed, 13 insertions(+)
diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index c06f8cd..7ca23fc 100644
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_BLUEZ_UTILS
depends on !BR2_avr32
depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib
+ depends on BR2_USE_MMU # dbus
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_LIBGLIB2
help
diff --git a/package/connman/Config.in b/package/connman/Config.in
index b67b540..93f9ab5 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -8,6 +8,7 @@ config BR2_PACKAGE_CONNMAN
depends on BR2_USE_WCHAR # libglib2 and gnutls
depends on BR2_INET_IPV6
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+ depends on BR2_USE_MMU # dbus
help
The Connection Manager (ConnMan) project provides a daemon for
managing internet connections within embedded devices running
diff --git a/package/dbus/Config.in b/package/dbus/Config.in
index 2b04e94..62f3eee 100644
--- a/package/dbus/Config.in
+++ b/package/dbus/Config.in
@@ -1,6 +1,8 @@
config BR2_PACKAGE_DBUS
bool "dbus"
depends on BR2_TOOLCHAIN_HAS_THREADS
+ # uses fork()
+ depends on BR2_USE_MMU
help
The D-Bus message bus system.
diff --git a/package/efl/libedbus/Config.in b/package/efl/libedbus/Config.in
index 985939e..9b57592 100644
--- a/package/efl/libedbus/Config.in
+++ b/package/efl/libedbus/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBEDBUS
select BR2_PACKAGE_LIBECORE
select BR2_PACKAGE_DBUS
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+ depends on BR2_USE_MMU # dbus
help
E_Dbus is a set of wrappers around D-Bus APIs so they can be
easily used by EFL applications, automatically providing
diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in
index 87f9a03..e0a945e 100644
--- a/package/gvfs/Config.in
+++ b/package/gvfs/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_GVFS
bool "gvfs"
depends on BR2_LARGEFILE
depends on BR2_USE_WCHAR # glib2
+ depends on BR2_USE_MMU # dbus
+ depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_SHARED_MIME_INFO
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index 3f01fef..e2324d6 100644
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_NETWORK_MANAGER
depends on BR2_LARGEFILE # acl
depends on BR2_USE_WCHAR # libglib2 and gnutls
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+ depends on BR2_USE_MMU # dbus
select BR2_PACKAGE_DBUS_GLIB
select BR2_PACKAGE_UDEV
select BR2_PACKAGE_UDEV_ALL_EXTRAS
diff --git a/package/ofono/Config.in b/package/ofono/Config.in
index 74c8b53..6248544 100644
--- a/package/ofono/Config.in
+++ b/package/ofono/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_OFONO
bool "ofono"
depends on BR2_USE_WCHAR # gettext/libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+ depends on BR2_USE_MMU # dbus
select BR2_PACKAGE_LIBCAP_NG
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_LIBGLIB2
diff --git a/package/qt/Config.in b/package/qt/Config.in
index b99bf4c..fdbb598 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -286,6 +286,7 @@ config BR2_PACKAGE_QT_DBUS
bool "DBus Module"
select BR2_PACKAGE_DBUS
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+ depends on BR2_USE_MMU # dbus
help
Build the Qt DBus module.
diff --git a/package/samba/Config.in b/package/samba/Config.in
index b4028b1..fedbccd 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -233,6 +233,7 @@ config BR2_PACKAGE_SAMBA_AVAHI
default y
depends on BR2_PACKAGE_AVAHI_DAEMON
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+ depends on BR2_USE_MMU # dbus
select BR2_PACKAGE_DBUS
help
Include support for avahi
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 0e7fc39..86ab2cf 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_SYSTEMD
depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
depends on BR2_INET_IPV6
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
+ depends on BR2_USE_MMU # dbus
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_LIBCAP
help
diff --git a/system/Config.in b/system/Config.in
index 10c9d9d..4d5ab00 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -56,6 +56,7 @@ config BR2_INIT_SYSTEMD
depends on BR2_INET_IPV6
depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_USE_MMU
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_SYSTEMD
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 07/10] libffi: make thread support optional
2012-11-17 22:24 ` [Buildroot] [PATCH 07/10] libffi: make thread support optional Thomas Petazzoni
@ 2012-11-17 22:46 ` Peter Korsgaard
0 siblings, 0 replies; 13+ messages in thread
From: Peter Korsgaard @ 2012-11-17 22:46 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Fixes:
Thomas> http://autobuild.buildroot.org/results/7ee57d01917ea72d1811469e482513dda2ceb1ea/build-end.log
Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> ---
Thomas> ...ffi-0003-Make-thread-support-conditionnal.patch | 73 ++++++++++++++++++++
Thomas> 1 file changed, 73 insertions(+)
Thomas> create mode 100644 package/libffi/libffi-0003-Make-thread-support-conditionnal.patch
Thomas> diff --git a/package/libffi/libffi-0003-Make-thread-support-conditionnal.patch b/package/libffi/libffi-0003-Make-thread-support-conditionnal.patch
Thomas> new file mode 100644
Thomas> index 0000000..90d98d6
Thomas> --- /dev/null
Thomas> +++ b/package/libffi/libffi-0003-Make-thread-support-conditionnal.patch
Thomas> @@ -0,0 +1,73 @@
Thomas> +From a7f6342120060564a829704cceb843e53e0b34a9 Mon Sep 17 00:00:00 2001
Thomas> +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> +Date: Sat, 17 Nov 2012 18:44:16 +0100
Thomas> +Subject: [PATCH 3/3] Make thread support conditionnal
Thomas> +
Thomas> +When libffi is linked against a C library that does not have thread
Thomas> +support, it is not necessary to use a mutex to protect global
Thomas> +variables, since the application calling libffi cannot be
Thomas> +multi-threaded.
Thomas> +
Thomas> +Therefore, make the libffi thread support conditionnal: when we're
Thomas> +building against uClibc with no thread support, don't use the
Thomas> +pthread_mutex.
Thomas> +
Thomas> +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas> +---
Thomas> + src/closures.c | 12 ++++++++++++
Thomas> + 1 file changed, 12 insertions(+)
Thomas> +
Thomas> +diff --git a/src/closures.c b/src/closures.c
Thomas> +index 1b37827..3d151f6 100644
Thomas> +--- a/src/closures.c
Thomas> ++++ b/src/closures.c
Thomas> +@@ -70,7 +70,10 @@
Thomas> +
Thomas> + # elif FFI_MMAP_EXEC_WRIT /* !FFI_EXEC_TRAMPOLINE_TABLE */
Thomas> +
Thomas> ++#if defined(__UCLIBC__) && !defined(__HAS_NO_THREADS__)
Thomas> + #define USE_LOCKS 1
Thomas> ++#endif
Ehh, what about glibc?
Shouldn't it be !__UCLIBC__ || !__HAS_NO_THREADS__ ?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [pull request] Pull request for branch misc-fixes
2012-11-17 22:23 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (9 preceding siblings ...)
2012-11-17 22:24 ` [Buildroot] [PATCH 10/10] dbus: uses fork(), requires MMU Thomas Petazzoni
@ 2012-11-17 22:54 ` Peter Korsgaard
10 siblings, 0 replies; 13+ messages in thread
From: Peter Korsgaard @ 2012-11-17 22:54 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> The following changes since commit ee3a96137b6cbb8f970c540c61f75300a44ea803:
Thomas> lua-msgpack-native: fix fetch (2012-11-17 10:15:24 +0100)
Committed everything except the libffi one, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2012-11-17 22:54 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-17 22:23 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
2012-11-17 22:23 ` [Buildroot] [PATCH 01/10] python: use default configure commands to get shared build Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 02/10] libxml2: add support for building host library with python support Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 03/10] mesa3d: requires host-libxml2 and host-python to generate some files Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 04/10] libatomic_ops: bump to version 7.2 Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 05/10] gnutls: fix build failure due to non-existing gets in recent C libraries Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 06/10] gsl: fix build on !i386 uClibc Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 07/10] libffi: make thread support optional Thomas Petazzoni
2012-11-17 22:46 ` Peter Korsgaard
2012-11-17 22:24 ` [Buildroot] [PATCH 08/10] php: fix C++ link issue Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 09/10] attr: fix static build Thomas Petazzoni
2012-11-17 22:24 ` [Buildroot] [PATCH 10/10] dbus: uses fork(), requires MMU Thomas Petazzoni
2012-11-17 22:54 ` [Buildroot] [pull request] Pull request for branch misc-fixes 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.