mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -13,9 +13,11 @@ obstack_printf() in uClibc for example).
|
||||
Based on the former patch by Thomas Petazzoni.
|
||||
|
||||
[Vincent: tweak patch for 0.166]
|
||||
[Bernd: rebased patch for 0.177]
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
Makefile.am | 6 +++++-
|
||||
configure.ac | 6 ++++++
|
||||
@@ -25,29 +27,28 @@ diff --git a/Makefile.am b/Makefile.am
|
||||
index 2ff444e7bf1d..70443abb4fb6 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -26,9 +26,13 @@ AM_MAKEFLAGS = --no-print-directory
|
||||
|
||||
@@ -26,8 +26,12 @@ AM_MAKEFLAGS = --no-print-directory
|
||||
|
||||
pkginclude_HEADERS = version.h
|
||||
|
||||
|
||||
+if ENABLE_PROGS
|
||||
+PROGS_SUBDIR = src
|
||||
+endif
|
||||
+
|
||||
# Add doc back when we have some real content.
|
||||
SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \
|
||||
- backends src po tests
|
||||
+ backends $(PROGS_SUBDIR) po tests
|
||||
|
||||
SUBDIRS = config m4 lib libelf libcpu backends libebl libdwelf libdwfl libdw \
|
||||
- libasm debuginfod src po doc tests
|
||||
+ libasm debuginfod $(PROGS_SUBDIR) po doc tests
|
||||
|
||||
EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
|
||||
COPYING COPYING-GPLV2 COPYING-LGPLV3
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c2c1d90b2133..7b4c38381cca 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -259,6 +259,12 @@ AC_SUBST([LIBEBL_SUBDIR])
|
||||
AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR")
|
||||
AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.])
|
||||
|
||||
@@ -390,6 +390,12 @@
|
||||
[tests_use_rpath=$enableval], [tests_use_rpath=no])
|
||||
AM_CONDITIONAL(TESTS_RPATH, test "$tests_use_rpath" = yes)
|
||||
|
||||
+AC_ARG_ENABLE([progs],
|
||||
+ AS_HELP_STRING([--enable-progs], [enable progs]),
|
||||
+ enable_progs=$enableval,
|
||||
@@ -57,6 +58,6 @@ index c2c1d90b2133..7b4c38381cca 100644
|
||||
dnl zlib is mandatory.
|
||||
save_LIBS="$LIBS"
|
||||
LIBS=
|
||||
--
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user