Commit Graph

62 Commits

Author SHA1 Message Date
Richard Purdie c8dee9b92d Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata:

sed \
-e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \
-e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-i `grep -ril bb.data *`

(From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-10 11:51:19 +00:00
Christopher Larson 412a2dc2f9 autotools: fix multi-word arguments for EXTRA_OECONF
This is needed to better support things like the following (with a
multi-word BUILD_CC):

    EXTRA_OECONF += '"ac_cv_prog_CC_FOR_BUILD=${BUILD_CC}"'

(From OE-Core rev: 38a394e7ffedccfabda085c97add8944718943c2)

Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-14 13:18:13 +01:00
Richard Purdie 5405efae32 autotools: Enhance gettext handling to better work with SCM versions of code
If we pull SCM based code using gettext, Makefile.in.in in the
po directory can be missing. We therefore need to add this if
its not already present. We could use gettextize if it wasn't
so broken (for example requiring user input on stdin and installing
way more files that we ever care about such as the m4 files).

We also have a problem if a recipe sets a different AUX dir, for
now fix this by allowing recipes to specify when this is being done
using the AUTOTOOLS_AUXDIR variable. Ultimately we could likely
figure this out automatically.

(From OE-Core rev: acaefad1aa4b45813a004e0cd1d85bc013e435f4)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-14 13:18:05 +01:00
Richard Purdie 5ea73bde5e autotools.bbclass: Allow dependency tracking option to be easily overridden
(From OE-Core rev: c353a60bd8a6151a3538f0900aff0b5856aa0684)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-06 16:59:40 +01:00
Richard Purdie 9c8b066c48 autotools: Disable dependency tracking
There is no point in us spending time generating a ton of dependency
information in source directories when we don't actually use it
for our one off builds. We might as well disable the option and
take the speed up.

(From OE-Core rev: 970e0ae610804638d00b0a6b85c6e2e895778e8e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:19 +01:00
Richard Purdie 2f8d643c76 Remove help2man dependency
The help2man script is pretty useless to us. It requires to run the target
binary to extract help information which is not possible for any of our
cross compiled target binaries.

We're not interested in man pages for -cross/-native tools.

It therefore makes no sense to have this as a core build dependency.

This patch removes the dependeny and replaces it with a script
returning false. This will trigger autotool's missing utility
to use the copy of the man page included with the sources which
is what would already happen when we tried to run cross compiled
binaries anyway.

(From OE-Core rev: 288343e30604b944dc18fd82172febd314d9c520)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:19 +01:00
Richard Purdie 9fe66fd8e2 autotools.bbclass: Set the dynamic linker search path for libtool correctly
libtool obtains the search path from /etc/ld.so.conf and hardcodes /usr/lib
and /lib. This results in host contamination and variable sets of RPATH
values ending up in binaries.

By exporting the correct values for all autotools recipes we avoid this.

(From OE-Core rev: 93e595d5c89ebacdb8d1e6fcfe6f58fe2d30de28)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-26 17:56:43 +01:00
Richard Purdie 23774530c1 autotools.bbclass: Fix m4 file race
If something removes .m4 files from the aclocal directory whilst aclocal is
running it gets upset. To avoid this we need to take a copy of the aclocal
directory and build against this instead.

[YOCTO #861]

(From OE-Core rev: 6a4778e21341f031569f561e7699d2c616b60af0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-03 17:46:46 +01:00
Richard Purdie c18aa8d065 multilib: Add support for compiling recipes against multiple ABIs
This patch adds the core multilib class which can be used along with a
parameter specifying the mutlilib to use in BBCLASSEXTEND.

The MLPREFIX variable is added and can be used in cases where its too
difficult to dynmaically work out where a mutltilib prefix is needed
to be added to a variable.

This includes:
  * SHLIBSDIR and PACKAGE_ARCH fixes from Lianhao Lu.
  * PACKAGE_DYNAMIC mapping from Yu Ke
  * PACKAGE_INSTALL mapping from Yu Ke
  * RPROVIDES mapping from Yu Ke
  * TARGET_VENDOR fix from Mark Hatle
  * Ignorning *-native-runtime dependnecies as well as *-native from Yu Ke
  * Map PKG and ALLOW_EMPTY from Dongxiao Xu
  * Ensure RCONFLICTS and PKG field dependencies are remapped (from Dongxiao Xu)
  * Ensure PN and MLPREFIX are set at the same time to ensure consistent BPN values (Yu Ke)

(From OE-Core rev: 5d9453049915db48ec4b5972e12287417ebb61a2)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Xu Dongxiao <dongxiao.xu@intel.com>
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-27 16:18:40 +01:00
Tom Rini 98615f6387 autotools.bbclass: Add help2man-native to the main DEPENDS tree
With help2man no longer being required by sanity.bbclass we need to
make sure that if we are going to build autotools stuff that help2man
will be there as it's a frequent implicit dependency.

(From OE-Core rev: fd03530b4e2fb0660212a5ffb849c2169076585c)

Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-20 15:27:37 +01:00
Richard Purdie 1b53eef276 native/nativesdk: Clean up the depends ordering after bitbake override handling updates
This massively cleans up the dependency handling in the two classes
when interacting with BBCLASSEXTEND.

This change has a dependency on the bitbake override handling change
and also the existence of the RecipePreFinalise event.

(From OE-Core rev: f183c7cfe377fa6ed2777605c3590a9dda2060df)

Signed-off-by: Richard  Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-09 22:49:10 +01:00
Darren Hart fc934af7c8 logging: update existing oe* logging users to the bb* interface
The new bash logging class provides bbnote, bbwarn, bbfatal, and bbdebug
replacements (as well as bbplain and bberror) for the oe* equivalents. Use the
new bb* API in preparation to delete the oe* logging API.

This patch was automatically generated by a sed script. The result has been
visually inspected and used to build core-image-sato for qemux86.

(From OE-Core rev: a1f09fce5caba389d0484b169f0cde85d64514fa)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-04 00:54:37 +01:00
Khem Raj 34e8e9e285 autotools.bbclass: Copy gettext files only if --disable-nls is not set
(From OE-Core rev: 040d4dea9637a4723cbb2a74975130d3b86e569a)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-28 10:45:43 +01:00
Colin Walters c879c637cd autotools: Pass --disable-silent-rules to configure
Non-verbose logs are really annoying when trying to debug a build
failure.  A lot of projects are copying in the flag to use
AM_SILENT_RULES which automake gained recently.  We need to undo
this.

We'll get a warning from configure if it's not recognized, but that's
fine.

(From OE-Core rev: 86a760d8b573cfffaf1ac633fcffdfec748663cb)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-12 10:12:20 -07:00
Richard Purdie b36930096d autotools.bbclass: Fix automake file race issues
If one package is configuring when automake is built, the aclocal-VERSION
directory can be created or removed and this can confuse the configure
process.

Since we always run automake-native, it should always be using the
autoake-native aclocal directory for automake files which is the
result of this patch.

(From OE-Core rev: 2a15188d631a97dc20940f7edc801212e191332f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-10 18:14:28 -08:00
Richard Purdie d1ed188123 autotools.bbclass: Drop info directory listings as they're going to be broken if generated at this point and cause file conflicts
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-02-02 16:56:24 +00:00
Richard Purdie 7476df3fa2 autotools.bbclass: Drop unused autotools_stage_dir dummy function
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-01-27 11:10:57 +00:00
Richard Purdie 35d44a438d autotools.bbclass: Only include aclocal directories if the exist, no point in creating them
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-01-27 11:10:57 +00:00
Scott Garman 1a7509d673 autotools.bbclass: libtool sysroot support changes
We do not do it for native recipes, as the native compiler should
fall back to a prefix of /usr and not solely depend on the sysroot.
Otherwise we end up staging everything in the native sysroot before
we start to build target recipes.

Also remove la mangling code, which is no longer necessary.

Commit derived from Khem Raj's OE commits.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2011-01-21 01:36:15 -08:00
Jeff Polk 2e9d981d76 autotools: enable siteconfig by default
eglibc glibc ncurses uclibc zlib: remove explicit siteconfig

Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
2010-09-10 12:57:16 +01:00
Richard Purdie 90e8bc75e3 autotools.bbclass: Drop a number of legacy functions that shouldn't be (and aren't) used in poky now
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-08-19 12:51:37 +01:00
Richard Purdie dc807f54f8 Finally deprecate all legacy do_stage functions. This changes the existing warning
into a fatal error if any legacy do_stage functions are found.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-07-22 11:44:28 +01:00
Joshua Lock 4d1f39af75 autotools: deprecate autotools_stage class
Move the functionality into autotools and ensure all our Poky recipes are no
longer using it.
Keep the autools_stage class around for OE compatability but just have it
inherit autools.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-04-27 17:11:28 +01:00
Richard Purdie fcfbc7b1e7 autotools.bbclass: Allow extraction of the configure arguments for use in strange testcases
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-03-29 17:04:13 +01:00
Richard Purdie a30f6e968c base.bbclass: Don't inherit siteinfo in base.bbclass [based on an OE patch from Chris Larson] 2010-03-19 18:08:35 +00:00
Richard Purdie 66c952cbc2 autotools.bbclass: Make sure config.rpath is present if needed
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-30 17:03:38 +00:00
Richard Purdie c6f860596c base/autotools.bbclass: Make sure extra dependencies are not lost for native and nativesdk BBCLASSEXTEND. Ugly but no simpler/neater way seems possible
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-13 12:15:28 +00:00
Richard Purdie c54117458a classes: Remove and sanitise import statements
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-13 12:15:28 +00:00
Richard Purdie 379bc4788f classes: Various staging improvement fixups
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-13 12:15:23 +00:00
Richard Purdie 6ea78d6489 autotools.bbclass: Separate out useful staging functions into base.bbclass and call from autotools classes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-13 12:15:22 +00:00
Richard Purdie 1383f0fb4c autotools.bbclass: No need to fork sed each time
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-13 12:15:22 +00:00
Richard Purdie cbcad726fe autotools.bbclass: Convert .la file mangling to package preprocessing hook
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-13 12:15:22 +00:00
Richard Purdie af85ce4b4e Remove layout_* variables
Remove layout_* variables and replace them with variables specific to the
different classes. The layout variables were only useful for the native/cross
classes and caused more confusion than they solved. They didn't scale to the
sdk class. It now clear a small set of native/cross variables fulfil the needs.

This patch also changes native.bbclass to use "/" as the STAGING_DIR which makes
sense since we're installing binaries into the locations we're compiling them for.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-09-17 22:24:36 +01:00
Richard Purdie b8398e1cdf autotools.bbclass: Remove pointless inherit
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-08-12 12:02:21 +01:00
Richard Purdie 9439e99ae7 autotools.bbclass: Fix to work with configure files with leading whitespace
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-07-16 15:54:47 +01:00
Richard Purdie 5a4c688958 packaged-staging.bbclass: Detect when we're using autotools_stage_all and don't hold the lock for as long when that is the case giving a significant performance boost with less lock contention and staging area file timestamp checking required
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-06-11 14:46:17 +01:00
Richard Purdie 4a3a35f81c autotools.bbclass: Handle /lib as well as /usr/lib in autotools_stage_all 2008-11-04 15:40:56 +00:00
Richard Purdie b6fefce736 autotools.bbclass: Switch stage_autotools_all to change la files itself and to stop using oe_libinstall
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4459 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-05-12 13:09:17 +00:00
Richard Purdie be886a8b1b autotools.bbclass: There is no need to use the strange -t option to cp anymore
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4442 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-05-06 14:18:01 +00:00
Richard Purdie 8d715a27d0 autotools.bbclass: Drop enable-maintainer-mode until such times as its been tested properly
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4109 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-03-21 00:24:24 +00:00
Ross Burton 121b6e1c94 autotools.bbclass: fix typo in --enable-maintainer-mode
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4107 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-03-20 16:30:21 +00:00
Richard Purdie 013882eb9a autotools.bbclass: Add autotools_stage_dir to help staging directories and increase list of directories to stage (include base_sbin, base_bin and libexec)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4098 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-03-20 10:52:05 +00:00
Richard Purdie d36c1d83f5 autotools.bbclass: Some further tweaks to autotools_stage_all
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4080 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-03-19 20:30:30 +00:00
Richard Purdie 69215b0451 autotools.bbclass: Fix typos
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4079 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-03-19 20:25:28 +00:00
Richard Purdie 80ec6694d7 autotools.bbclass: Handle case where is an empty directory
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4078 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-03-19 20:19:50 +00:00
Richard Purdie b26a7c4be9 autotools.bbclass: autotools_stage_all - improve handling of datadir
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4077 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-03-19 20:07:47 +00:00
Richard Purdie b02d95a61f autotools.bbclass: Add handling binary staging capability to autotools_stage_all for compatible binaries fixing various -native package issues
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4075 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-03-19 17:53:44 +00:00
Richard Purdie 38854a1101 autotools.bbclass/native.bbclass: Use autotools_stage_all instead of oe_runmake install for staging autotooled native packages (from OE.dev)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4056 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-03-19 15:35:13 +00:00
Ross Burton c48757beab autotools.bbclass: enable maintainer mode when configuring
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3758 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-02-11 17:57:44 +00:00
Richard Purdie 1fd6bb16d8 autotools.bbclass: Ensure the current working directory is preserved in autotools_stage_all
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3620 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-01-29 20:55:25 +00:00