Commit Graph

30 Commits (master)

Author SHA1 Message Date
Fredrik Olofsson e6901bf902 tools/automake: Revert "Do not use $(V) - force AM_V=1"
This reverts commit 43365ca662 ("Do not use $(V) - force AM_V=1") as
it breaks verbose output in automake packages, deviating from the
upstream and expected behaviour.

As you can see, neither make command outputs the expected verbose
compile command lines:

```
$ make package/mtd-utils/{clean,compile} V=sc
...
  CCLD     lsmtd
  CC       nand-utils/nanddump.o
  CCLD     nanddump
...
```
```
$ make -C build_dir/target*/mtd-utils-2.1.1 clean
...
$ make -C build_dir/target*/mtd-utils-2.1.1 V=1
...
  CC       lib/libmtd.o
  CC       lib/libfec.o
  CC       lib/common.o
  CC       lib/libcrc32.o
```

The original reason for this commit was some packages failing to build
if V is set to something other than 0 or 1. See the discussion in PR
https://github.com/openwrt/openwrt/pull/2481 for how to fix this in the
package Makefile.

Ref: PR#2481
Acked-by: Mirko Vogt <mirko-openwrt@nanl.de>
Signed-off-by: Fredrik Olofsson <fredrik.olofsson@anyfinetworks.com>
[commit title/description facelift]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
5 years ago
Alexander Couzens c61a239514
add PKG_CPE_ID ids to package and tools
CPE ids helps to tracks CVE in packages.
https://cpe.mitre.org/specification/

Thanks to swalker for CPE to package mapping and
keep tracking CVEs.

Acked-by: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
7 years ago
Thomas Langer eafaef3765 automake: Update to version 1.15.1
The new version includes the fix for new perl versions,
so remove the related patch.

Signed-off-by: Thomas Langer <thomas.langer.71@gmail.com>
7 years ago
Daniel Golle 92c80f38cf automake: import upstream fix for perl 5.26
Build broke as distributions now include Perl 5.26 and automake
triggered an "Unescaped left brace in regex" error.
Import upstream commit 13f00eb449 to fix that.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
7 years ago
Felix Fietkau 720b99215d treewide: clean up download hashes
Replace *MD5SUM with *HASH, replace MD5 hashes with SHA256

Signed-off-by: Felix Fietkau <nbd@nbd.name>
7 years ago
Jo-Philipp Wich f6c581cc3e automake: portability fixes
The rework of the host tools discovery caused automake to embed
absolute paths to staging_dir/host/bin/perl into the shebang
of the generated automake executables.

Switch to the portable "/usr/bin/env perl" and enable global
warnings through "$^W" instead of the "-w" interpreter argument.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44972
9 years ago
Mirko Vogt bc67ebc585 disable silent-rules by default
OpenWrt hides verbose output by default,
regardless of automake silent-rules being en-/disabled.

If we enable verbose output for package builds (V=s)
however, we'd like to see as most as possible.

Signed-off-by: Mirko Vogt <mirko@openwrt.org>

SVN-Revision: 44685
9 years ago
Mirko Vogt 43365ca662 Do not use $(V) - force AM_V=1
Projects using silent-rules might otherwise fail to compile.

This is due to the following resulting Makefile code:

AM_V_P = $(am__v_P_$(V))
am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
am__v_P_0 = false
am__v_P_1 = :

Automake directly uses $(V) for variable name expansion
which fails if $(V) is set to sth. else other than '0' or '1'.

This patch forces automake to not take $(V) into account
but to always use the default config for verbosity.

A better approach would be to actually take $(V) into account,
however not just pass it through (AM_V='$(V)') but
set AM_V to 0 if $V=0 / unset and to 1 otherwise.

This plan however is foiled due to my frustration about
automake as well as my lack of m4 skills.

automake bug report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=20077

Signed-off-by: Mirko Vogt <mirko@openwrt.org>

SVN-Revision: 44684
9 years ago
Jo-Philipp Wich 73a1f3597b tools: bootstrap automake to pickup the correct in-tree autoconf
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 43958
9 years ago
Jo-Philipp Wich cdaf75b641 tools: automake: update to v1.15
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 43895
9 years ago
Luka Perkov 0b4e8c4c36 automake: update to 1.11.6
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 39108
11 years ago
John Crispin 639ee81002 fixes python related autokrampf install bug
this commit fixes a compile bug triggered by pygobject

SVN-Revision: 32109
12 years ago
Florian Fainelli 093b12cba9 automake: update to 1.11.3
Signed-off-by: Luka Perkov <openwrt@lukaperkov.net>

SVN-Revision: 31173
12 years ago
Jo-Philipp Wich 1ef07eee4a automake: forcibly disable perl ithreads support The SDK when build on a machine with perl ithreads enabled will fail to run on many Gentoo systems because perl is usually built without thread capability there. In order to circumvent this issue forcibly disable the ithreads support, tested on CentOS 5.6, Ubuntu 10.04 LTS and Gentoo.
SVN-Revision: 29979
12 years ago
Jo-Philipp Wich 537164cb6d automake: generate relative aclocal symlinks in staging_dir
SVN-Revision: 29929
12 years ago
Jo-Philipp Wich 122069caba automake: further relocation fixes
SVN-Revision: 29828
12 years ago
Jo-Philipp Wich 4174cdabde automake: make relocatable by searching resources relative to STAGING_DIR
SVN-Revision: 29820
12 years ago
John Crispin ccb6b0a063 tools: clean up Makefiles / make ccache work
SVN-Revision: 29754
12 years ago
Jo-Philipp Wich 8f591af937 automake: rework patch; only skip when the directories does not exist, this preserves error cases like missing access permissions
SVN-Revision: 24427
14 years ago
Jo-Philipp Wich 127c395a0e automake: use symlinks instead of hardlinks to link aclocal versions
SVN-Revision: 24425
14 years ago
Jo-Philipp Wich 94c3f4ab4d automake: skip over not existing m4 macro directories, don't fail
SVN-Revision: 24424
14 years ago
Alexandros C. Couloumbis 276ef23e4d tools/automake: add symbolic links upto version 1.11.1
SVN-Revision: 24287
14 years ago
Alexandros C. Couloumbis d5aecceacd tools/automake: update to version 1.11.1
SVN-Revision: 24278
14 years ago
Florian Fainelli 9f15eecf64 update automake to 1.10, fixes #6022
SVN-Revision: 18527
15 years ago
Felix Fietkau e53003f5fc clean up / fix various Host/Clean templates in tools/
SVN-Revision: 15714
15 years ago
Felix Fietkau 63129f9b4c clean up automake/pkg-config handling, move separate host/package variable exports to templates, fix automake path for host builds
SVN-Revision: 15339
15 years ago
Felix Fietkau 7eb1589875 build system refactoring in preparation for allowing packages to do host-build steps
SVN-Revision: 14610
15 years ago
Lars-Peter Clausen 6b4e3e7609 Check for existence of target aclocal folder before including them.
SVN-Revision: 12934
16 years ago
Lars-Peter Clausen 1f819de60e Add wrapper around aclocal which also search in the targets staging dir aclocal folder for m4 files.
SVN-Revision: 12929
16 years ago
Felix Fietkau 2112af299f add automake to tools/
SVN-Revision: 9901
17 years ago