Compare commits
111 Commits
2014.02-rc
...
2014.02
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a6cfaea44e | ||
|
|
132cf723ec | ||
|
|
929f371cb0 | ||
|
|
020047730b | ||
|
|
1ddf44a3ab | ||
|
|
1f5f26be95 | ||
|
|
66a70b62b0 | ||
|
|
5f623e4696 | ||
|
|
e7bc24338a | ||
|
|
a957e1b265 | ||
|
|
de62a1ab61 | ||
|
|
40089283e9 | ||
|
|
d1284c5022 | ||
|
|
29e583388f | ||
|
|
5bdc76ee23 | ||
|
|
179266d292 | ||
|
|
0127a1cc5a | ||
|
|
666addf1bc | ||
|
|
a2842c7136 | ||
|
|
6e048ce0c7 | ||
|
|
e33019aaa0 | ||
|
|
5263aa681a | ||
|
|
bd7b402fb1 | ||
|
|
78c3a32c75 | ||
|
|
88b76e2649 | ||
|
|
3324f4e8b6 | ||
|
|
3b38a1e6bb | ||
|
|
8c5156cce0 | ||
|
|
7e50574965 | ||
|
|
e722f7cc23 | ||
|
|
98f7e12c50 | ||
|
|
744c215a0a | ||
|
|
de4f1bb8fc | ||
|
|
51b387b99b | ||
|
|
70d534262c | ||
|
|
8ae7838c70 | ||
|
|
4d1216901f | ||
|
|
63d8bb3994 | ||
|
|
ed73d1d2e3 | ||
|
|
b7740b32f6 | ||
|
|
4a270de1e3 | ||
|
|
a42efd0859 | ||
|
|
ec7c940a3b | ||
|
|
da02c35278 | ||
|
|
a8da3cd61a | ||
|
|
848c5b9480 | ||
|
|
46831ea58a | ||
|
|
fc82f8df85 | ||
|
|
7cbb476661 | ||
|
|
02b14d55ab | ||
|
|
6d2071a2b7 | ||
|
|
5e26da4673 | ||
|
|
3883823614 | ||
|
|
08ad8a7c04 | ||
|
|
ba4146c37c | ||
|
|
43f25ee055 | ||
|
|
e78cc3af51 | ||
|
|
2f886ee34a | ||
|
|
9ea28e8a43 | ||
|
|
9cab58b69e | ||
|
|
0b100de2cf | ||
|
|
f4b54ed184 | ||
|
|
8bb561444b | ||
|
|
088ed8dcbb | ||
|
|
5b1edc6490 | ||
|
|
108952af0a | ||
|
|
6c1ee14b29 | ||
|
|
39a0fa4b0d | ||
|
|
87d6d0d0f3 | ||
|
|
c3bb6e0b43 | ||
|
|
5e986624b2 | ||
|
|
9520a56810 | ||
|
|
ffd7a00aef | ||
|
|
8d911f9b7b | ||
|
|
f895a67968 | ||
|
|
cb7c12f58c | ||
|
|
70ee9fcdfc | ||
|
|
a9baea4345 | ||
|
|
ff6000507a | ||
|
|
0a2850104b | ||
|
|
5ddfe76889 | ||
|
|
4a9eb20de8 | ||
|
|
50c33ad125 | ||
|
|
35787b822d | ||
|
|
a524731012 | ||
|
|
1de64ec8c0 | ||
|
|
5f5e5f2919 | ||
|
|
f0862592b3 | ||
|
|
5155a8bd1c | ||
|
|
8d44671866 | ||
|
|
eda5dd1cee | ||
|
|
060623cfed | ||
|
|
1963bc815d | ||
|
|
a1451719df | ||
|
|
b57b69cd65 | ||
|
|
6080b2228c | ||
|
|
1889207631 | ||
|
|
f7d43f93bb | ||
|
|
b88f2f6159 | ||
|
|
1fd1fe744e | ||
|
|
0cb2b158d4 | ||
|
|
c2d4af6e03 | ||
|
|
faed40cf1d | ||
|
|
045651e253 | ||
|
|
777f3b56be | ||
|
|
ffeda5e429 | ||
|
|
b536ee6069 | ||
|
|
5010bdcd11 | ||
|
|
d8d164b52b | ||
|
|
52eeb04c76 | ||
|
|
8797a8cb58 |
36
CHANGES
36
CHANGES
@@ -1,3 +1,39 @@
|
||||
2014.02, Released February 27th, 2014
|
||||
|
||||
Minor fixes.
|
||||
|
||||
Updated/fixed packages: cegui06, cppdb, e2fsprogs, gcc, gdb,
|
||||
gst1-plugins-bad, gstreamer, gstreamer1, haserl, imagemagick,
|
||||
libpng, libxml2, lua, luajit, luarock, ncftp, openswan,
|
||||
pcsc-lite, qt5connectivity, ramsmp, strongswan, vlc
|
||||
|
||||
Issues resolved (http://bugs.uclibc.org):
|
||||
|
||||
#6938: mkuser script generates wrong password for new user in..
|
||||
|
||||
2014.02-rc3, Released February 25th, 2014
|
||||
|
||||
Minor fixes.
|
||||
|
||||
Updated/fixed packages: aiccu, ala-lib, alsa-utils, binutils,
|
||||
cairo, coreutils, dhcpcd, distcc, efl, evas, iputils, gdb,
|
||||
gpsd, gst-fsl-plugins, icu, libcec, libcgi, libplayer,
|
||||
libsecret, libsepol, libsigsegv, libtool, libv4l,
|
||||
linux-headers, matchbox-lib, mpg123, ncftp, opencv, pcmanfm,
|
||||
pixman, pv, qt, rt-tests, sawman, sconeserver, sdl, thrift,
|
||||
tvheadend, util-linux, webkit, xscreensaver
|
||||
|
||||
Issues resolved (http://bugs.uclibc.org):
|
||||
|
||||
#4706: Removing .stamp_target_installed does not trigger...
|
||||
#5030: busybox built fails if we use an override src dir...
|
||||
#5420: Dbus and /var/run management
|
||||
#5768: Not able to build ALSA-Lib for static build
|
||||
#5774: Not able to build ALSA-Utils for static build
|
||||
#6542: external python modules fail to compile to pyc if...
|
||||
#6764: Support for kernel signed modules
|
||||
#6794: Busybox compiled from buildroot hangs on pass from...
|
||||
|
||||
2014.02-rc2, Released February 20th, 2014
|
||||
|
||||
Fixes all over the tree. Static linking / nommu fixes and
|
||||
|
||||
@@ -173,7 +173,7 @@ if !BR2_PRIMARY_SITE_ONLY
|
||||
|
||||
config BR2_BACKUP_SITE
|
||||
string "Backup download site"
|
||||
default "http://sources.buildroot.net/"
|
||||
default "http://sources.buildroot.net"
|
||||
help
|
||||
Backup site to download from. If this option is set then buildroot
|
||||
will fall back to download package sources from here if the
|
||||
@@ -181,7 +181,7 @@ config BR2_BACKUP_SITE
|
||||
|
||||
config BR2_KERNEL_MIRROR
|
||||
string "Kernel.org mirror"
|
||||
default "http://www.kernel.org/pub/"
|
||||
default "http://www.kernel.org/pub"
|
||||
help
|
||||
kernel.org is mirrored on a number of servers around the world.
|
||||
The following allows you to select your preferred mirror.
|
||||
|
||||
19
Makefile
19
Makefile
@@ -25,7 +25,7 @@
|
||||
#--------------------------------------------------------------
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION:=2014.02-rc2
|
||||
export BR2_VERSION:=2014.02
|
||||
|
||||
# Check for minimal make version (note: this check will break at make 10.x)
|
||||
MIN_MAKE_VERSION=3.81
|
||||
@@ -119,6 +119,11 @@ ifeq ($(BR2_EXTERNAL),)
|
||||
override BR2_EXTERNAL = support/dummy-external
|
||||
$(shell rm -f $(BR2_EXTERNAL_FILE))
|
||||
else
|
||||
_BR2_EXTERNAL = $(shell cd $(BR2_EXTERNAL) >/dev/null 2>&1 && pwd)
|
||||
ifeq ($(_BR2_EXTERNAL),)
|
||||
$(error BR2_EXTERNAL='$(BR2_EXTERNAL)' does not exist, relative to $(TOPDIR))
|
||||
endif
|
||||
override BR2_EXTERNAL := $(_BR2_EXTERNAL)
|
||||
$(shell echo BR2_EXTERNAL ?= $(BR2_EXTERNAL) > $(BR2_EXTERNAL_FILE))
|
||||
endif
|
||||
|
||||
@@ -131,7 +136,7 @@ endif
|
||||
|
||||
# Need that early, before we scan packages
|
||||
# Avoids doing the $(or...) everytime
|
||||
BR2_GRAPH_OUT := $(or $(GRAPH_OUT),pdf)
|
||||
_BR2_GRAPH_OUT := $(or $(BR2_GRAPH_OUT),pdf)
|
||||
|
||||
BUILD_DIR:=$(BASE_DIR)/build
|
||||
STAMP_DIR:=$(BASE_DIR)/stamps
|
||||
@@ -646,18 +651,18 @@ graph-build: $(O)/build/build-time.log
|
||||
@install -d $(O)/graphs
|
||||
$(foreach o,name build duration,./support/scripts/graph-build-time \
|
||||
--type=histogram --order=$(o) --input=$(<) \
|
||||
--output=$(O)/graphs/build.hist-$(o).$(BR2_GRAPH_OUT) \
|
||||
$(if $(GRAPH_ALT),--alternate-colors)$(sep))
|
||||
--output=$(O)/graphs/build.hist-$(o).$(_BR2_GRAPH_OUT) \
|
||||
$(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep))
|
||||
$(foreach t,packages steps,./support/scripts/graph-build-time \
|
||||
--type=pie-$(t) --input=$(<) \
|
||||
--output=$(O)/graphs/build.pie-$(t).$(BR2_GRAPH_OUT) \
|
||||
$(if $(GRAPH_ALT),--alternate-colors)$(sep))
|
||||
--output=$(O)/graphs/build.pie-$(t).$(_BR2_GRAPH_OUT) \
|
||||
$(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep))
|
||||
|
||||
graph-depends:
|
||||
@$(INSTALL) -d $(O)/graphs
|
||||
@cd "$(CONFIG_DIR)"; \
|
||||
$(TOPDIR)/support/scripts/graph-depends \
|
||||
|dot -T$(BR2_GRAPH_OUT) -o $(O)/graphs/$(@).$(BR2_GRAPH_OUT)
|
||||
|dot -T$(_BR2_GRAPH_OUT) -o $(O)/graphs/$(@).$(_BR2_GRAPH_OUT)
|
||||
|
||||
else # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
|
||||
|
||||
|
||||
@@ -6,27 +6,27 @@
|
||||
|
||||
<p>
|
||||
|
||||
The latest stable release is <b>2013.11</b>, which can be downloaded
|
||||
The latest stable release is <b>2014.02</b>, which can be downloaded
|
||||
here:<p>
|
||||
|
||||
<a href="/downloads/buildroot-2013.11.tar.gz">buildroot-2013.11.tar.gz</a>
|
||||
(<a href="/downloads/buildroot-2013.11.tar.gz.sign">PGP signature</a>)
|
||||
<a href="/downloads/buildroot-2014.02.tar.gz">buildroot-2014.02.tar.gz</a>
|
||||
(<a href="/downloads/buildroot-2014.02.tar.gz.sign">PGP signature</a>)
|
||||
or
|
||||
<a href="/downloads/buildroot-2013.11.tar.bz2">buildroot-2013.11.tar.bz2</a>
|
||||
(<a href="/downloads/buildroot-2013.11.tar.bz2.sign">PGP signature</a>).
|
||||
<a href="/downloads/buildroot-2014.02.tar.bz2">buildroot-2014.02.tar.bz2</a>
|
||||
(<a href="/downloads/buildroot-2014.02.tar.bz2.sign">PGP signature</a>).
|
||||
|
||||
<p>
|
||||
|
||||
The latest release candidate is <b>2014.02-rc2</b>, which can be
|
||||
<!--
|
||||
The latest release candidate is <b>2014.02-rc3</b>, which can be
|
||||
downloaded here:<p>
|
||||
|
||||
<a href="/downloads/buildroot-2014.02-rc2.tar.gz">buildroot-2014.02-rc2.tar.gz</a>
|
||||
(<a href="/downloads/buildroot-2014.02-rc2.tar.gz.sign">PGP signature</a>)
|
||||
<a href="/downloads/buildroot-2014.02-rc3.tar.gz">buildroot-2014.02-rc3.tar.gz</a>
|
||||
(<a href="/downloads/buildroot-2014.02-rc3.tar.gz.sign">PGP signature</a>)
|
||||
or
|
||||
<a href="/downloads/buildroot-2014.02-rc2.tar.bz2">buildroot-2014.02-rc2.tar.bz2</a>
|
||||
(<a href="/downloads/buildroot-2014.02-rc2.tar.bz2.sign">PGP signature</a>).
|
||||
<a href="/downloads/buildroot-2014.02-rc3.tar.bz2">buildroot-2014.02-rc3.tar.bz2</a>
|
||||
(<a href="/downloads/buildroot-2014.02-rc3.tar.bz2.sign">PGP signature</a>).
|
||||
<p>
|
||||
|
||||
-->
|
||||
This and earlier releases (and their PGP signatures) can always be downloaded from
|
||||
<a href="/downloads/">http://buildroot.net/downloads/</a>.
|
||||
|
||||
|
||||
@@ -323,5 +323,16 @@ different way, using different infrastructures:
|
||||
CMake. We cover them through a xref:cmake-package-tutorial[tutorial]
|
||||
and xref:cmake-package-reference[reference].
|
||||
|
||||
* *Makefiles for Python modules*: We have a dedicated infrastructure
|
||||
for Python modules that use either the +distutils+ or the
|
||||
+setuptools+ mechanism. We cover them through a
|
||||
xref:python-package-tutorial[tutorial] and a
|
||||
xref:python-package-reference[reference].
|
||||
|
||||
* *Makefiles for Lua modules*: We have a dedicated infrastructure for
|
||||
Lua modules available through the LuaRocks web site. We cover them
|
||||
through a xref:luarocks-package-tutorial[tutorial] and a
|
||||
xref:luarocks-package-reference[reference].
|
||||
|
||||
Further formatting details: see xref:writing-rules-mk[the writing
|
||||
rules].
|
||||
|
||||
@@ -253,7 +253,7 @@ information is (assuming the package name is +libfoo+) :
|
||||
Buildroot should download from +LIBFOO_SITE+ in addition to the main
|
||||
+LIBFOO_SOURCE+ (which usually is a tarball). Buildroot will not do
|
||||
anything with those additional files, except download files: it will
|
||||
be up to the package recipe to use them from +$(DL_DIR)+.
|
||||
be up to the package recipe to use them from +$(BR2_DL_DIR)+.
|
||||
|
||||
* +LIBFOO_SITE_METHOD+ determines the method used to fetch or copy the
|
||||
package source code. In many cases, Buildroot guesses the method
|
||||
|
||||
@@ -11,3 +11,5 @@ include::ccache-support.txt[]
|
||||
include::download-location.txt[]
|
||||
|
||||
include::package-make-target.txt[]
|
||||
|
||||
include::using-buildroot-development.txt[]
|
||||
|
||||
@@ -40,7 +40,13 @@ Or:
|
||||
$ cd /tmp/build; make O=$PWD -C path/to/buildroot
|
||||
--------------------
|
||||
|
||||
All the output files will be located under +/tmp/build+.
|
||||
All the output files will be located under +/tmp/build+. If the +O+
|
||||
path does not exist, Buildroot will create it.
|
||||
|
||||
*Note:* the +O+ path can be either an absolute or a relative path, but if it's
|
||||
passed as a relative path, it is important to note that it is interpreted
|
||||
relative to the main Buildroot source directory, *not* the current working
|
||||
directory.
|
||||
|
||||
When using out-of-tree builds, the Buildroot +.config+ and temporary
|
||||
files are also stored in the output directory. This means that you can
|
||||
@@ -48,8 +54,8 @@ safely run multiple builds in parallel using the same source tree as
|
||||
long as they use unique output directories.
|
||||
|
||||
For ease of use, Buildroot generates a Makefile wrapper in the output
|
||||
directory - so after the first run, you no longer need to pass +O=..+
|
||||
and +-C ..+, simply run (in the output directory):
|
||||
directory - so after the first run, you no longer need to pass +O=<...>+
|
||||
and +-C <...>+, simply run (in the output directory):
|
||||
|
||||
--------------------
|
||||
$ make <target>
|
||||
@@ -86,9 +92,9 @@ to +make+ or set in the environment:
|
||||
Note that the Buildroot download directory can also be set from the
|
||||
configuration interface, so through the Buildroot +.config+ file; this
|
||||
is the recommended way of setting it.
|
||||
* +GRAPH_ALT+, if set and non-empty, to use an alternate color-scheme in
|
||||
* +BR2_GRAPH_ALT+, if set and non-empty, to use an alternate color-scheme in
|
||||
build-time graphs
|
||||
* +GRAPH_OUT+ to set the filetype of generated graphs, either +pdf+ (the
|
||||
* +BR2_GRAPH_OUT+ to set the filetype of generated graphs, either +pdf+ (the
|
||||
default), or +png+.
|
||||
|
||||
An example that uses config files located in the toplevel directory and
|
||||
@@ -143,3 +149,102 @@ of an ext2 filesystem may be corrupted; or, if you have sparse files in
|
||||
your filesystem, those parts may not be all-zeroes when read back). You
|
||||
should only use sparse files when handling files on the build machine, not
|
||||
when transferring them to an actual device that will be used on the target.
|
||||
|
||||
Graphing the dependencies between packages
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
[[graph-depends]]
|
||||
|
||||
One of Buildroot's jobs is to know the dependencies between packages,
|
||||
and make sure they are built in the right order. These dependencies
|
||||
can sometimes be quite complicated, and for a given system, it is
|
||||
often not easy to understand why such or such package was brought into
|
||||
the build by Buildroot.
|
||||
|
||||
In order to help understanding the dependencies, and therefore better
|
||||
understand what is the role of the different components in your
|
||||
embedded Linux system, Buildroot is capable of generating dependency
|
||||
graphs.
|
||||
|
||||
To generate a dependency graph of the full system you have compiled,
|
||||
simply run:
|
||||
|
||||
------------------------
|
||||
make graph-depends
|
||||
------------------------
|
||||
|
||||
You will find the generated graph in
|
||||
+output/graphs/graph-depends.pdf+.
|
||||
|
||||
If your system is quite large, the dependency graph may be too complex
|
||||
and difficult to read. It is therefore possible to generate the
|
||||
dependency graph just for a given package:
|
||||
|
||||
------------------------
|
||||
make <pkg>-graph-depends
|
||||
------------------------
|
||||
|
||||
You will find the generated graph in
|
||||
+output/graph/<pkg>-graph-depends.pdf+.
|
||||
|
||||
Note that the dependency graphs are generated using the +dot+ tool
|
||||
from the _Graphviz_ project, which you must have installed on your
|
||||
system to use this feature. In most distributions, it is available as
|
||||
the +graphviz+ package.
|
||||
|
||||
By default, the dependency graphs are generated in the PDF
|
||||
format. However, by passing the +BR2_GRAPH_OUT+ environment variable, you
|
||||
can switch to other output formats, such as PNG, PostScript or
|
||||
SVG. All formats supported by the +-T+ option of the +dot+ tool are
|
||||
supported.
|
||||
|
||||
--------------------------------
|
||||
BR2_GRAPH_OUT=svg make graph-depends
|
||||
--------------------------------
|
||||
|
||||
Graphing the build duration
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
[[graph-duration]]
|
||||
|
||||
When the build of a system takes a long time, it is sometimes useful
|
||||
to be able to understand which packages are the longest to build, to
|
||||
see if anything can be done to speed up the build. In order to help
|
||||
such build time analysis, Buildroot collects the build time of each
|
||||
step of each package, and allows to generate graphs from this data.
|
||||
|
||||
To generate the build time graph after a build, run:
|
||||
|
||||
----------------
|
||||
make graph-build
|
||||
----------------
|
||||
|
||||
This will generate a set of files in +output/graphs+ :
|
||||
|
||||
* +build.hist-build.pdf+, a histogram of the build time for each
|
||||
package, ordered in the build order.
|
||||
|
||||
* +build.hist-duration.pdf+, a histogram of the build time for each
|
||||
package, ordered by duration (longest first)
|
||||
|
||||
* +build.hist-name.pdf+, a histogram of the build time for each
|
||||
package, order by package name.
|
||||
|
||||
* +build.pie-packages.pdf+, a pie chart of the build time per package
|
||||
|
||||
* +build.pie-steps.pdf+, a pie chart of the global time spent in each
|
||||
step of the packages build process.
|
||||
|
||||
This +graph-build+ target requires the Python Matplotlib and Numpy
|
||||
libraries to be installed (+python-matplotlib+ and +python-numpy+ on
|
||||
most distributions), and also the +argparse+ module if you're using a
|
||||
Python version older than 2.7 (+python-argparse+ on most
|
||||
distributions).
|
||||
|
||||
By default, the output format for the graph is PDF, but a different
|
||||
format can be selected using the +BR2_GRAPH_OUT+ environment variable. The
|
||||
only other format supported is PNG:
|
||||
|
||||
----------------
|
||||
BR2_GRAPH_OUT=png make graph-build
|
||||
----------------
|
||||
|
||||
@@ -68,12 +68,10 @@ The _internal toolchain backend_ is the backend where Buildroot builds
|
||||
by itself a cross-compilation toolchain, before building the userspace
|
||||
applications and libraries for your target embedded system.
|
||||
|
||||
This backend is the historical backend of Buildroot, and has been
|
||||
limited for a long time to the usage of the
|
||||
http://www.uclibc.org[uClibc C library]. Support for the _eglibc_ C
|
||||
library has been added in 2013 and is at this point considered
|
||||
experimental. See the _External toolchain backend_ for another
|
||||
solution to use _glibc_ or _eglibc_.
|
||||
This backend supports several C libraries:
|
||||
http://www.uclibc.org[uClibc], the
|
||||
http://www.gnu.org/software/libc/libc.html[glibc] and
|
||||
http://www.eglibc.org[eglibc].
|
||||
|
||||
Once you have selected this backend, a number of options appear. The
|
||||
most important ones allow to:
|
||||
@@ -96,18 +94,7 @@ most important ones allow to:
|
||||
the C library might be using interfaces that are not provided by
|
||||
your Linux kernel.
|
||||
|
||||
* Change the version and the configuration of the uClibc C library
|
||||
(if uClibc is selected). The default options are usually
|
||||
fine. However, if you really need to specifically customize the
|
||||
configuration of your uClibc C library, you can pass a specific
|
||||
configuration file here. Or alternatively, you can run the +make
|
||||
uclibc-menuconfig+ command to get access to uClibc's configuration
|
||||
interface. Note that all packages in Buildroot are tested against
|
||||
the default uClibc configuration bundled in Buildroot: if you
|
||||
deviate from this configuration by removing features from uClibc,
|
||||
some packages may no longer build.
|
||||
|
||||
* Change the version of the GCC compiler and binutils.
|
||||
* Change the version of the GCC compiler, binutils and the C library.
|
||||
|
||||
* Select a number of toolchain options (uClibc only): whether the
|
||||
toolchain should have largefile support (i.e support for files
|
||||
@@ -118,7 +105,12 @@ most important ones allow to:
|
||||
libraries visible in Buildroot menus will change: many applications
|
||||
and libraries require certain toolchain options to be enabled. Most
|
||||
packages show a comment when a certain toolchain option is required
|
||||
to be able to enable those packages.
|
||||
to be able to enable those packages. If needed, you can further
|
||||
refine the uClibc configuration by running +make
|
||||
uclibc-menuconfig+. Note however that all packages in Buildroot are
|
||||
tested against the default uClibc configuration bundled in
|
||||
Buildroot: if you deviate from this configuration by removing
|
||||
features from uClibc, some packages may no longer build.
|
||||
|
||||
It is worth noting that whenever one of those options is modified,
|
||||
then the entire toolchain and system must be rebuilt. See
|
||||
@@ -146,10 +138,9 @@ http://www.linaro.org[Linaro] for ARM,
|
||||
http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/[Sourcery
|
||||
CodeBench] for ARM, x86, x86-64, PowerPC, MIPS and SuperH,
|
||||
https://blackfin.uclinux.org/gf/project/toolchain[Blackfin toolchains
|
||||
from ADI], http://git.xilinx.com/[Xilinx toolchains for Microblaze],
|
||||
etc.) and is capable of downloading them automatically, or it can be
|
||||
pointed to a custom toolchain, either available for download or
|
||||
installed locally.
|
||||
from Analog Devices], etc.) and is capable of downloading them
|
||||
automatically, or it can be pointed to a custom toolchain, either
|
||||
available for download or installed locally.
|
||||
|
||||
Then, you have three solutions to use an external toolchain:
|
||||
|
||||
@@ -168,14 +159,14 @@ Then, you have three solutions to use an external toolchain:
|
||||
toolchain.
|
||||
|
||||
* Use a completely custom external toolchain. This is particularly
|
||||
useful for toolchains generated using crosstool-NG. To do this,
|
||||
select the +Custom toolchain+ solution in the +Toolchain+ list. You
|
||||
need to fill the +Toolchain path+, +Toolchain prefix+ and +External
|
||||
toolchain C library+ options. Then, you have to tell Buildroot what
|
||||
your external toolchain supports. If your external toolchain uses
|
||||
the 'glibc' library, you only have to tell whether your toolchain
|
||||
supports C\+\+ or not and whether it has built-in RPC support. If
|
||||
your external toolchain uses the 'uClibc'
|
||||
useful for toolchains generated using crosstool-NG or with Buildroot
|
||||
itself. To do this, select the +Custom toolchain+ solution in the
|
||||
+Toolchain+ list. You need to fill the +Toolchain path+, +Toolchain
|
||||
prefix+ and +External toolchain C library+ options. Then, you have
|
||||
to tell Buildroot what your external toolchain supports. If your
|
||||
external toolchain uses the 'glibc' library, you only have to tell
|
||||
whether your toolchain supports C\+\+ or not and whether it has
|
||||
built-in RPC support. If your external toolchain uses the 'uClibc'
|
||||
library, then you have to tell Buildroot if it supports largefile,
|
||||
IPv6, RPC, wide-char, locale, program invocation, threads and
|
||||
C++. At the beginning of the execution, Buildroot will tell you if
|
||||
@@ -188,23 +179,13 @@ Buildroot itself. In general, all toolchains that support the
|
||||
'sysroot' feature should work. If not, do not hesitate to contact the
|
||||
developers.
|
||||
|
||||
We do not support toolchains from the
|
||||
http://www.denx.de/wiki/DULG/ELDK[ELDK] of Denx, for two reasons:
|
||||
|
||||
* The ELDK does not contain a pure toolchain (i.e just the compiler,
|
||||
binutils, the C and C++ libraries), but a toolchain that comes with
|
||||
a very large set of pre-compiled libraries and programs. Therefore,
|
||||
Buildroot cannot import the 'sysroot' of the toolchain, as it would
|
||||
contain hundreds of megabytes of pre-compiled libraries that are
|
||||
normally built by Buildroot.
|
||||
|
||||
* The ELDK toolchains have a completely non-standard custom mechanism
|
||||
to handle multiple library variants. Instead of using the standard
|
||||
GCC 'multilib' mechanism, the ARM ELDK uses different symbolic links
|
||||
to the compiler to differentiate between library variants (for ARM
|
||||
soft-float and ARM VFP), and the PowerPC ELDK compiler uses a
|
||||
+CROSS_COMPILE+ environment variable. This non-standard behaviour
|
||||
makes it difficult to support ELDK in Buildroot.
|
||||
We do not support toolchains or SDK generated by OpenEmbedded or
|
||||
Yocto, because these toolchains are not pure toolchains (i.e just the
|
||||
compiler, binutils, the C and C++ libraries). Instead these toolchains
|
||||
come with a very large set of pre-compiled libraries and
|
||||
programs. Therefore, Buildroot cannot import the 'sysroot' of the
|
||||
toolchain, as it would contain hundreds of megabytes of pre-compiled
|
||||
libraries that are normally built by Buildroot.
|
||||
|
||||
We also do not support using the distribution toolchain (i.e the
|
||||
gcc/binutils/C library installed by your distribution) as the
|
||||
|
||||
@@ -30,18 +30,18 @@ there is no need to pass +BR2_EXTERNAL+ at every +make+ invocation. It
|
||||
can however be changed at any time by passing a new value, and can be
|
||||
removed by passing an empty value.
|
||||
|
||||
The +BR2_EXTERNAL+ path can be either an absolute or a relative path,
|
||||
*Note:* the +BR2_EXTERNAL+ path can be either an absolute or a relative path,
|
||||
but if it's passed as a relative path, it is important to note that it
|
||||
is interpreted relatively to the main Buildroot source directory, not
|
||||
is interpreted relative to the main Buildroot source directory, *not*
|
||||
the Buildroot output directory.
|
||||
|
||||
Some examples:
|
||||
|
||||
-----
|
||||
buildroot/ $ make BR2_EXTERNAL=../foobar menuconfig
|
||||
buildroot/ $ make BR2_EXTERNAL=/path/to/foobar menuconfig
|
||||
-----
|
||||
|
||||
Starting from now on, external definitions from the +../foobar+
|
||||
Starting from now on, external definitions from the +/path/to/foobar+
|
||||
directory will be used:
|
||||
|
||||
-----
|
||||
@@ -52,7 +52,7 @@ directory will be used:
|
||||
We can switch to another external definitions directory at any time:
|
||||
|
||||
-----
|
||||
buildroot/ $ make BR2_EXTERNAL=../barfoo xconfig
|
||||
buildroot/ $ make BR2_EXTERNAL=/where/we/have/barfoo xconfig
|
||||
-----
|
||||
|
||||
Or disable the usage of external definitions:
|
||||
|
||||
@@ -111,3 +111,103 @@ directory as the new root, will most likely fail.
|
||||
If you want to run the target filesystem inside a chroot, or as an NFS
|
||||
root, then use the tarball image generated in +images/+ and extract it
|
||||
as root.
|
||||
|
||||
[[faq-no-binary-packages]]
|
||||
Why doesn't Buildroot generate binary packages (.deb, .ipkg...)?
|
||||
----------------------------------------------------------------
|
||||
|
||||
One feature that is often discussed on the Buildroot list is the
|
||||
the general topic of "package management". To summarize, the idea
|
||||
would be to add some tracking of which Buildroot package installs
|
||||
what files, with the goals of:
|
||||
|
||||
* being able to remove files installed by a package when this package
|
||||
gets unselected from the menuconfig;
|
||||
|
||||
* being able to generate binary packages (ipk or other format) that
|
||||
can be installed on the target without re-generating a new root
|
||||
filesystem image.
|
||||
|
||||
In general, most people think it is easy to do: just track which package
|
||||
installed what and remove it when the package is unselected. However, it
|
||||
is much more complicated than that:
|
||||
|
||||
* It is not only about the +target/+ directory, but also the sysroot in
|
||||
+host/usr/<tuple>/sysroot+ and the +host/+ directory itself. All files
|
||||
installed in those directories by various packages must be tracked.
|
||||
|
||||
* When a package is unselected from the configuration, it is not
|
||||
sufficient to remove just the files it installed. One must also
|
||||
remove all its reverse dependencies (i.e packages relying on it)
|
||||
and rebuild all those packages. For example, package A depends
|
||||
optionally on the OpenSSL library. Both are selected, and Buildroot
|
||||
is built. Package A is built with crypto support using OpenSSL.
|
||||
Later on, OpenSSL gets unselected from the configuration, but
|
||||
package A remains (since OpenSSL is an optional dependency, this
|
||||
is possible.) If only OpenSSL files are removed, then the files
|
||||
installed by package A are broken: they use a library that is no
|
||||
longer present on the target. Although this is technically doable,
|
||||
it adds a lot of complexity to Buildroot, which goes against the
|
||||
simplicity we try to stick to.
|
||||
|
||||
* In addition to the previous problem, there is the case where the
|
||||
optional dependency is not even known to Buildroot. For example,
|
||||
package A in version 1.0 never used OpenSSL, but in version 2.0 it
|
||||
automatically uses OpenSSL if available. If the Buildroot .mk file
|
||||
hasn't been updated to take this into account, then package A will
|
||||
not be part of the reverse dependencies of OpenSSL and will not be
|
||||
removed and rebuilt when OpenSSL is removed. For sure, the .mk file
|
||||
of package A should be fixed to mention this optional dependency,
|
||||
but in the mean time, you can have non-reproducible behaviors.
|
||||
|
||||
* The request is to also allow changes in the menuconfig to be
|
||||
applied on the output directory without having to rebuild
|
||||
everything from scratch. However, this is very difficult to achieve
|
||||
in a reliable way: what happens when the suboptions of a package
|
||||
are changed (we would have to detect this, and rebuild the package
|
||||
from scratch and potentially all its reverse dependencies), what
|
||||
happens if toolchain options are changed, etc. At the moment, what
|
||||
Buildroot does is clear and simple so its behaviour is very
|
||||
reliable and it is easy to support users. If configuration changes
|
||||
done in menuconfig are applied after the next make, then it has to
|
||||
work correctly and properly in all situations, and not have some
|
||||
bizarre corner cases. The risk is to get bug reports like "I have
|
||||
enabled package A, B and C, then ran make, then disabled package
|
||||
C and enabled package D and ran make, then re-enabled package C
|
||||
and enabled package E and then there is a build failure". Or worse
|
||||
"I did some configuration, then built, then did some changes,
|
||||
built, some more changes, built, some more changes, built, and now
|
||||
it fails, but I don't remember all the changes I did and in which
|
||||
order". This will be impossible to support.
|
||||
|
||||
For all these reasons, the conclusion is that adding tracking of
|
||||
installed files to remove them when the package is unselected, or to
|
||||
generate a repository of binary packages, is something that is very
|
||||
hard to achieve reliably and will add a lot of complexity.
|
||||
|
||||
On this matter, the Buildroot developers make this position statement:
|
||||
|
||||
* Buildroot strives to make it easy to generate a root filesystem (hence
|
||||
the name, by the way.) That is what we want to make Buildroot good at:
|
||||
building root filesystems.
|
||||
|
||||
* Buildroot is not meant to be a distribution (or rather, a distribution
|
||||
generator.) It is the opinion of most Buildroot developers that this
|
||||
is not a goal we should pursue. We believe that there are other tools
|
||||
better suited to generate a distro than Buildroot is. For example,
|
||||
http://openembedded.org/[Open Embedded], or https://openwrt.org/[openWRT],
|
||||
are such tools.
|
||||
|
||||
* We prefer to push Buildroot in a direction that makes it easy (or even
|
||||
easier) to generate complete root filesystems. This is what makes
|
||||
Buildroot stands out in the crowd (among other things, of course!)
|
||||
|
||||
* We believe that for most embedded Linux systems, binary packages are
|
||||
not necessary, and potentially harmful. When binary packages are
|
||||
used, it means that the system can be partially upgraded, which
|
||||
creates an enormous number of possible combinations of package
|
||||
versions that should be tested before doing the upgrade on the
|
||||
embedded device. On the other hand, by doing complete system
|
||||
upgrades by upgrading the entire root filesystem image at once,
|
||||
the image deployed to the embedded system is guaranteed to really
|
||||
be the one that has been tested and validated.
|
||||
|
||||
@@ -32,10 +32,12 @@ The result of the search shows the help message of the matching items.
|
||||
Not all targets are always available,
|
||||
some settings in the +.config+ file may hide some targets:
|
||||
|
||||
* +busybox-menuconfig+ and +busybox-savedefconfig+ ony work when
|
||||
+busybox+ is enabled;
|
||||
* +linux-menuconfig+ and +linux-savedefconfig+ only work when
|
||||
+linux+ is enabled;
|
||||
* +uclibc-menuconfig+ is only available when the
|
||||
Buildroot internal toolchain backend is used;
|
||||
* +uclibc-menuconfig+ is only available when the uClibc C library is
|
||||
selected in the internal toolchain backend;
|
||||
* +barebox-menuconfig+ and +barebox-savedefconfig+ only work when the
|
||||
+barebox+ bootloader is enabled.
|
||||
|
||||
|
||||
@@ -63,6 +63,11 @@ Additionally, there are some other useful make targets:
|
||||
| +show-depends+ | Displays the dependencies required to build the
|
||||
package
|
||||
|
||||
| +graph-depends+ | Generate a dependency graph of the package, in the
|
||||
context of the current Buildroot configuration. See
|
||||
xref:graph-depends[this section] for more details about dependency
|
||||
graphs.
|
||||
|
||||
| +dirclean+ | Remove the whole package build directory
|
||||
|
||||
| +rebuild+ | Re-run the compilation commands - this only makes
|
||||
|
||||
@@ -5,33 +5,82 @@
|
||||
Understanding when a full rebuild is necessary
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
A full rebuild is achieved by running:
|
||||
Buildroot does not attempt to detect what parts of the system should
|
||||
be rebuilt when the system configuration is changed through +make
|
||||
menuconfig+, +make xconfig+ or one of the other configuration
|
||||
tools. In some cases, Buildroot should rebuild the entire system, in
|
||||
some cases, only a specific subset of packages. But detecting this in
|
||||
a completely reliable manner is very difficult, and therefore the
|
||||
Buildroot developers have decided to simply not attempt to do this.
|
||||
|
||||
Instead, it is the responsibility of the user to know when a full
|
||||
rebuild is necessary. As a hint, here are a few rules of thumb that
|
||||
can help you understand how to work with Buildroot:
|
||||
|
||||
* When the target architecture configuration is changed, a complete
|
||||
rebuild is needed. Changing the architecture variant, the binary
|
||||
format or the floating point strategy for example has an impact on
|
||||
the entire system.
|
||||
|
||||
* When the toolchain configuration is changed, a complete rebuild
|
||||
generally is needed. Changing the toolchain configuration often
|
||||
involves changing the compiler version, the type of C library or
|
||||
its configuration, or some other fundamental configuration item,
|
||||
and these changes have an impact on the entire system.
|
||||
|
||||
* When an additional package is added to the configuration, a full
|
||||
rebuild is not necessarily needed. Buildroot will detect that this
|
||||
package has never been built, and will build it. However, if this
|
||||
package is a library that can optionally be used by packages that
|
||||
have already been built, Buildroot will not automatically rebuild
|
||||
those. Either you know which packages should be rebuilt, and you
|
||||
can rebuild them manually, or you should do a full rebuild. For
|
||||
example, let's suppose you have built a system with the +ctorrent+
|
||||
package, but without +openssl+. Your system works, but you realize
|
||||
you would like to have SSL support in +ctorrent+, so you enable the
|
||||
+openssl+ package in Buildroot configuration and restart the
|
||||
build. Buildroot will detect that +openssl+ should be built and
|
||||
will be build it, but it will not detect that +ctorrent+ should be
|
||||
rebuilt to benefit from +openssl+ to add OpenSSL support. You will
|
||||
either have to do a full rebuild, or rebuild +ctorrent+ itself.
|
||||
|
||||
* When a package is removed from the configuration, Buildroot does
|
||||
not do anything special. It does not remove the files installed by
|
||||
this package from the target root filesystem or from the toolchain
|
||||
_sysroot_. A full rebuild is needed to get rid of this
|
||||
package. However, generally you don't necessarily need this package
|
||||
to be removed right now: you can wait for the next lunch break to
|
||||
restart the build from scratch.
|
||||
|
||||
* When the sub-options of a package are changed, the package is not
|
||||
automatically rebuilt. After making such changes, rebuilding only
|
||||
this package is often sufficient, unless enabling the package
|
||||
sub-option adds some features to the package that are useful for
|
||||
another package which has already been built. Again, Buildroot does
|
||||
not track when a package should be rebuilt: once a package has been
|
||||
built, it is never rebuilt unless explicitly told to do so.
|
||||
|
||||
* When a change to the root filesystem skeleton is made, a full
|
||||
rebuild is needed. However, when changes to the root filesystem
|
||||
overlay, a post-build script or a post-image script are made,
|
||||
there is no need for a full rebuild: a simple +make+ invocation
|
||||
will take the changes into account.
|
||||
|
||||
Generally speaking, when you're facing a build error and you're unsure
|
||||
of the potential consequences of the configuration changes you've
|
||||
made, do a full rebuild. If you get the same build error, then you are
|
||||
sure that the error is not related to partial rebuilds of packages,
|
||||
and if this error occurs with packages from the official Buildroot, do
|
||||
not hesitate to report the problem! As your experience with Buildroot
|
||||
progresses, you will progressively learn when a full rebuild is really
|
||||
necessary, and you will save more and more time.
|
||||
|
||||
For reference, a full rebuild is achieved by running:
|
||||
|
||||
---------------
|
||||
$ make clean all
|
||||
---------------
|
||||
|
||||
In some cases, a full rebuild is mandatory:
|
||||
|
||||
* each time the toolchain properties are changed, this includes:
|
||||
|
||||
** after changing any toolchain option under the _Toolchain_ menu (if
|
||||
the internal Buildroot backend is used);
|
||||
** after running +make uclibc-menuconfig+.
|
||||
|
||||
* after removing some libraries from the package selection.
|
||||
|
||||
In some cases, a full rebuild is recommended:
|
||||
|
||||
* after adding some libraries to the package selection (otherwise,
|
||||
packages that can be optionally linked against those libraries
|
||||
won't be rebuilt, so they won't support those new available
|
||||
features).
|
||||
|
||||
In other cases, it is up to you to decide if you should run a
|
||||
full rebuild, but you should know what is impacted and understand what
|
||||
you are doing anyway.
|
||||
|
||||
[[rebuild-pkg]]
|
||||
Understanding how to rebuild packages
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
@@ -51,26 +100,25 @@ its build directory in +output/build+. Buildroot will then re-extract,
|
||||
re-configure, re-compile and re-install this package from scratch. You
|
||||
can ask buildroot to do this with the +make <package>-dirclean+ command.
|
||||
|
||||
For convenience, the special make targets
|
||||
<package>-reconfigure and <package>-rebuild repeat the configure
|
||||
resp. build steps.
|
||||
On the other hand, if you only want to restart the build process of a
|
||||
package from its compilation step, you can run +make
|
||||
<package>-rebuild+, followed by +make+ or +make <package>+. It will
|
||||
restart the compilation and installation of the package, but not from
|
||||
scratch: it basically re-executes +make+ and +make install+
|
||||
inside the package, so it will only rebuild files that changed.
|
||||
|
||||
However, if you don't want to rebuild the package completely from
|
||||
scratch, a better understanding of the Buildroot internals is
|
||||
needed. Internally, to keep track of which steps have been done and
|
||||
which steps remain to be done, Buildroot maintains stamp files (empty
|
||||
files that just tell whether this or that action has been done):
|
||||
If you want to restart the build process of a package from its
|
||||
configuration step, you can run +make <package>-reconfigure+, followed
|
||||
by +make+ or +make <package>+. It will restart the configuration,
|
||||
compilation and installation of the package.
|
||||
|
||||
* +output/build/<package>-<version>/.stamp_configured+. If removed,
|
||||
Buildroot will trigger the recompilation of the package from the
|
||||
configuration step (execution of +./configure+).
|
||||
|
||||
* +output/build/<package>-<version>/.stamp_built+. If removed,
|
||||
Buildroot will trigger the recompilation of the package from the
|
||||
compilation step (execution of +make+).
|
||||
|
||||
Note: toolchain packages use custom makefiles. Their stamp files are named
|
||||
differently.
|
||||
Internally, Buildroot creates so-called _stamp files_ to keep track of
|
||||
which build steps have been completed for each package. They are
|
||||
stored in the package build directory,
|
||||
+output/build/<package>-<version>/+ and are named
|
||||
+.stamp_<step-name>+. The commands detailed above simply manipulate
|
||||
these stamp files to force Buildroot to restart a specific set of
|
||||
steps of a package build process.
|
||||
|
||||
Further details about package special make targets are explained in
|
||||
xref:pkg-build-steps[].
|
||||
|
||||
84
docs/manual/using-buildroot-development.txt
Normal file
84
docs/manual/using-buildroot-development.txt
Normal file
@@ -0,0 +1,84 @@
|
||||
// -*- mode:doc; -*-
|
||||
// vim: set syntax=asciidoc:
|
||||
|
||||
Using Buildroot during development
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
The normal operation of Buildroot is to download a tarball, extract
|
||||
it, configure, compile and install the software component found inside
|
||||
this tarball. The source code is extracted in
|
||||
+output/build/<package>-<version>+, which is a temporary directory:
|
||||
whenever +make clean+ is used, this directory is entirely removed, and
|
||||
re-recreated at the next +make+ invocation. Even when a Git or
|
||||
Subversion repository is used as the input for the package source
|
||||
code, Buildroot creates a tarball out of it, and then behaves as it
|
||||
normally does with tarballs.
|
||||
|
||||
This behavior is well-suited when Buildroot is used mainly as an
|
||||
integration tool, to build and integrate all the components of an
|
||||
embedded Linux system. However, if one uses Buildroot during the
|
||||
development of certain components of the system, this behavior is not
|
||||
very convenient: one would instead like to make a small change to the
|
||||
source code of one package, and be able to quickly rebuild the system
|
||||
with Buildroot.
|
||||
|
||||
Making changes directly in +output/build/<package>-<version>+ is not
|
||||
an appropriate solution, because this directory is removed on +make
|
||||
clean+.
|
||||
|
||||
Therefore, Buildroot provides a specific mechanism for this use case:
|
||||
the +<pkg>_OVERRIDE_SRCDIR+ mechanism. Buildroot reads an _override_
|
||||
file, which allows the user to tell Buildroot the location of the
|
||||
source for certain packages. By default this _override_ file is named
|
||||
+local.mk+ and located in the top directory of the Buildroot source
|
||||
tree, but a different location can be specified through the
|
||||
+BR2_PACKAGE_OVERRIDE_FILE+ configuration option.
|
||||
|
||||
In this _override_ file, Buildroot expects to find lines of the form:
|
||||
|
||||
------------------
|
||||
<pkg1>_OVERRIDE_SRCDIR = /path/to/pkg1/sources
|
||||
<pkg2>_OVERRIDE_SRCDIR = /path/to/pkg2/sources
|
||||
------------------
|
||||
|
||||
For example:
|
||||
|
||||
------------------
|
||||
LINUX_OVERRIDE_SRCDIR = /home/bob/linux/
|
||||
BUSYBOX_OVERRIDE_SRCDIR = /home/bob/busybox/
|
||||
------------------
|
||||
|
||||
When Buildroot finds that for a given package, an
|
||||
+<pkg>_OVERRIDE_SRCDIR+ has been defined, it will no longer attempt to
|
||||
download, extract and patch the package. Instead, it will directly use
|
||||
the source code available in in the specified directory and +make
|
||||
clean+ will not touch this directory. This allows to point Buildroot
|
||||
to your own directories, that can be managed by Git, Subversion, or
|
||||
any other version control system. To achieve this, Buildroot will use
|
||||
_rsync_ to copy the source code of the component from the specified
|
||||
+<pkg>_OVERRIDE_SRCDIR+ to +output/build/<package>-custom/+.
|
||||
|
||||
This mechanism is best used in conjuction with the +make
|
||||
<pkg>-rebuild+ and +make <pkg>-reconfigure+ targets. A +make
|
||||
<pkg>-rebuild all+ sequence will _rsync_ the source code from
|
||||
+<pkg>_OVERRIDE_SRCDIR+ to +output/build/<package>-custom+ (thanks to
|
||||
_rsync_, only the modified files are copied), and restart the build
|
||||
process of just this package.
|
||||
|
||||
In the example of the +linux+ package above, the developer can then
|
||||
make a source code change in +/home/bob/linux+ and then run:
|
||||
|
||||
-----------------------
|
||||
make linux-rebuild all
|
||||
-----------------------
|
||||
|
||||
and in a matter of seconds gets the updated Linux kernel image in
|
||||
+output/images+. Similarly, a change can be made to the Busybox source
|
||||
code in +/home/bob/busybox+, and after:
|
||||
|
||||
-----------------------
|
||||
make busybox-rebuild all
|
||||
-----------------------
|
||||
|
||||
the root filesystem image in +output/images+ contains the updated
|
||||
Busybox.
|
||||
@@ -5,6 +5,27 @@
|
||||
<p>
|
||||
|
||||
<ul>
|
||||
<li><b>27 February 2014 -- 2014.02 released</b>
|
||||
|
||||
<p>The stable 2014.02 release is out - Thanks to everyone
|
||||
contributing and testing the release candidates. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2014.02">CHANGES</a>
|
||||
file for more details,
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2014.02.tar.bz2">2014.02 release</a>.</p>
|
||||
|
||||
<li><b>25 February 2014 -- 2014.02-rc3 released</b>
|
||||
|
||||
<p>Release candidate 3 is out with more cleanups and build fixes. See the <a
|
||||
href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2014.02-rc3">CHANGES</a>
|
||||
file for details.</p>
|
||||
|
||||
<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2014.02-rc3.tar.bz2">2014.02-rc3
|
||||
release candidate</a>, and report any problems found to the <a
|
||||
href="lists.html">mailing list</a> or <a
|
||||
href="https://bugs.uclibc.org">bug tracker</a>.</p>
|
||||
|
||||
<li><b>20 February 2014 -- 2014.02-rc2 released</b>
|
||||
|
||||
<p>Another week, another release candidate with more cleanups and
|
||||
|
||||
@@ -21,7 +21,7 @@ choice
|
||||
prompt "Kernel version"
|
||||
|
||||
config BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
bool "3.13.3"
|
||||
bool "3.13.5"
|
||||
|
||||
config BR2_LINUX_KERNEL_SAME_AS_HEADERS
|
||||
bool "Same as toolchain kernel headers"
|
||||
@@ -104,7 +104,7 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH
|
||||
|
||||
config BR2_LINUX_KERNEL_VERSION
|
||||
string
|
||||
default "3.13.3" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "3.13.5" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
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
|
||||
|
||||
@@ -362,7 +362,8 @@ source "package/jimtcl/Config.in"
|
||||
source "package/lua/Config.in"
|
||||
source "package/luainterpreter/Config.in"
|
||||
source "package/luajit/Config.in"
|
||||
if BR2_PACKAGE_HAS_LUA_INTERPRETER
|
||||
if BR2_PACKAGE_HAS_LUA_INTERPRETER && !BR2_PREFER_STATIC_LIB
|
||||
# lua modules are dynamically loaded, so not available on static builds
|
||||
menu "Lua libraries/modules"
|
||||
source "package/cgilua/Config.in"
|
||||
source "package/copas/Config.in"
|
||||
|
||||
@@ -7,6 +7,10 @@ config BR2_PACKAGE_AICCU
|
||||
# Uses dn_skipname(), only available since 0.9.33
|
||||
depends on !BR2_UCLIBC_VERSION_0_9_31 && \
|
||||
!BR2_UCLIBC_VERSION_0_9_32
|
||||
# AVR32 only has uClibc 0.9.31, so there's no way it can build
|
||||
# due to the lack of dn_skipname(), even with external
|
||||
# toolchains.
|
||||
depends on !BR2_avr32
|
||||
select BR2_PACKAGE_GNUTLS
|
||||
help
|
||||
SixXS Automatic IPv6 Connectivity Client Utility
|
||||
|
||||
57
package/alsa-lib/alsa-lib-0003-dlmisc.patch
Normal file
57
package/alsa-lib/alsa-lib-0003-dlmisc.patch
Normal file
@@ -0,0 +1,57 @@
|
||||
alsa-lib: provide dummy definitions of RTLD_* if necessary
|
||||
|
||||
The FLAT GNU toolchain (e.g. blackfin) doesn't include the dlfcn.h header
|
||||
file, so we need to guard that include. Additionally, provide dummy
|
||||
definitions for parameters RTLD_GLOBAL / RTLD_NOW which are normally
|
||||
provided by dlfcn.h.
|
||||
|
||||
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
|
||||
[Thomas: don't add separate dlmisc.h, move dummy defs to global.h]
|
||||
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
|
||||
|
||||
diff --git a/include/global.h b/include/global.h
|
||||
--- a/include/global.h
|
||||
+++ b/include/global.h
|
||||
@@ -97,6 +97,16 @@ extern struct snd_dlsym_link *snd_dlsym_
|
||||
/** \brief Returns the version of a dynamic symbol as a string. */
|
||||
#define SND_DLSYM_VERSION(version) __STRING(version)
|
||||
|
||||
+/* RTLD_NOW and RTLD_GLOBAL (used for 'mode' in snd_dlopen) are not defined
|
||||
+ * on all arches (e.g. blackfin), so provide a dummy definition here. */
|
||||
+#ifndef RTLD_NOW
|
||||
+#define RTLD_NOW 0
|
||||
+#endif
|
||||
+
|
||||
+#ifndef RTLD_GLOBAL
|
||||
+#define RTLD_GLOBAL 0
|
||||
+#endif
|
||||
+
|
||||
void *snd_dlopen(const char *file, int mode);
|
||||
void *snd_dlsym(void *handle, const char *name, const char *version);
|
||||
int snd_dlclose(void *handle);
|
||||
diff --git a/modules/mixer/simple/sbasedl.c b/modules/mixer/simple/sbasedl.c
|
||||
--- a/modules/mixer/simple/sbasedl.c
|
||||
+++ b/modules/mixer/simple/sbasedl.c
|
||||
@@ -27,7 +27,9 @@
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <math.h>
|
||||
+#ifdef HAVE_LIBDL
|
||||
#include <dlfcn.h>
|
||||
+#endif
|
||||
#include "config.h"
|
||||
#include "asoundlib.h"
|
||||
#include "mixer_abst.h"
|
||||
diff --git a/src/mixer/simple_abst.c b/src/mixer/simple_abst.c
|
||||
--- a/src/mixer/simple_abst.c
|
||||
+++ b/src/mixer/simple_abst.c
|
||||
@@ -34,7 +34,9 @@
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <math.h>
|
||||
+#ifdef HAVE_LIBDL
|
||||
#include <dlfcn.h>
|
||||
+#endif
|
||||
#include "config.h"
|
||||
#include "asoundlib.h"
|
||||
#include "mixer_simple.h"
|
||||
@@ -0,0 +1,35 @@
|
||||
alsa-lib: conditionally enable libdl in AM_PATH_ALSA m4 macro
|
||||
|
||||
The AM_PATH_ALSA macro in utils/alsa.m4 unconditionally uses -ldl. This
|
||||
breaks compilation of alsa-utils (and probably other packages using this
|
||||
macro) for targets that do not support dynamic loading, such as for
|
||||
Blackfin FLAT binaries.
|
||||
|
||||
This patch updates the macro to check if dlopen is available, and use that
|
||||
result to conditionally add -ldl to the list of libraries.
|
||||
|
||||
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
|
||||
|
||||
---
|
||||
|
||||
diff --git a/utils/alsa.m4 b/utils/alsa.m4
|
||||
--- a/utils/alsa.m4
|
||||
+++ b/utils/alsa.m4
|
||||
@@ -44,6 +44,8 @@ if test "$alsa_inc_prefix" != "" ; then
|
||||
fi
|
||||
AC_MSG_RESULT($ALSA_CFLAGS)
|
||||
|
||||
+AC_CHECK_LIB(c, dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")])
|
||||
+
|
||||
dnl add any special lib dirs
|
||||
AC_MSG_CHECKING(for ALSA LDFLAGS)
|
||||
if test "$alsa_prefix" != "" ; then
|
||||
@@ -52,7 +54,7 @@ if test "$alsa_prefix" != "" ; then
|
||||
fi
|
||||
|
||||
dnl add the alsa library
|
||||
-ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
|
||||
+ALSA_LIBS="$ALSA_LIBS -lasound -lm $LIBDL -lpthread"
|
||||
LIBS="$ALSA_LIBS $LIBS"
|
||||
AC_MSG_RESULT($ALSA_LIBS)
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
comment "alsa-utils needs a toolchain w/ largefile, threads"
|
||||
depends on BR2_USE_MMU # fork
|
||||
depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_ALSA_UTILS
|
||||
bool "alsa-utils"
|
||||
depends on BR2_USE_MMU # fork
|
||||
depends on BR2_LARGEFILE
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
|
||||
select BR2_PACKAGE_ALSA_LIB
|
||||
@@ -9,9 +14,6 @@ config BR2_PACKAGE_ALSA_UTILS
|
||||
|
||||
http://www.alsa-project.org/
|
||||
|
||||
comment "alsa-utils needs a toolchain w/ largefile, threads"
|
||||
depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
if BR2_PACKAGE_ALSA_UTILS
|
||||
menu "ALSA utils selection"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ config BR2_PACKAGE_BEECRYPT
|
||||
bool "beecrypt"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_ICU if BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \
|
||||
!BR2_arc
|
||||
!BR2_arc && !BR2_BINFMT_FLAT
|
||||
help
|
||||
Beecrypt is a general-purpose cryptography library.
|
||||
|
||||
@@ -13,4 +13,5 @@ comment "beecrypt needs a toolchain w/ threads"
|
||||
|
||||
comment "beecrypt C++ support needs a toolchain w/ wchar"
|
||||
depends on !BR2_arc
|
||||
depends on !BR2_BINFMT_FLAT
|
||||
depends on BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
From 369be6981b26787b2685e3b8c6da779dae8ce35f Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Mon, 6 Jan 2014 18:15:31 +0000
|
||||
Subject: [PATCH] libiberty: fix --enable-install-libiberty flag [PR 56780]
|
||||
|
||||
Commit 199570 fixed the --disable-install-libiberty behavior, but it also
|
||||
added a bug where the enable path never works because the initial clear
|
||||
of target_header_dir wasn't deleted. So we end up initializing properly
|
||||
at the top only to reset it at the end all the time.
|
||||
|
||||
[Arnout: adapt to match 2.24 tarball]
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
|
||||
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-82ee72b054a4
|
||||
---
|
||||
libiberty/configure | 1 -
|
||||
libiberty/configure.ac | 1 -
|
||||
3 files changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libiberty/configure b/libiberty/configure
|
||||
index 8ea54da..7bde9b3 100755
|
||||
--- a/libiberty/configure
|
||||
+++ b/libiberty/configure
|
||||
@@ -5507,7 +5507,6 @@ fi
|
||||
|
||||
setobjs=
|
||||
CHECK=
|
||||
-target_header_dir=
|
||||
if test -n "${with_target_subdir}"; then
|
||||
|
||||
# We are being configured as a target library. AC_REPLACE_FUNCS
|
||||
diff --git a/libiberty/configure.ac b/libiberty/configure.ac
|
||||
index 4ad88a9..d6180bc 100644
|
||||
--- a/libiberty/configure.ac
|
||||
+++ b/libiberty/configure.ac
|
||||
@@ -405,7 +405,6 @@ fi
|
||||
|
||||
setobjs=
|
||||
CHECK=
|
||||
-target_header_dir=
|
||||
if test -n "${with_target_subdir}"; then
|
||||
|
||||
# We are being configured as a target library. AC_REPLACE_FUNCS
|
||||
--
|
||||
1.7.1
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
From 369be6981b26787b2685e3b8c6da779dae8ce35f Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Mon, 6 Jan 2014 18:15:31 +0000
|
||||
Subject: [PATCH] libiberty: fix --enable-install-libiberty flag [PR 56780]
|
||||
|
||||
Commit 199570 fixed the --disable-install-libiberty behavior, but it also
|
||||
added a bug where the enable path never works because the initial clear
|
||||
of target_header_dir wasn't deleted. So we end up initializing properly
|
||||
at the top only to reset it at the end all the time.
|
||||
|
||||
[Arnout: adapt to match 2.24 tarball]
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
|
||||
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-82ee72b054a4
|
||||
---
|
||||
libiberty/configure | 1 -
|
||||
libiberty/configure.ac | 1 -
|
||||
3 files changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libiberty/configure b/libiberty/configure
|
||||
index 8ea54da..7bde9b3 100755
|
||||
--- a/libiberty/configure
|
||||
+++ b/libiberty/configure
|
||||
@@ -5507,7 +5507,6 @@ fi
|
||||
|
||||
setobjs=
|
||||
CHECK=
|
||||
-target_header_dir=
|
||||
if test -n "${with_target_subdir}"; then
|
||||
|
||||
# We are being configured as a target library. AC_REPLACE_FUNCS
|
||||
diff --git a/libiberty/configure.ac b/libiberty/configure.ac
|
||||
index 4ad88a9..d6180bc 100644
|
||||
--- a/libiberty/configure.ac
|
||||
+++ b/libiberty/configure.ac
|
||||
@@ -405,7 +405,6 @@ fi
|
||||
|
||||
setobjs=
|
||||
CHECK=
|
||||
-target_header_dir=
|
||||
if test -n "${with_target_subdir}"; then
|
||||
|
||||
# We are being configured as a target library. AC_REPLACE_FUNCS
|
||||
--
|
||||
1.7.1
|
||||
|
||||
@@ -51,6 +51,7 @@ endif
|
||||
BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
|
||||
--host=$(GNU_TARGET_NAME) \
|
||||
--target=$(GNU_TARGET_NAME) \
|
||||
--enable-install-libiberty \
|
||||
$(BINUTILS_EXTRA_CONFIG_OPTIONS)
|
||||
|
||||
# Install binutils after busybox to prefer full-blown utilities
|
||||
|
||||
@@ -34,3 +34,22 @@ Index: b/src/cairo-compiler-private.h
|
||||
#else
|
||||
# define slim_hidden_proto(name) int _cairo_dummy_prototype(void)
|
||||
# define slim_hidden_proto_no_warn(name) int _cairo_dummy_prototype(void)
|
||||
Index: b/util/cairo-script/cairo-script-private.h
|
||||
===================================================================
|
||||
--- a/util/cairo-script/cairo-script-private.h
|
||||
+++ b/util/cairo-script/cairo-script-private.h
|
||||
@@ -109,12 +109,13 @@
|
||||
__asm__ (slim_hidden_asmname (internal))
|
||||
# define slim_hidden_def1(name, internal) \
|
||||
extern __typeof (name) EXT_##name __asm__(slim_hidden_asmname(name)) \
|
||||
- __attribute__((__alias__(slim_hidden_asmname(internal))))
|
||||
+ __attribute__((__alias__(slim_hidden_realname(internal))))
|
||||
# define slim_hidden_ulp slim_hidden_ulp1(__USER_LABEL_PREFIX__)
|
||||
# define slim_hidden_ulp1(x) slim_hidden_ulp2(x)
|
||||
# define slim_hidden_ulp2(x) #x
|
||||
# define slim_hidden_asmname(name) slim_hidden_asmname1(name)
|
||||
# define slim_hidden_asmname1(name) slim_hidden_ulp #name
|
||||
+# define slim_hidden_realname(name) #name
|
||||
#else
|
||||
# define slim_hidden_proto(name) int _csi_dummy_prototype(void)
|
||||
# define slim_hidden_proto_no_warn(name) int _csi_dummy_prototype(void)
|
||||
|
||||
29
package/cairo/cairo-003-fix-nofork-build.patch
Normal file
29
package/cairo/cairo-003-fix-nofork-build.patch
Normal file
@@ -0,0 +1,29 @@
|
||||
test: fix build when SHOULD_FORK is false
|
||||
|
||||
The code in test/cairo-test-runner.c properly takes into account
|
||||
platforms that do have fork() support, and uses the SHOULD_FORK define
|
||||
to know whether fork is available or not.
|
||||
|
||||
However, this SHOULD_FORK macro is used to guard the inclusion of
|
||||
<unistd.h>, which is needed to get the prototype of other functions
|
||||
(namely readlink and getppid), that are used in portions of this file
|
||||
not guarded by SHOULD_FORK.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
Index: b/test/cairo-test-runner.c
|
||||
===================================================================
|
||||
--- a/test/cairo-test-runner.c
|
||||
+++ b/test/cairo-test-runner.c
|
||||
@@ -36,10 +36,10 @@
|
||||
#include <pixman.h> /* for version information */
|
||||
|
||||
#define SHOULD_FORK HAVE_FORK && HAVE_WAITPID
|
||||
-#if SHOULD_FORK
|
||||
#if HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
+#if SHOULD_FORK
|
||||
#if HAVE_SIGNAL_H
|
||||
#include <signal.h>
|
||||
#endif
|
||||
@@ -1,10 +1,11 @@
|
||||
comment "cegui06 needs a toolchain w/ C++, threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
|
||||
comment "cegui06 needs a toolchain w/ C++, threads, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || BR2_PREFER_STATIC_LIB
|
||||
|
||||
config BR2_PACKAGE_CEGUI06
|
||||
bool "cegui06"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_PREFER_STATIC_LIB
|
||||
select BR2_PACKAGE_EXPAT
|
||||
select BR2_PACKAGE_FREETYPE
|
||||
select BR2_PACKAGE_PCRE
|
||||
|
||||
36
package/coreutils/coreutils-02-fix-timer-time-m4.patch
Normal file
36
package/coreutils/coreutils-02-fix-timer-time-m4.patch
Normal file
@@ -0,0 +1,36 @@
|
||||
Fix thread detection with uClibc in timer_time.m4
|
||||
|
||||
The timer_time.m4 gl_TIMER_TIME function determines which libraries
|
||||
need to be linked to get access to the timer function, generally -lrt
|
||||
for Linux systems. On platforms where threads are used, librt
|
||||
typically uses thread functions from libpthread.
|
||||
|
||||
However, the test to determine whether the platform has thread or not
|
||||
is incorrect: it assumes that if the C library is uClibc, then threads
|
||||
are not available. This is actually not true: uClibc has configurable
|
||||
thread support, and when thread support is available, librt calls
|
||||
libpthread functions.
|
||||
|
||||
This is important when static linking is used, because otherwise only
|
||||
-lrt is used at link time, which fails because librt calls undefined
|
||||
thread functions. Both -lrt and -lpthread must be passed.
|
||||
|
||||
This problem is fixed by making the uClibc thread detection a bit
|
||||
smarter, thanks to the usage of the __HAS_NO_THREADS__ macro defined
|
||||
in <bits/uClibc_config.h>, which itself is included by <features.h>.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
Index: b/m4/timer_time.m4
|
||||
===================================================================
|
||||
--- a/m4/timer_time.m4
|
||||
+++ b/m4/timer_time.m4
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <features.h>
|
||||
#ifdef __GNU_LIBRARY__
|
||||
#if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2)) \
|
||||
- && !defined __UCLIBC__
|
||||
+ && !(__UCLIBC__ && __HAS_NO_THREADS__)
|
||||
Thread emulation available
|
||||
#endif
|
||||
#endif
|
||||
@@ -25,6 +25,7 @@ if BR2_PACKAGE_CPPCMS
|
||||
config BR2_PACKAGE_CPPCMS_ICU
|
||||
bool "enable icu support"
|
||||
depends on !BR2_arc # icu -> atomic builtins
|
||||
depends on !BR2_BINFMT_FLAT # icu
|
||||
select BR2_PACKAGE_ICU
|
||||
help
|
||||
Using ICU allows advanced localization features into CppCMS,
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
config BR2_PACKAGE_CPPDB
|
||||
bool "cppdb"
|
||||
# dlfcn.h
|
||||
depends on !BR2_PREFER_STATIC_LIB
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
# Can be built without them but it's useless
|
||||
@@ -11,6 +13,7 @@ config BR2_PACKAGE_CPPDB
|
||||
|
||||
http://cppcms.com/sql/cppdb/
|
||||
|
||||
comment "cppdb needs a toolchain w/ C++, threads"
|
||||
comment "cppdb needs a toolchain w/ C++, threads, dynamic library"
|
||||
depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_SQLITE
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
BR2_PREFER_STATIC_LIB
|
||||
|
||||
@@ -6,7 +6,7 @@ config BR2_PACKAGE_CRYPTSETUP
|
||||
select BR2_PACKAGE_E2FSPROGS
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
|
||||
depends on BR2_LARGEFILE # lvm2, util-linux
|
||||
depends on BR2_USE_MMU # lvm2
|
||||
depends on BR2_USE_MMU # lvm2, e2fsprogs
|
||||
depends on !BR2_PREFER_STATIC_LIB # lvm2
|
||||
depends on BR2_USE_WCHAR # util-linux
|
||||
help
|
||||
|
||||
@@ -3,7 +3,13 @@ config BR2_PACKAGE_DHCPCD
|
||||
# No support for AI_ADDRCONFIG
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
|
||||
!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
|
||||
depends on !BR2_PREFER_STATIC_LIB
|
||||
help
|
||||
An RFC2131 compliant DHCP client
|
||||
|
||||
http://roy.marples.name/downloads/dhcpcd
|
||||
|
||||
comment "dhcpcd needs a toolchain w/ dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
|
||||
!BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
|
||||
depends on BR2_PREFER_STATIC_LIB
|
||||
|
||||
@@ -2,6 +2,7 @@ config BR2_PACKAGE_DISTCC
|
||||
bool "distcc"
|
||||
# needs fork()
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_DEPRECATED_SINCE_2014_02
|
||||
help
|
||||
Distributed compiler client and server. Allows you to
|
||||
distribute compilation of C code across several machines
|
||||
|
||||
@@ -3,6 +3,7 @@ config BR2_PACKAGE_E2FSPROGS
|
||||
bool "e2fsprogs"
|
||||
depends on BR2_LARGEFILE
|
||||
depends on BR2_USE_WCHAR # util-linux
|
||||
depends on BR2_USE_MMU # util-linux/libblkid
|
||||
select BR2_PACKAGE_UTIL_LINUX
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
|
||||
@@ -49,7 +50,7 @@ config BR2_PACKAGE_E2FSPROGS_E2UNDO
|
||||
|
||||
config BR2_PACKAGE_E2FSPROGS_E4DEFRAG
|
||||
bool "e4defrag"
|
||||
depends on !BR2_avr32 # fallocate not implemented
|
||||
depends on !BR2_avr32 && !BR2_nios2 # fallocate not implemented
|
||||
|
||||
config BR2_PACKAGE_E2FSPROGS_FILEFRAG
|
||||
bool "filefrag"
|
||||
|
||||
@@ -25,6 +25,10 @@ E2FSPROGS_CONF_OPT = \
|
||||
--disable-e2initrd-helper \
|
||||
--disable-testio-debug
|
||||
|
||||
ifeq ($(BR2_nios2),y)
|
||||
E2FSPROGS_CONF_ENV += ac_cv_func_fallocate=no
|
||||
endif
|
||||
|
||||
E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
|
||||
|
||||
E2FSPROGS_MAKE_OPT = \
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
menuconfig BR2_PACKAGE_EFL
|
||||
bool "Enlightenment Foundation Libraries"
|
||||
depends on BR2_USE_WCHAR
|
||||
# libeina uses madvise(). To revisit when bumping EFL to 1.8
|
||||
depends on BR2_USE_MMU
|
||||
help
|
||||
Enlightenment Foundation Libraries
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ config BR2_PACKAGE_EXPEDITE
|
||||
select BR2_PACKAGE_LIBEVAS
|
||||
select BR2_PACKAGE_LIBEET
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
|
||||
depends on !BR2_avr32 # libevas
|
||||
help
|
||||
Expedite is the official Evas benchmark tool. It can test different
|
||||
@@ -11,6 +12,7 @@ config BR2_PACKAGE_EXPEDITE
|
||||
DirectFB and so on. Its tests are quite extensive, trying to
|
||||
reproduce real world usage cases.
|
||||
|
||||
comment "expedite needs a toolchain w/ C++"
|
||||
comment "expedite needs a toolchain w/ C++, threads"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_avr32
|
||||
|
||||
@@ -38,6 +38,11 @@ config BR2_PACKAGE_LIBECORE_X_XCB
|
||||
config BR2_PACKAGE_LIBECORE_EVAS
|
||||
bool "libecore Evas support"
|
||||
select BR2_PACKAGE_LIBEVAS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_avr32 # libevas
|
||||
|
||||
comment "evas support needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_avr32 # libevas
|
||||
|
||||
endif # BR2_PACKAGE_LIBECORE
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
comment "libedje needs a toolchain w/ threads"
|
||||
depends on !BR2_avr32
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_LIBEDJE
|
||||
bool "libedje"
|
||||
select BR2_PACKAGE_LIBEINA
|
||||
@@ -8,6 +12,7 @@ config BR2_PACKAGE_LIBEDJE
|
||||
select BR2_PACKAGE_LIBEVAS
|
||||
select BR2_PACKAGE_LUA
|
||||
depends on !BR2_avr32 # libevas
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
|
||||
help
|
||||
A graphical layout and animation library for animated
|
||||
resizable, compressed and scalable themes.
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
comment "libelementary needs a toolchain w/ threads"
|
||||
depends on !BR2_avr32
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_LIBELEMENTARY
|
||||
bool "libelementary"
|
||||
select BR2_PACKAGE_LIBEINA
|
||||
@@ -5,6 +9,7 @@ config BR2_PACKAGE_LIBELEMENTARY
|
||||
select BR2_PACKAGE_LIBECORE
|
||||
select BR2_PACKAGE_LIBEDJE
|
||||
depends on !BR2_avr32 # libevas
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
|
||||
help
|
||||
Elementary is a widget toolkit and EFL wrapper and convenience
|
||||
library to make it easy to build applications and tools with UIs
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
comment "libethumb needs a toolchain w/ threads"
|
||||
depends on !BR2_avr32
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_LIBETHUMB
|
||||
bool "libethumb"
|
||||
select BR2_PACKAGE_LIBEINA
|
||||
@@ -6,6 +10,7 @@ config BR2_PACKAGE_LIBETHUMB
|
||||
select BR2_PACKAGE_LIBECORE_EVAS
|
||||
select BR2_PACKAGE_LIBEDJE
|
||||
depends on !BR2_avr32 # libevas
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
|
||||
help
|
||||
Ethumb is a library for generating thumbnail images of documents.
|
||||
|
||||
|
||||
@@ -1,6 +1,16 @@
|
||||
comment "libevas needs a toolchain w/ threads"
|
||||
depends on !BR2_avr32
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_LIBEVAS
|
||||
bool "libevas"
|
||||
depends on !BR2_avr32 # no epoll_create1 or inotify_init1
|
||||
# libevas should normally build without threads, but due to a
|
||||
# build issue when the async preloader is disabled, which is
|
||||
# needed when no threads are available, we don't allow evas to
|
||||
# be built without threads. This should be revisited when efl
|
||||
# is bumped to 1.8.
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_FREETYPE
|
||||
select BR2_PACKAGE_LIBEINA
|
||||
# required to build so far
|
||||
|
||||
@@ -203,11 +203,6 @@ else
|
||||
LIBEVAS_CONF_OPT += --disable-font-loader-eet
|
||||
endif
|
||||
|
||||
# async image preload support needs threads support in toolchain
|
||||
ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||
LIBEVAS_CONF_OPT += --disable-async-preload
|
||||
endif
|
||||
|
||||
# libevas installs the source code of examples on the target, which
|
||||
# are generally not useful.
|
||||
define LIBEVAS_REMOVE_EXAMPLES
|
||||
|
||||
@@ -21,9 +21,9 @@ config BR2_PACKAGE_ENLIGHTENMENT
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
# libedbus -> dbus
|
||||
# libedbus -> glib2
|
||||
# libedbus -> glib2, libevas
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
# libedbus -> dbus
|
||||
# libedbus -> dbus, efl libraries
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
depends on !BR2_avr32 # libevas
|
||||
|
||||
@@ -15,7 +15,7 @@ HOST_GCC_FINAL_DEPENDENCIES = \
|
||||
HOST_GCC_FINAL_EXTRACT_CMDS = $(HOST_GCC_EXTRACT_CMDS)
|
||||
|
||||
ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
|
||||
HOST_GCC_FINAL_POST_EXTRACT_CMDS += HOST_GCC_FINAL_XTENSA_OVERLAY_EXTRACT
|
||||
HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
|
||||
endif
|
||||
|
||||
HOST_GCC_FINAL_POST_PATCH_HOOKS += HOST_GCC_APPLY_PATCHES
|
||||
|
||||
@@ -13,7 +13,7 @@ HOST_GCC_INITIAL_DEPENDENCIES = $(HOST_GCC_COMMON_DEPENDENCIES)
|
||||
HOST_GCC_INITIAL_EXTRACT_CMDS = $(HOST_GCC_EXTRACT_CMDS)
|
||||
|
||||
ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
|
||||
HOST_GCC_INITIAL_POST_EXTRACT_CMDS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
|
||||
HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
|
||||
endif
|
||||
|
||||
HOST_GCC_INITIAL_POST_PATCH_HOOKS += HOST_GCC_APPLY_PATCHES
|
||||
|
||||
@@ -15,7 +15,7 @@ HOST_GCC_INTERMEDIATE_DEPENDENCIES = \
|
||||
HOST_GCC_INTERMEDIATE_EXTRACT_CMDS = $(HOST_GCC_EXTRACT_CMDS)
|
||||
|
||||
ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
|
||||
HOST_GCC_INTERMEDIATE_POST_EXTRACT_CMDS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
|
||||
HOST_GCC_INTERMEDIATE_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
|
||||
endif
|
||||
|
||||
HOST_GCC_INTERMEDIATE_POST_PATCH_HOOKS += HOST_GCC_APPLY_PATCHES
|
||||
|
||||
@@ -4,7 +4,7 @@ config BR2_PACKAGE_HOST_GDB
|
||||
# allow to build a cross-gdb, as the one of the external
|
||||
# toolchain should be used.
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY
|
||||
depends on !BR2_aarch64
|
||||
depends on !BR2_aarch64 && !BR2_nios2
|
||||
help
|
||||
Build a cross gdb that runs on the host machine and debugs
|
||||
programs running on the target. It requires 'gdbserver'
|
||||
@@ -51,7 +51,7 @@ config BR2_GDB_VERSION
|
||||
(!BR2_PACKAGE_HOST_GDB && BR2_bfin)
|
||||
default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 || \
|
||||
(!BR2_PACKAGE_HOST_GDB && BR2_avr32)
|
||||
default "7.4.1" if BR2_GDB_VERSION_7_4
|
||||
default "7.5.1" if BR2_GDB_VERSION_7_5 || !BR2_PACKAGE_HOST_GDB
|
||||
default "f25a1952afd054205f9471e449c1f7ca5b271b7c" if BR2_arc
|
||||
default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze
|
||||
default "7.4.1" if BR2_GDB_VERSION_7_4
|
||||
default "7.5.1" if BR2_GDB_VERSION_7_5 || !BR2_PACKAGE_HOST_GDB
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
config BR2_PACKAGE_GPM
|
||||
bool "gpm"
|
||||
depends on !BR2_PREFER_STATIC_LIB
|
||||
depends on BR2_USE_MMU # fork()
|
||||
help
|
||||
"gpm" means general purpose mouse (server) and provides mouse support
|
||||
for Linux virtual consoles.
|
||||
|
||||
@@ -174,6 +174,9 @@ config BR2_PACKAGE_GPSD_NMEA2000
|
||||
bool "NMEA2000"
|
||||
select BR2_PACKAGE_GPSD_NAVCOM
|
||||
select BR2_PACKAGE_GPSD_AIVDM
|
||||
# uClibc 0.9.31, used on AVR32, does not have the necessary
|
||||
# CAN definitions.
|
||||
depends on !BR2_avr32
|
||||
help
|
||||
NMEA2000/CAN support
|
||||
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
From 1ca4251d1284f2cb56e31aaec4d369809e2139c9 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Mon, 24 Feb 2014 16:30:39 +0100
|
||||
Subject: [PATCH] Fix libgstfsl linkage (add -lrt for shared memory functions).
|
||||
|
||||
Fixes runtime failure of gst-fsl-plugins, e.g.:
|
||||
(gst-plugin-scanner:1700): GStreamer-WARNING **: Failed to load
|
||||
plugin '/usr/lib/gstreamer-0.10/libmfw_vpu.so':
|
||||
/usr/lib/libgstfsl-0.10.so.0: undefined symbol: shm_open)
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
configure.ac | 3 +++
|
||||
libs/Makefile.am | 2 +-
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f7907a7..9f834df 100755
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -173,6 +173,9 @@ AC_CHECK_LIB(ipu, mxc_ipu_lib_task_init, [IPU_LIBS=-lipu], [echo "No libipu arou
|
||||
AC_SUBST(IPU_CFLAGS)
|
||||
AC_SUBST(IPU_LIBS)
|
||||
|
||||
+AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"])
|
||||
+AC_SUBST(SHM_LIBS)
|
||||
+
|
||||
FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null`
|
||||
FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`"
|
||||
FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslparser 2>/dev/null`"
|
||||
diff --git a/libs/Makefile.am b/libs/Makefile.am
|
||||
index a68fd4b..7b19b92 100755
|
||||
--- a/libs/Makefile.am
|
||||
+++ b/libs/Makefile.am
|
||||
@@ -12,7 +12,7 @@ libgstfsl_@GST_MAJORMINOR@_la_SOURCES = \
|
||||
|
||||
libgstfsl_@GST_MAJORMINOR@_la_CFLAGS = $(GST_BASE_CFLAGS) $(IPU_CFLAGS) -I../inc/common
|
||||
libgstfsl_@GST_MAJORMINOR@_la_LDFLAGS = -version-info @GSTMXLIBS_VERSION@
|
||||
-libgstfsl_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS)
|
||||
+libgstfsl_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(SHM_LIBS)
|
||||
|
||||
libgstfsl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/imx-mm
|
||||
libgstfsl_@GST_MAJORMINOR@include_HEADERS = \
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
@@ -87,6 +87,7 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PANGO
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_WCHAR # pango -> libglib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> libglib2
|
||||
depends on BR2_USE_MMU # pango -> glib2
|
||||
select BR2_PACKAGE_PANGO
|
||||
|
||||
comment "pango plugin needs a toolchain w/ C++, wchar, threads"
|
||||
|
||||
@@ -12,7 +12,7 @@ GSTREAMER_INSTALL_STAGING = YES
|
||||
# Checking if unaligned memory access works correctly cannot be done when cross
|
||||
# compiling. For the following architectures there is no information available
|
||||
# in the configure script.
|
||||
ifeq ($(BR2_avr32)$(BR2_xtensa),y)
|
||||
ifeq ($(BR2_avr32)$(BR2_xtensa)$(BR2_microblaze),y)
|
||||
GSTREAMER_CONF_ENV = as_cv_unaligned_access=no
|
||||
endif
|
||||
ifeq ($(BR2_aarch64),y)
|
||||
|
||||
@@ -400,6 +400,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPG123
|
||||
bool "mpg123"
|
||||
select BR2_PACKAGE_MPG123
|
||||
depends on BR2_USE_MMU # mpg123
|
||||
help
|
||||
mp3 decoding based on the mpg123 library
|
||||
|
||||
@@ -417,6 +418,16 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV
|
||||
bool "opencv"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
select BR2_PACKAGE_OPENCV
|
||||
# Remove the following opencv modules when gstreamer fixes the
|
||||
# problem of including the old "cv.h" header
|
||||
# bug: https://bugzilla.gnome.org/show_bug.cgi?id=725163
|
||||
select BR2_PACKAGE_OPENCV_LIB_CALIB3D
|
||||
select BR2_PACKAGE_OPENCV_LIB_FEATURES2D
|
||||
select BR2_PACKAGE_OPENCV_LIB_FLANN
|
||||
select BR2_PACKAGE_OPENCV_LIB_IMGPROC
|
||||
select BR2_PACKAGE_OPENCV_LIB_LEGACY
|
||||
select BR2_PACKAGE_OPENCV_LIB_OBJDETECT
|
||||
select BR2_PACKAGE_OPENCV_LIB_VIDEO
|
||||
help
|
||||
GStreamer OpenCV Plugins
|
||||
|
||||
|
||||
@@ -131,6 +131,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_WCHAR # pango -> libglib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> libglib2
|
||||
depends on BR2_USE_MMU # pango -> libglib2
|
||||
select BR2_PACKAGE_PANGO
|
||||
help
|
||||
Pango-based text rendering and overlay
|
||||
|
||||
@@ -14,7 +14,7 @@ GSTREAMER1_LICENSE = LGPLv2+ LGPLv2.1+
|
||||
# Checking if unaligned memory access works correctly cannot be done when cross
|
||||
# compiling. For the following architectures there is no information available
|
||||
# in the configure script.
|
||||
ifeq ($(BR2_avr32)$(BR2_xtensa),y)
|
||||
ifeq ($(BR2_avr32)$(BR2_xtensa)$(BR2_microblaze),y)
|
||||
GSTREAMER1_CONF_ENV = as_cv_unaligned_access=no
|
||||
endif
|
||||
ifeq ($(BR2_aarch64),y)
|
||||
|
||||
@@ -25,6 +25,7 @@ choice
|
||||
|
||||
config BR2_PACKAGE_HASERL_VERSION_0_8_X
|
||||
bool "v 0.8.x"
|
||||
depends on BR2_DEPRECATED_SINCE_2014_02
|
||||
help
|
||||
stable version
|
||||
|
||||
|
||||
@@ -3,6 +3,10 @@ config BR2_PACKAGE_ICU
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
# icu does some funky things by generating by itself an ELF
|
||||
# file, and it cannot easily be changed to generate FLAT
|
||||
# format.
|
||||
depends on !BR2_BINFMT_FLAT
|
||||
depends on !BR2_arc # atomic builtins
|
||||
help
|
||||
International Components for Unicode.
|
||||
@@ -11,5 +15,6 @@ config BR2_PACKAGE_ICU
|
||||
|
||||
comment "icu needs a toolchain w/ C++, wchar, threads"
|
||||
depends on !BR2_arc
|
||||
depends on !BR2_BINFMT_FLAT
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
@@ -115,7 +115,7 @@ ifeq ($(BR2_PACKAGE_BZIP2),y)
|
||||
IMAGEMAGICK_CONF_OPT += --with-bzlib
|
||||
IMAGEMAGICK_DEPENDENCIES += bzip2
|
||||
else
|
||||
IMAGEMAGICK_CONF_OPT += --without-bzip2
|
||||
IMAGEMAGICK_CONF_OPT += --without-bzlib
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -2,6 +2,10 @@ config BR2_PACKAGE_IPUTILS
|
||||
bool "iputils"
|
||||
select BR2_OPENSSL if BR2_INET_IPV6
|
||||
depends on BR2_USE_MMU # fork()
|
||||
# requires dn_comp (only available in since uclibc 0.9.33)
|
||||
depends on !BR2_avr32
|
||||
depends on !BR2_UCLIBC_VERSION_0_9_31 && \
|
||||
!BR2_UCLIBC_VERSION_0_9_32
|
||||
help
|
||||
This package is set of small useful utilities for Linux networking.
|
||||
It includes complete versions of ping, traceroute, etc.
|
||||
|
||||
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBCEC
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on !BR2_PREFER_STATIC_LIB
|
||||
help
|
||||
libcec allows you in combination with the right hardware to
|
||||
control your home theater devices with your TV remote
|
||||
@@ -10,6 +11,6 @@ config BR2_PACKAGE_LIBCEC
|
||||
|
||||
http://libcec.pulse-eight.com
|
||||
|
||||
comment "libcec needs a toolchain w/ C++, wchar, threads"
|
||||
comment "libcec needs a toolchain w/ C++, wchar, threads, dynamic library"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_USE_WCHAR
|
||||
!BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
|
||||
|
||||
@@ -8,7 +8,8 @@ LIBCGI_VERSION = 1.0
|
||||
LIBCGI_SITE = http://downloads.sourceforge.net/project/libcgi/libcgi/$(LIBCGI_VERSION)
|
||||
LIBCGI_INSTALL_STAGING = YES
|
||||
# use cross CC/AR rather than host
|
||||
LIBCGI_MAKE_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS)" AR="$(TARGET_AR)"
|
||||
LIBCGI_MAKE_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS)" AR="$(TARGET_AR)" \
|
||||
$(if $(BR2_PREFER_STATIC_LIB),STATIC=1)
|
||||
LIBCGI_LICENSE = LGPLv2.1+
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
--- libcgi-1.0.orig/src/cgi.c
|
||||
+++ libcgi-1.0/src/cgi.c
|
||||
Index: b/src/cgi.c
|
||||
===================================================================
|
||||
--- a/src/cgi.c
|
||||
+++ b/src/cgi.c
|
||||
@@ -336,7 +336,7 @@
|
||||
hextable['b'] = 11;
|
||||
hextable['c'] = 12;
|
||||
@@ -9,8 +11,10 @@
|
||||
hextable['f'] = 15;
|
||||
hextable['A'] = 10;
|
||||
hextable['B'] = 11;
|
||||
--- libcgi-1.0.orig/src/string.c
|
||||
+++ libcgi-1.0/src/string.c
|
||||
Index: b/src/string.c
|
||||
===================================================================
|
||||
--- a/src/string.c
|
||||
+++ b/src/string.c
|
||||
@@ -584,7 +584,7 @@
|
||||
|
||||
va_start(ptr, s);
|
||||
@@ -20,9 +24,11 @@
|
||||
len = strlen(s);
|
||||
|
||||
while (*str) {
|
||||
--- libcgi-1.0.orig/Makefile.in
|
||||
+++ libcgi-1.0/Makefile.in
|
||||
@@ -5,22 +5,27 @@
|
||||
Index: b/Makefile.in
|
||||
===================================================================
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -5,22 +5,32 @@
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
|
||||
@@ -44,18 +50,23 @@
|
||||
+SHOBJS=$(OBJS:.o=.sh.o)
|
||||
|
||||
-.c.o: $(CC) $(FLAGS) -c $<
|
||||
+%.o: %.c
|
||||
+ $(CC) $(FLAGS) -c $*.c -o $@
|
||||
+ALL_TARGETS = src/libcgi.a
|
||||
+ifeq ($(STATIC),)
|
||||
+ALL_TARGETS += src/libcgi.so
|
||||
+endif
|
||||
|
||||
-all: $(OBJS) src/libcgi.so
|
||||
+%.o: %.c
|
||||
+ $(CC) $(FLAGS) -c $*.c -o $@
|
||||
+
|
||||
+%.sh.o: %.c
|
||||
+ $(CC) $(FLAGS) -fPIC -c $*.c -o $@
|
||||
+
|
||||
+all: src/libcgi.so src/libcgi.a
|
||||
+all: $(ALL_TARGETS)
|
||||
|
||||
@echo ""
|
||||
@echo ""
|
||||
@@ -48,14 +53,15 @@
|
||||
@@ -48,14 +58,17 @@
|
||||
src/libcgi.a: $(OBJS)
|
||||
$(AR) rc src/libcgi.a $(OBJS)
|
||||
|
||||
@@ -70,14 +81,16 @@
|
||||
- cp src/cgi.h $(INCDIR)
|
||||
- cp src/session.h $(INCDIR)
|
||||
+ cp src/libcgi.a $(DESTDIR)/$(LIBDIR)
|
||||
+ifeq ($(STATIC),)
|
||||
+ cp src/libcgi.so $(DESTDIR)/$(LIBDIR)
|
||||
+endif
|
||||
+ [ -d $(DESTDIR)/$(INCDIR) ] || mkdir -p $(DESTDIR)/$(INCDIR)
|
||||
+ cp src/cgi.h $(DESTDIR)/$(INCDIR)
|
||||
+ cp src/session.h $(DESTDIR)/$(INCDIR)
|
||||
|
||||
|
||||
src/error.o: src/error.c src/error.h
|
||||
@@ -69,8 +75,9 @@
|
||||
@@ -69,8 +82,9 @@
|
||||
src/list.o: src/list.c
|
||||
|
||||
clean:
|
||||
@@ -88,7 +101,7 @@
|
||||
|
||||
uninstall: clean
|
||||
rm -f $(LIBDIR)/libcgi.*
|
||||
@@ -78,11 +85,11 @@
|
||||
@@ -78,11 +92,11 @@
|
||||
rm -f $(INCDIR)/session.h
|
||||
rm -f $(MANDIR)/libcgi*
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBGAIL
|
||||
bool "libgail"
|
||||
depends on BR2_USE_WCHAR # pango -> libglib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> libglib2
|
||||
depends on BR2_USE_MMU # pango -> libglib2
|
||||
depends on BR2_PACKAGE_LIBGTK2
|
||||
select BR2_PACKAGE_PANGO
|
||||
help
|
||||
|
||||
@@ -27,9 +27,11 @@ config BR2_PACKAGE_LIBPLAYER_GSTREAMER
|
||||
bool "gstreamer backend"
|
||||
depends on BR2_USE_WCHAR # glib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
|
||||
depends on BR2_USE_MMU # glib2
|
||||
select BR2_PACKAGE_GSTREAMER
|
||||
|
||||
comment "gstreamer backend needs a toolchain w/ wchar, threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_LIBPLAYER_PYTHON
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
LIBPNG_VERSION = 1.6.8
|
||||
LIBPNG_SERIES = 16
|
||||
LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz
|
||||
LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION)
|
||||
LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/older-releases/$(LIBPNG_VERSION)
|
||||
LIBPNG_LICENSE = libpng license
|
||||
LIBPNG_LICENSE_FILES = LICENSE
|
||||
LIBPNG_INSTALL_STAGING = YES
|
||||
|
||||
@@ -4,6 +4,8 @@ config BR2_PACKAGE_LIBSECRET
|
||||
depends on BR2_USE_WCHAR # gettext dep in libglib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
|
||||
depends on BR2_USE_MMU # libglib2
|
||||
# Triggers an internal compiler error on AVR32
|
||||
depends on !BR2_avr32
|
||||
help
|
||||
libsecret is a library for storing and retrieving passwords and other
|
||||
secrets. It communicates with the "Secret Service" using DBus.
|
||||
@@ -13,5 +15,6 @@ config BR2_PACKAGE_LIBSECRET
|
||||
https://wiki.gnome.org/Libsecret
|
||||
|
||||
comment "libsecret needs a toolchain w/ wchar, threads"
|
||||
depends on !BR2_avr32
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
44
package/libsepol/libsepol-01-support-static-only.patch
Normal file
44
package/libsepol/libsepol-01-support-static-only.patch
Normal file
@@ -0,0 +1,44 @@
|
||||
Add support for static-only build
|
||||
|
||||
Instead of unconditionally building shared libraries, this patch
|
||||
improves the libsepol build system with a "STATIC" variable, which
|
||||
when defined to some non-empty value, will disable the build of shared
|
||||
libraries. It allows to support cases where the target architecture
|
||||
does not have support for shared libraries.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
Index: b/src/Makefile
|
||||
===================================================================
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -17,7 +17,12 @@
|
||||
CFLAGS ?= -Werror -Wall -W -Wundef -Wshadow -Wmissing-noreturn -Wmissing-format-attribute
|
||||
override CFLAGS += -I. -I../include -D_GNU_SOURCE
|
||||
|
||||
-all: $(LIBA) $(LIBSO) $(LIBPC)
|
||||
+ALL_TARGETS = $(LIBA) $(LIBPC)
|
||||
+ifeq ($(STATIC),)
|
||||
+ALL_TARGETS += $(LIBSO)
|
||||
+endif
|
||||
+
|
||||
+all: $(ALL_TARGETS)
|
||||
|
||||
$(LIBA): $(OBJS)
|
||||
$(AR) rcs $@ $^
|
||||
@@ -39,11 +44,13 @@
|
||||
install: all
|
||||
test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
|
||||
install -m 644 $(LIBA) $(LIBDIR)
|
||||
- test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR)
|
||||
- install -m 755 $(LIBSO) $(SHLIBDIR)
|
||||
test -d $(LIBDIR)/pkgconfig || install -m 755 -d $(LIBDIR)/pkgconfig
|
||||
install -m 644 $(LIBPC) $(LIBDIR)/pkgconfig
|
||||
+ifeq ($(STATIC),)
|
||||
+ test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR)
|
||||
+ install -m 755 $(LIBSO) $(SHLIBDIR)
|
||||
cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET)
|
||||
+endif
|
||||
|
||||
relabel:
|
||||
/sbin/restorecon $(SHLIBDIR)/$(LIBSO)
|
||||
@@ -11,18 +11,24 @@ LIBSEPOL_LICENSE_FILES = COPYING
|
||||
|
||||
LIBSEPOL_INSTALL_STAGING = YES
|
||||
|
||||
LIBSEPOL_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS)
|
||||
|
||||
ifeq ($(BR2_PREFER_STATIC_LIB),y)
|
||||
LIBSEPOL_MAKE_FLAGS += STATIC=1
|
||||
endif
|
||||
|
||||
define LIBSEPOL_BUILD_CMDS
|
||||
# DESTDIR is needed during the compile to compute library and
|
||||
# header paths.
|
||||
$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR)
|
||||
$(MAKE) -C $(@D) $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(STAGING_DIR)
|
||||
endef
|
||||
|
||||
define LIBSEPOL_INSTALL_STAGING_CMDS
|
||||
$(MAKE) -C $(@D) install $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR)
|
||||
$(MAKE) -C $(@D) install $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(STAGING_DIR)
|
||||
endef
|
||||
|
||||
define LIBSEPOL_INSTALL_TARGET_CMDS
|
||||
$(MAKE) -C $(@D) install $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR)
|
||||
$(MAKE) -C $(@D) install $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(TARGET_DIR)
|
||||
endef
|
||||
|
||||
define HOST_LIBSEPOL_BUILD_CMDS
|
||||
|
||||
19
package/libsigsegv/libsigsegv-0004-fix-bfin-build.patch
Normal file
19
package/libsigsegv/libsigsegv-0004-fix-bfin-build.patch
Normal file
@@ -0,0 +1,19 @@
|
||||
Add stack direction for Blackfin
|
||||
|
||||
The stack grows downward on Blackfin, see
|
||||
https://sourceware.org/binutils/docs/as/Blackfin-Syntax.html: "The
|
||||
stack grows by decrementing the stack pointer.".
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Index: b/m4/stack-direction.m4
|
||||
===================================================================
|
||||
--- a/m4/stack-direction.m4
|
||||
+++ b/m4/stack-direction.m4
|
||||
@@ -18,6 +18,7 @@
|
||||
arc | \
|
||||
arm* | strongarm* | xscale* | \
|
||||
avr | avr32 | \
|
||||
+ bfin | \
|
||||
c1 | c2 | c32 | c34 | c38 | \
|
||||
clipper | \
|
||||
cris | \
|
||||
@@ -13,6 +13,19 @@ LIBTOOL_LICENSE_FILES = COPYING
|
||||
|
||||
HOST_LIBTOOL_LIBTOOL_PATCH = NO
|
||||
|
||||
# libtool-mips64-n64-linking.post-install-patch is an upstream patch that
|
||||
# fixes MIPS64 n64 link failures. However, because the patch touches an m4
|
||||
# file, applying it triggers a run of autoconf, automake, etc. This sometimes
|
||||
# leads to build failures due to incompatible system autotools. We cannot
|
||||
# simply set HOST_LIBTOOL_AUTORECONF = YES because that would create a
|
||||
# circular dependency on host-libtool. Therefore, just apply the patch
|
||||
# directly on the installed file.
|
||||
define HOST_LIBTOOL_FIXUP_LIBTOOL_M4
|
||||
patch $(HOST_DIR)/usr/share/aclocal/libtool.m4 < \
|
||||
package/libtool/libtool-mips64-n64-linking.post-install-patch
|
||||
endef
|
||||
HOST_LIBTOOL_POST_INSTALL_HOOKS += HOST_LIBTOOL_FIXUP_LIBTOOL_M4
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
|
||||
34
package/libv4l/libv4l-02-use-openat-when-available.patch
Normal file
34
package/libv4l/libv4l-02-use-openat-when-available.patch
Normal file
@@ -0,0 +1,34 @@
|
||||
From: Riku Voipio <riku.voipio@linaro.org>
|
||||
Date: Tue, 22 Jan 2013 15:37:22 +0000 (-0300)
|
||||
Subject: v4l-utils: use openat when available
|
||||
X-Git-Tag: v4l-utils-0.9.4~61
|
||||
X-Git-Url: http://git.linuxtv.org
|
||||
|
||||
v4l-utils: use openat when available
|
||||
|
||||
New architectures such as 64-Bit arm build kernels without legacy
|
||||
system calls - Such as the the no-at system calls. Thus, use
|
||||
SYS_openat whenever it is available.
|
||||
|
||||
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
|
||||
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
||||
---
|
||||
|
||||
diff --git a/lib/libv4lconvert/libv4lsyscall-priv.h b/lib/libv4lconvert/libv4lsyscall-priv.h
|
||||
index 2dac49a..cdd38bc 100644
|
||||
--- a/lib/libv4lconvert/libv4lsyscall-priv.h
|
||||
+++ b/lib/libv4lconvert/libv4lsyscall-priv.h
|
||||
@@ -72,8 +72,13 @@ typedef off_t __off_t;
|
||||
|
||||
#ifndef CONFIG_SYS_WRAPPER
|
||||
|
||||
+#ifdef SYS_openat
|
||||
+#define SYS_OPEN(file, oflag, mode) \
|
||||
+ syscall(SYS_openat, AT_FDCWD, (const char *)(file), (int)(oflag), (mode_t)(mode))
|
||||
+#else
|
||||
#define SYS_OPEN(file, oflag, mode) \
|
||||
syscall(SYS_open, (const char *)(file), (int)(oflag), (mode_t)(mode))
|
||||
+#endif
|
||||
#define SYS_CLOSE(fd) \
|
||||
syscall(SYS_close, (int)(fd))
|
||||
#define SYS_IOCTL(fd, cmd, arg) \
|
||||
@@ -16,15 +16,17 @@ ifneq ($(BR2_LARGEFILE),y)
|
||||
LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
|
||||
endif
|
||||
|
||||
LIBXML2_CONF_OPT = --with-gnu-ld --without-python --without-debug
|
||||
LIBXML2_CONF_OPT = --with-gnu-ld --without-python --without-debug --without-lzma
|
||||
|
||||
HOST_LIBXML2_DEPENDENCIES = host-pkgconf
|
||||
|
||||
HOST_LIBXML2_CONF_OPT = --without-zlib --without-lzma
|
||||
|
||||
# mesa3d uses functions that are only available with debug
|
||||
ifeq ($(BR2_PACKAGE_MESA3D),y)
|
||||
HOST_LIBXML2_CONF_OPT = --with-debug
|
||||
HOST_LIBXML2_CONF_OPT += --with-debug
|
||||
else
|
||||
HOST_LIBXML2_CONF_OPT = --without-debug
|
||||
HOST_LIBXML2_CONF_OPT += --without-debug
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HOST_LIBXML2_PYTHON),y)
|
||||
|
||||
@@ -72,14 +72,14 @@ config BR2_DEFAULT_KERNEL_HEADERS
|
||||
string
|
||||
default "3.0.101" if BR2_KERNEL_HEADERS_3_0
|
||||
default "3.2.55" if BR2_KERNEL_HEADERS_3_2
|
||||
default "3.4.80" if BR2_KERNEL_HEADERS_3_4
|
||||
default "3.4.82" if BR2_KERNEL_HEADERS_3_4
|
||||
default "3.6.11" if BR2_KERNEL_HEADERS_3_6
|
||||
default "3.7.10" if BR2_KERNEL_HEADERS_3_7
|
||||
default "3.8.13" if BR2_KERNEL_HEADERS_3_8
|
||||
default "3.9.11" if BR2_KERNEL_HEADERS_3_9
|
||||
default "3.10.30" if BR2_KERNEL_HEADERS_3_10
|
||||
default "3.10.32" if BR2_KERNEL_HEADERS_3_10
|
||||
default "3.11.10" if BR2_KERNEL_HEADERS_3_11
|
||||
default "3.12.11" if BR2_KERNEL_HEADERS_3_12
|
||||
default "3.13.3" if BR2_KERNEL_HEADERS_3_13
|
||||
default "3.12.13" if BR2_KERNEL_HEADERS_3_12
|
||||
default "3.13.5" if BR2_KERNEL_HEADERS_3_13
|
||||
default "2.6" if BR2_KERNEL_HEADERS_SNAP
|
||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||
|
||||
@@ -17,6 +17,12 @@ LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
|
||||
|
||||
LINUX_HEADERS_INSTALL_STAGING = YES
|
||||
|
||||
# For some architectures (eg. Arc, Cris, Hexagon, ia64, parisc,
|
||||
# score and xtensa), the Linux buildsystem tries to call the
|
||||
# cross-compiler, although it is not needed at all.
|
||||
# This results in seemingly errors like:
|
||||
# [...]/scripts/gcc-version.sh: line 26: arc-linux-uclibc-gcc: command not found
|
||||
# Those can be safely ignored.
|
||||
define LINUX_HEADERS_INSTALL_STAGING_CMDS
|
||||
(cd $(@D); \
|
||||
$(TARGET_MAKE_ENV) $(MAKE) \
|
||||
|
||||
@@ -1,8 +1,31 @@
|
||||
Add the compilation of a shared library.
|
||||
Compile the lua binary with the shared library.
|
||||
And install the shared library.
|
||||
The variable BUILDMODE allows to switch between static and dynamic mode.
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
|
||||
Index: b/Makefile
|
||||
===================================================================
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -44,6 +44,7 @@
|
||||
TO_BIN= lua luac
|
||||
TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
|
||||
TO_LIB= liblua.a
|
||||
+TO_SOLIB = liblua.so.$(R)
|
||||
TO_MAN= lua.1 luac.1
|
||||
|
||||
# Lua version and release.
|
||||
@@ -61,6 +62,8 @@
|
||||
install: dummy
|
||||
cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
|
||||
cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
|
||||
+ test -f src/$(TO_SOLIB) && cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB) || :
|
||||
+ test -f src/$(TO_SOLIB) && ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so || :
|
||||
cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
|
||||
cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
|
||||
cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
|
||||
Index: b/src/Makefile
|
||||
===================================================================
|
||||
--- a/src/Makefile
|
||||
@@ -15,18 +38,21 @@ Index: b/src/Makefile
|
||||
CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
|
||||
lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \
|
||||
lundump.o lvm.o lzio.o
|
||||
@@ -36,8 +37,9 @@
|
||||
@@ -36,8 +37,13 @@
|
||||
LUAC_O= luac.o print.o
|
||||
|
||||
ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
|
||||
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
|
||||
+ifneq (dynamic,$(BUILDMODE))
|
||||
ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
|
||||
+else
|
||||
+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
|
||||
+endif
|
||||
ALL_A= $(LUA_A)
|
||||
+ALL_SO= $(LUA_SO)
|
||||
|
||||
default: $(PLAT)
|
||||
|
||||
@@ -47,12 +49,18 @@
|
||||
@@ -47,12 +53,23 @@
|
||||
|
||||
a: $(ALL_A)
|
||||
|
||||
@@ -36,14 +62,17 @@ Index: b/src/Makefile
|
||||
$(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
|
||||
$(RANLIB) $@
|
||||
|
||||
-$(LUA_T): $(LUA_O) $(LUA_A)
|
||||
- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
|
||||
+$(LUA_SO): $(CORE_O) $(LIB_O)
|
||||
+ $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $?
|
||||
+ ln -fs $@.$(PKG_VERSION) $@
|
||||
+
|
||||
+ifneq (dynamic,$(BUILDMODE))
|
||||
$(LUA_T): $(LUA_O) $(LUA_A)
|
||||
$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
|
||||
+else
|
||||
+$(LUA_T): $(LUA_O) $(LUA_SO)
|
||||
+ $(CC) -o $@ -L. $(MYLDFLAGS) $(LUA_O) -llua $(LIBS)
|
||||
+endif
|
||||
|
||||
$(LUAC_T): $(LUAC_O) $(LUA_A)
|
||||
$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
|
||||
|
||||
@@ -1,8 +1,31 @@
|
||||
Add the compilation of a shared library.
|
||||
Compile the lua binary with the shared library.
|
||||
And install the shared library.
|
||||
The variable BUILDMODE allows to switch between static and dynamic mode.
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
|
||||
Index: b/Makefile
|
||||
===================================================================
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -42,6 +42,7 @@
|
||||
TO_BIN= lua luac
|
||||
TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
|
||||
TO_LIB= liblua.a
|
||||
+TO_SOLIB = liblua.so.$(R)
|
||||
TO_MAN= lua.1 luac.1
|
||||
|
||||
# Lua version and release.
|
||||
@@ -60,6 +61,8 @@
|
||||
install: dummy
|
||||
cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
|
||||
cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
|
||||
+ test -f src/$(TO_SOLIB) && cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB) || :
|
||||
+ test -f src/$(TO_SOLIB) && ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so || :
|
||||
cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
|
||||
cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
|
||||
cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
|
||||
Index: b/src/Makefile
|
||||
===================================================================
|
||||
--- a/src/Makefile
|
||||
@@ -15,18 +38,21 @@ Index: b/src/Makefile
|
||||
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
|
||||
lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
|
||||
ltm.o lundump.o lvm.o lzio.o
|
||||
@@ -43,8 +44,9 @@
|
||||
@@ -43,8 +44,13 @@
|
||||
LUAC_O= luac.o
|
||||
|
||||
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
|
||||
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
|
||||
+ifneq (dynamic,$(BUILDMODE))
|
||||
ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
|
||||
+else
|
||||
+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
|
||||
+endif
|
||||
ALL_A= $(LUA_A)
|
||||
+ALL_SO= $(LUA_SO)
|
||||
|
||||
# Targets start here.
|
||||
default: $(PLAT)
|
||||
@@ -55,12 +57,18 @@
|
||||
@@ -55,12 +61,23 @@
|
||||
|
||||
a: $(ALL_A)
|
||||
|
||||
@@ -36,14 +62,17 @@ Index: b/src/Makefile
|
||||
$(AR) $@ $(BASE_O)
|
||||
$(RANLIB) $@
|
||||
|
||||
-$(LUA_T): $(LUA_O) $(LUA_A)
|
||||
- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
|
||||
+$(LUA_SO): $(CORE_O) $(LIB_O)
|
||||
+ $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $?
|
||||
+ ln -fs $@.$(PKG_VERSION) $@
|
||||
+
|
||||
+ifneq (dynamic,$(BUILDMODE))
|
||||
$(LUA_T): $(LUA_O) $(LUA_A)
|
||||
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
|
||||
+else
|
||||
+$(LUA_T): $(LUA_O) $(LUA_SO)
|
||||
+ $(CC) -o $@ -L. $(LDFLAGS) $(LUA_O) -llua $(LIBS)
|
||||
+endif
|
||||
|
||||
$(LUAC_T): $(LUAC_O) $(LUA_A)
|
||||
$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
|
||||
|
||||
@@ -14,8 +14,7 @@ LUA_INSTALL_STAGING = YES
|
||||
LUA_LICENSE = MIT
|
||||
LUA_LICENSE_FILES = COPYRIGHT
|
||||
|
||||
LUA_CFLAGS = -Wall -fPIC
|
||||
LUA_MYLIBS += -ldl
|
||||
LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_2),y)
|
||||
LUA_CFLAGS += -DLUA_COMPAT_ALL
|
||||
@@ -24,17 +23,23 @@ LUA_CFLAGS += -D_FILE_OFFSET_BITS=32
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PREFER_STATIC_LIB),y)
|
||||
LUA_BUILDMODE = static
|
||||
else
|
||||
LUA_BUILDMODE = dynamic
|
||||
LUA_CFLAGS += -DLUA_USE_DLOPEN
|
||||
LUA_MYLIBS += -ldl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y)
|
||||
LUA_DEPENDENCIES = readline ncurses
|
||||
LUA_MYLIBS += -lreadline -lhistory -lncurses
|
||||
LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_READLINE
|
||||
LUA_CFLAGS += -DLUA_USE_READLINE
|
||||
else
|
||||
ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_LINENOISE),y)
|
||||
LUA_DEPENDENCIES = linenoise
|
||||
LUA_MYLIBS += -llinenoise
|
||||
LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_LINENOISE
|
||||
else
|
||||
LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN
|
||||
LUA_CFLAGS += -DLUA_USE_LINENOISE
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -53,6 +58,7 @@ define LUA_BUILD_CMDS
|
||||
CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" \
|
||||
CFLAGS="$(TARGET_CFLAGS) $(LUA_CFLAGS)" \
|
||||
MYLIBS="$(LUA_MYLIBS)" AR="$(TARGET_CROSS)ar rcu" \
|
||||
BUILDMODE=$(LUA_BUILDMODE) \
|
||||
PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
|
||||
endef
|
||||
|
||||
@@ -61,59 +67,25 @@ define HOST_LUA_BUILD_CMDS
|
||||
CFLAGS="$(HOST_LUA_CFLAGS)" \
|
||||
MYLDFLAGS="$(HOST_LDFLAGS)" \
|
||||
MYLIBS="$(HOST_LUA_MYLIBS)" \
|
||||
BUILDMODE=static \
|
||||
PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
|
||||
endef
|
||||
|
||||
define LUA_INSTALL_STAGING_CMDS
|
||||
$(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install
|
||||
$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
|
||||
$(INSTALL) -m 0755 -D $(@D)/src/lua $(STAGING_DIR)/usr/bin/lua
|
||||
$(INSTALL) -m 0755 -D $(@D)/src/luac $(STAGING_DIR)/usr/bin/luac
|
||||
$(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
|
||||
$(STAGING_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
|
||||
ln -sf liblua.so.$(LUA_VERSION) $(STAGING_DIR)/usr/lib/liblua.so
|
||||
$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a
|
||||
$(INSTALL) -m 0644 -D $(@D)/src/lua.h $(STAGING_DIR)/usr/include/lua.h
|
||||
$(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(STAGING_DIR)/usr/include/luaconf.h
|
||||
$(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(STAGING_DIR)/usr/include/lualib.h
|
||||
$(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include/lauxlib.h
|
||||
endef
|
||||
|
||||
define LUA_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua
|
||||
$(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac
|
||||
$(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
|
||||
$(TARGET_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
|
||||
ln -sf liblua.so.$(LUA_VERSION) $(TARGET_DIR)/usr/lib/liblua.so
|
||||
mkdir -p $(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER)
|
||||
mkdir -p $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)
|
||||
$(MAKE) INSTALL_TOP="$(TARGET_DIR)/usr" -C $(@D) install
|
||||
endef
|
||||
|
||||
define HOST_LUA_INSTALL_CMDS
|
||||
$(INSTALL) -m 0755 -D $(@D)/src/lua $(HOST_DIR)/usr/bin/lua
|
||||
$(INSTALL) -m 0755 -D $(@D)/src/luac $(HOST_DIR)/usr/bin/luac
|
||||
$(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
|
||||
$(HOST_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
|
||||
ln -sf liblua.so.$(LUA_VERSION) $(HOST_DIR)/usr/lib/liblua.so
|
||||
$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(HOST_DIR)/usr/lib/liblua.a
|
||||
$(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install
|
||||
$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
|
||||
$(HOST_DIR)/usr/lib/pkgconfig/lua.pc
|
||||
$(INSTALL) -m 0644 -D $(@D)/src/lua.h $(HOST_DIR)/usr/include/lua.h
|
||||
$(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(HOST_DIR)/usr/include/luaconf.h
|
||||
$(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(HOST_DIR)/usr/include/lualib.h
|
||||
$(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(HOST_DIR)/usr/include/lauxlib.h
|
||||
endef
|
||||
|
||||
LUA_INSTALLED_FILES = \
|
||||
/usr/include/lua.h \
|
||||
/usr/include/luaconf.h \
|
||||
/usr/include/lualib.h \
|
||||
/usr/include/lauxlib.h \
|
||||
/usr/lib/pkgconfig/lua.pc \
|
||||
/usr/bin/lua \
|
||||
/usr/bin/luac \
|
||||
/usr/lib/liblua.a \
|
||||
/usr/lib/liblua.so*
|
||||
|
||||
$(eval $(generic-package))
|
||||
$(eval $(host-generic-package))
|
||||
|
||||
@@ -48,11 +48,11 @@ define LUAJIT_BUILD_CMDS
|
||||
endef
|
||||
|
||||
define LUAJIT_INSTALL_STAGING_CMDS
|
||||
$(MAKE) PREFIX="/usr" DESTDIR="$(STAGING_DIR)" -C $(@D) install
|
||||
$(MAKE) PREFIX="/usr" DESTDIR="$(STAGING_DIR)" LDCONFIG=true -C $(@D) install
|
||||
endef
|
||||
|
||||
define LUAJIT_INSTALL_TARGET_CMDS
|
||||
$(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" -C $(@D) install
|
||||
$(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" LDCONFIG=true -C $(@D) install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
@@ -37,6 +37,7 @@ define HOST_LUAROCKS_INSTALL_CMDS
|
||||
echo "external_deps_dirs = { [[$(STAGING_DIR)/usr]] }" >> $(LUAROCKS_CONFIG_FILE)
|
||||
echo "gcc_rpath = false" >> $(LUAROCKS_CONFIG_FILE)
|
||||
echo "rocks_trees = { [[$(TARGET_DIR)/usr]] }" >> $(LUAROCKS_CONFIG_FILE)
|
||||
echo "wrap_bin_scripts = false" >> $(LUAROCKS_CONFIG_FILE)
|
||||
endef
|
||||
|
||||
$(eval $(host-generic-package))
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
matchbox-lib: include setjmp.h
|
||||
|
||||
Based on this upstream patch:
|
||||
|
||||
http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/commit/?id=9315bcce1f01e7d6c00161442d61d3c676794d9d
|
||||
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
--- libmatchbox-1.9/libmb/mbpixbuf.c.orig 2014-02-21 12:45:46.867035956 +0000
|
||||
+++ libmatchbox-1.9/libmb/mbpixbuf.c 2014-02-21 12:46:43.482949583 +0000
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
#include <strings.h>
|
||||
#include "mbpixbuf.h"
|
||||
+#include <setjmp.h>
|
||||
|
||||
#define BYTE_ORD_24_RGB 0
|
||||
#define BYTE_ORD_24_RBG 1
|
||||
@@ -1,5 +1,6 @@
|
||||
config BR2_PACKAGE_MPG123
|
||||
bool "mpg123"
|
||||
depends on BR2_USE_MMU # fork - in the application
|
||||
help
|
||||
Fast, free and portable MPEG audio player for Unix. It supports
|
||||
MPEG 1.0/2.0 layers 1, 2 and 3.
|
||||
|
||||
@@ -11,6 +11,17 @@ NCFTP_TARGET_BINS = ncftp
|
||||
NCFTP_LICENSE = Clarified Artistic License
|
||||
NCFTP_LICENSE_FILES = doc/LICENSE.txt
|
||||
|
||||
NCFTP_DEPENDENCIES = host-autoconf
|
||||
|
||||
# The bundled configure script is generated by autoconf 2.13 and doesn't
|
||||
# detect cross-compilation correctly. Therefore, we have to regenerate it.
|
||||
# We need to pass -I because of the non-standard m4 directory name, and
|
||||
# none of the other autotools are used, so the below is the easiest.
|
||||
define NCFTP_RUN_AUTOCONF
|
||||
(cd $(@D); $(HOST_DIR)/usr/bin/autoconf -I$(@D)/autoconf_local/)
|
||||
endef
|
||||
NCFTP_PRE_CONFIGURE_HOOKS += NCFTP_RUN_AUTOCONF
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NCFTP_GET),y)
|
||||
NCFTP_TARGET_BINS += ncftpget
|
||||
endif
|
||||
|
||||
@@ -134,6 +134,7 @@ comment "ffmpeg support needs a toolchain w/ largefile, IPv6"
|
||||
|
||||
config BR2_PACKAGE_OPENCV_WITH_GSTREAMER
|
||||
bool "gstreamer support"
|
||||
depends on BR2_USE_MMU # gstreamer -> libglib2
|
||||
depends on BR2_USE_WCHAR # gstreamer -> libglib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2
|
||||
select BR2_PACKAGE_GSTREAMER
|
||||
@@ -141,6 +142,7 @@ config BR2_PACKAGE_OPENCV_WITH_GSTREAMER
|
||||
select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP
|
||||
|
||||
comment "gstreamer support needs a toolchain w/ wchar, threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_OPENCV_WITH_GTK
|
||||
@@ -149,6 +151,7 @@ config BR2_PACKAGE_OPENCV_WITH_GTK
|
||||
depends on BR2_USE_WCHAR # libgtk2 -> libglib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_MMU # libgtk2 -> glib2
|
||||
select BR2_PACKAGE_LIBGTK2
|
||||
|
||||
config BR2_PACKAGE_OPENCV_WITH_JPEG
|
||||
@@ -167,6 +170,7 @@ config BR2_PACKAGE_OPENCV_WITH_QT
|
||||
bool "qt backend support"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_avr32 # qt
|
||||
depends on BR2_USE_MMU # qt
|
||||
select BR2_PACKAGE_QT
|
||||
select BR2_PACKAGE_QT_STL
|
||||
default y
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
comment "openpowerlink needs a toolchain w/ C++, threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
@@ -7,6 +8,7 @@ config BR2_PACKAGE_OPENPOWERLINK
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on BR2_USE_MMU # qt
|
||||
help
|
||||
openPOWERLINK is an Open Source Industrial Ethernet
|
||||
stack implementing the POWERLINK protocol for Managing Node
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
Kill -Wno-error=cpp, old(ish) gcc versions (< 4.4) don't like it and we still
|
||||
got 4.3.x available for internal toolchains.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
diff -Nura openswan-2.6.39.orig/lib/libopenswan/Makefile openswan-2.6.39/lib/libopenswan/Makefile
|
||||
--- openswan-2.6.39.orig/lib/libopenswan/Makefile 2013-06-11 07:22:50.228520267 -0300
|
||||
+++ openswan-2.6.39/lib/libopenswan/Makefile 2013-06-11 07:27:40.087849447 -0300
|
||||
@@ -86,7 +86,7 @@
|
||||
CFLAGS+= -Wno-error=cast-qual
|
||||
|
||||
# some junk left in alg_info.c
|
||||
-CFLAGS+= -Wno-error=cpp
|
||||
+#CFLAGS+= -Wno-error=cpp
|
||||
|
||||
#CFLAGS+= -Wmissing-declarations
|
||||
CFLAGS+= -Wstrict-prototypes
|
||||
diff -Nura openswan-2.6.39.orig/programs/pluto/Makefile openswan-2.6.39/programs/pluto/Makefile
|
||||
--- openswan-2.6.39.orig/programs/pluto/Makefile 2013-06-11 07:22:49.753504978 -0300
|
||||
+++ openswan-2.6.39/programs/pluto/Makefile 2013-06-11 07:27:53.020265681 -0300
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
# must turn this off due to myid.c
|
||||
CFLAGS+= -Wno-error=cast-qual
|
||||
-CFLAGS+= -Wno-error=cpp
|
||||
+#CFLAGS+= -Wno-error=cpp
|
||||
|
||||
ifeq ($(HAVE_BROKEN_POPEN),true)
|
||||
CFLAGS+=-DHAVE_BROKEN_POPEN
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENSWAN_VERSION = 2.6.39
|
||||
OPENSWAN_VERSION = 2.6.40
|
||||
OPENSWAN_SITE = http://download.openswan.org/openswan
|
||||
OPENSWAN_LICENSE = GPLv2+, BSD-3c
|
||||
OPENSWAN_LICENSE_FILES = COPYING LICENSE
|
||||
|
||||
@@ -3,6 +3,7 @@ config BR2_PACKAGE_PCMANFM
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
depends on BR2_USE_WCHAR # glib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
|
||||
depends on BR2_USE_MMU # glib2
|
||||
select BR2_PACKAGE_GAMIN
|
||||
select BR2_PACKAGE_STARTUP_NOTIFICATION
|
||||
select BR2_PACKAGE_XLIB_LIBX11
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
configure.ac: explicitly add pthread cflags/libs in the libusb test
|
||||
|
||||
If libusb-config does not exist, LIBUSB_CFLAGS and PTHREAD_CFLAGS will be
|
||||
empty, and the test for libusb will be performed without additional flags.
|
||||
However, when libusb needs threads, some extra flags are needed (depending
|
||||
on the platform), like -pthreads, -lpthread, etc. Without these flags, the
|
||||
test for libusb_init() will fail to link correctly, and pcsc-lite will fail
|
||||
detecting libusb.
|
||||
|
||||
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
|
||||
|
||||
Upstream-status: will be submitted
|
||||
|
||||
---
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -254,8 +254,8 @@ if test "x$use_libusb" != xno ; then
|
||||
saved_CPPFLAGS="$CPPFLAGS"
|
||||
saved_LIBS="$LIBS"
|
||||
|
||||
- CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS"
|
||||
- LIBS="$LDFLAGS $LIBUSB_LIBS"
|
||||
+ CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS $PTHREAD_CFLAGS"
|
||||
+ LIBS="$LDFLAGS $LIBUSB_LIBS $PTHREAD_LIBS"
|
||||
|
||||
AC_CHECK_HEADERS(libusb.h, [],
|
||||
[ AC_MSG_ERROR([libusb.h not found, use ./configure LIBUSB_CFLAGS=...]) ])
|
||||
@@ -11,6 +11,7 @@ PCSC_LITE_INSTALL_STAGING = YES
|
||||
PCSC_LITE_DEPENDENCIES = host-pkgconf
|
||||
PCSC_LITE_LICENSE = BSD-3c
|
||||
PCSC_LITE_LICENSE_FILES = COPYING
|
||||
PCSC_LITE_AUTORECONF = YES
|
||||
|
||||
# - libudev and libusb are optional
|
||||
# - libudev and libusb can't be used together
|
||||
|
||||
@@ -162,11 +162,13 @@ config BR2_PACKAGE_PHP_EXT_INTL
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on !BR2_arc # icu -> atomic builtins
|
||||
depends on !BR2_BINFMT_FLAT # icu
|
||||
help
|
||||
Internationalization support
|
||||
|
||||
comment "intl support needs a toolchain w/ C++, wchar"
|
||||
depends on !BR2_arc
|
||||
depends on !BR2_BINFMT_FLAT
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
|
||||
|
||||
comment "Image processing"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user