| Message ID | 9000c07087a57b11c709.1407957947@localhost |
|---|---|
| State | Superseded |
| Headers | show |
On Wed, Aug 13, 2014 at 9:25 PM, Thomas De Schampheleire <patrickdepinguin@gmail.com> wrote: > Currently, pkg-utils.mk (included via package/Makefile.in) is only included > when a configuration file already exists. This means that none of the > utilities it defines are available without .config. > > In particular: > - the MESSAGE macro, causing pretty build output. Since some make targets > can be run even without .config, like 'make manual', not having this > pretty printing is odd. > > - pkgname, pkgdir: in a subsequent patch, these functions will be used for > the generation of the manual, and since this should work also without > .config, we need these functions to be available. > > This patch moves the include of pkg-utils.mk from package/Makefile.in to > Makefile, outside of the check for .config. > > This is a quick fix. The full solution involves to minimize the amount of > Makefile code that is guarded by a check on .config. This approach will be > taken in the 2014.11 release cycle. > > Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: Samuel Martin <s.martin49@gmail.com> Regards, -- Samuel
diff -r 3bcf63a46bc1 -r 9000c07087a5 Makefile --- a/Makefile Tue Aug 05 18:25:11 2014 -0300 +++ b/Makefile Wed Aug 13 11:30:25 2014 +0200 @@ -271,6 +271,8 @@ # Causes breakage with packages that needs host-ruby unexport RUBYOPT +include package/pkg-utils.mk + ifeq ($(BR2_HAVE_DOT_CONFIG),y) ################################################################################ diff -r 3bcf63a46bc1 -r 9000c07087a5 package/Makefile.in --- a/package/Makefile.in Tue Aug 05 18:25:11 2014 -0300 +++ b/package/Makefile.in Wed Aug 13 11:30:25 2014 +0200 @@ -385,7 +385,6 @@ SHARED_STATIC_LIBS_OPTS = --enable-static --enable-shared endif -include package/pkg-utils.mk include package/pkg-download.mk include package/pkg-autotools.mk include package/pkg-cmake.mk
Currently, pkg-utils.mk (included via package/Makefile.in) is only included when a configuration file already exists. This means that none of the utilities it defines are available without .config. In particular: - the MESSAGE macro, causing pretty build output. Since some make targets can be run even without .config, like 'make manual', not having this pretty printing is odd. - pkgname, pkgdir: in a subsequent patch, these functions will be used for the generation of the manual, and since this should work also without .config, we need these functions to be available. This patch moves the include of pkg-utils.mk from package/Makefile.in to Makefile, outside of the check for .config. This is a quick fix. The full solution involves to minimize the amount of Makefile code that is guarded by a check on .config. This approach will be taken in the 2014.11 release cycle. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> --- v3: new patch, fixing the issue detected by Yann that 'make manual' no longer worked without .config Makefile | 2 ++ package/Makefile.in | 1 - 2 files changed, 2 insertions(+), 1 deletions(-)