* [Buildroot] [PATCH v3 2/3] binutils: get rid of host-texinfo dependency and other documentation tricks
2016-10-11 12:02 [Buildroot] [PATCH v3 1/3] gdb: get rid of host-texinfo dependency Thomas De Schampheleire
@ 2016-10-11 12:02 ` Thomas De Schampheleire
2016-10-14 14:18 ` Romain Naour
2016-10-14 18:09 ` Peter Korsgaard
2016-10-11 12:02 ` [Buildroot] [PATCH v3 3/3] Revert "texinfo: new host package" Thomas De Schampheleire
` (2 subsequent siblings)
3 siblings, 2 replies; 9+ messages in thread
From: Thomas De Schampheleire @ 2016-10-11 12:02 UTC (permalink / raw)
To: buildroot
From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
The binutils/host-binutils package applied several tricks to avoid building
info documentation. In the worst case, host-texinfo is added as dependency.
However, there is a simpler solution that removes the need for all these
tricks: instruct the makefiles to use a dummy makeinfo command ('true').
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
package/binutils/binutils.mk | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
v2: use INSTALL_TARGET_OPTS for target packages iso INSTALL_OPTS
(INSTALL_STAGING_OPTS not needed: custom limited staging install)
v3: fix INSTALL_TARGET_OPTS to include the actual 'install' make target
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 3a4a661..966cc79 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -29,19 +29,8 @@ BINUTILS_LICENSE = GPLv3+, libiberty LGPLv2.1+
BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB
ifeq ($(BINUTILS_FROM_GIT),y)
-BINUTILS_DEPENDENCIES += host-flex host-bison host-texinfo
-HOST_BINUTILS_DEPENDENCIES += host-flex host-bison host-texinfo
-endif
-
-# The .info files in the >= 2.26 tarball have an incorrect timestamp,
-# so binutils tries to re-generate them. In order to avoid the
-# dependency on host-texinfo, we simply update the timestamps.
-ifeq ($(BR2_BINUTILS_VERSION_2_26_X)$(BR2_BINUTILS_VERSION_2_27_X),y)
-define BINUTILS_FIXUP_INFO_TIMESTAMPS
- find $(@D) -name '*.info' -exec touch {} \;
-endef
-BINUTILS_POST_PATCH_HOOKS += BINUTILS_FIXUP_INFO_TIMESTAMPS
-HOST_BINUTILS_POST_PATCH_HOOKS += BINUTILS_FIXUP_INFO_TIMESTAMPS
+BINUTILS_DEPENDENCIES += host-flex host-bison
+HOST_BINUTILS_DEPENDENCIES += host-flex host-bison
endif
# When binutils sources are fetched from the binutils-gdb repository,
@@ -68,8 +57,12 @@ endif
# Don't build documentation. It takes up extra space / build time,
# and sometimes needs specific makeinfo versions to work
-BINUTILS_CONF_ENV += ac_cv_prog_MAKEINFO=missing
-HOST_BINUTILS_CONF_ENV += ac_cv_prog_MAKEINFO=missing
+BINUTILS_CONF_ENV += MAKEINFO=true
+BINUTILS_MAKE_OPTS += MAKEINFO=true
+BINUTILS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MAKEINFO=true install
+HOST_BINUTILS_CONF_ENV += MAKEINFO=true
+HOST_BINUTILS_MAKE_OPTS += MAKEINFO=true
+HOST_BINUTILS_INSTALL_OPTS += MAKEINFO=true install
# gcc bug with Os/O2/O3, PR77311
# error: unable to find a register to spill in class 'CCREGS'
@@ -109,7 +102,7 @@ HOST_BINUTILS_CONF_OPTS = \
# binutils run configure script of subdirs at make time, so ensure
# our TARGET_CONFIGURE_ARGS are taken into consideration for those
define BINUTILS_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_ARGS) $(MAKE) -C $(@D)
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_ARGS) $(MAKE) $(BINUTILS_MAKE_OPTS) -C $(@D)
endef
# We just want libbfd, libiberty and libopcodes,
--
2.7.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH v3 2/3] binutils: get rid of host-texinfo dependency and other documentation tricks
2016-10-11 12:02 ` [Buildroot] [PATCH v3 2/3] binutils: get rid of host-texinfo dependency and other documentation tricks Thomas De Schampheleire
@ 2016-10-14 14:18 ` Romain Naour
2016-10-14 18:09 ` Peter Korsgaard
1 sibling, 0 replies; 9+ messages in thread
From: Romain Naour @ 2016-10-14 14:18 UTC (permalink / raw)
To: buildroot
Hi Thomas,
Le 11/10/2016 ? 14:02, Thomas De Schampheleire a ?crit :
> From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> The binutils/host-binutils package applied several tricks to avoid building
> info documentation. In the worst case, host-texinfo is added as dependency.
>
> However, there is a simpler solution that removes the need for all these
> tricks: instruct the makefiles to use a dummy makeinfo command ('true').
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> ---
> package/binutils/binutils.mk | 25 +++++++++----------------
> 1 file changed, 9 insertions(+), 16 deletions(-)
>
> v2: use INSTALL_TARGET_OPTS for target packages iso INSTALL_OPTS
> (INSTALL_STAGING_OPTS not needed: custom limited staging install)
> v3: fix INSTALL_TARGET_OPTS to include the actual 'install' make target
>
> diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
> index 3a4a661..966cc79 100644
> --- a/package/binutils/binutils.mk
> +++ b/package/binutils/binutils.mk
> @@ -29,19 +29,8 @@ BINUTILS_LICENSE = GPLv3+, libiberty LGPLv2.1+
> BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB
>
> ifeq ($(BINUTILS_FROM_GIT),y)
> -BINUTILS_DEPENDENCIES += host-flex host-bison host-texinfo
> -HOST_BINUTILS_DEPENDENCIES += host-flex host-bison host-texinfo
> -endif
> -
> -# The .info files in the >= 2.26 tarball have an incorrect timestamp,
> -# so binutils tries to re-generate them. In order to avoid the
> -# dependency on host-texinfo, we simply update the timestamps.
> -ifeq ($(BR2_BINUTILS_VERSION_2_26_X)$(BR2_BINUTILS_VERSION_2_27_X),y)
> -define BINUTILS_FIXUP_INFO_TIMESTAMPS
> - find $(@D) -name '*.info' -exec touch {} \;
> -endef
> -BINUTILS_POST_PATCH_HOOKS += BINUTILS_FIXUP_INFO_TIMESTAMPS
> -HOST_BINUTILS_POST_PATCH_HOOKS += BINUTILS_FIXUP_INFO_TIMESTAMPS
> +BINUTILS_DEPENDENCIES += host-flex host-bison
> +HOST_BINUTILS_DEPENDENCIES += host-flex host-bison
> endif
>
> # When binutils sources are fetched from the binutils-gdb repository,
> @@ -68,8 +57,12 @@ endif
>
> # Don't build documentation. It takes up extra space / build time,
> # and sometimes needs specific makeinfo versions to work
> -BINUTILS_CONF_ENV += ac_cv_prog_MAKEINFO=missing
> -HOST_BINUTILS_CONF_ENV += ac_cv_prog_MAKEINFO=missing
> +BINUTILS_CONF_ENV += MAKEINFO=true
> +BINUTILS_MAKE_OPTS += MAKEINFO=true
> +BINUTILS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MAKEINFO=true install
> +HOST_BINUTILS_CONF_ENV += MAKEINFO=true
> +HOST_BINUTILS_MAKE_OPTS += MAKEINFO=true
> +HOST_BINUTILS_INSTALL_OPTS += MAKEINFO=true install
Reviewed-by: Romain Naour <romain.naour@gmail.com>
Best regards,
Romain
>
> # gcc bug with Os/O2/O3, PR77311
> # error: unable to find a register to spill in class 'CCREGS'
> @@ -109,7 +102,7 @@ HOST_BINUTILS_CONF_OPTS = \
> # binutils run configure script of subdirs at make time, so ensure
> # our TARGET_CONFIGURE_ARGS are taken into consideration for those
> define BINUTILS_BUILD_CMDS
> - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_ARGS) $(MAKE) -C $(@D)
> + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_ARGS) $(MAKE) $(BINUTILS_MAKE_OPTS) -C $(@D)
> endef
>
> # We just want libbfd, libiberty and libopcodes,
>
^ permalink raw reply [flat|nested] 9+ messages in thread* [Buildroot] [PATCH v3 2/3] binutils: get rid of host-texinfo dependency and other documentation tricks
2016-10-11 12:02 ` [Buildroot] [PATCH v3 2/3] binutils: get rid of host-texinfo dependency and other documentation tricks Thomas De Schampheleire
2016-10-14 14:18 ` Romain Naour
@ 2016-10-14 18:09 ` Peter Korsgaard
1 sibling, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2016-10-14 18:09 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:
> From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> The binutils/host-binutils package applied several tricks to avoid building
> info documentation. In the worst case, host-texinfo is added as dependency.
> However, there is a simpler solution that removes the need for all these
> tricks: instruct the makefiles to use a dummy makeinfo command ('true').
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v3 3/3] Revert "texinfo: new host package"
2016-10-11 12:02 [Buildroot] [PATCH v3 1/3] gdb: get rid of host-texinfo dependency Thomas De Schampheleire
2016-10-11 12:02 ` [Buildroot] [PATCH v3 2/3] binutils: get rid of host-texinfo dependency and other documentation tricks Thomas De Schampheleire
@ 2016-10-11 12:02 ` Thomas De Schampheleire
2016-10-14 14:18 ` Romain Naour
2016-10-14 18:09 ` Peter Korsgaard
2016-10-14 13:48 ` [Buildroot] [PATCH v3 1/3] gdb: get rid of host-texinfo dependency Romain Naour
2016-10-14 18:09 ` Peter Korsgaard
3 siblings, 2 replies; 9+ messages in thread
From: Thomas De Schampheleire @ 2016-10-11 12:02 UTC (permalink / raw)
To: buildroot
From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
This reverts commit ea161cf6891c3a3a601dfce072f68ee4aed08d21.
The host-texinfo dependency is no longer used by any package, after using
another solution to the problem that required its introduction in the first
place.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
package/texinfo/texinfo.hash | 2 --
package/texinfo/texinfo.mk | 13 -------------
2 files changed, 15 deletions(-)
delete mode 100644 package/texinfo/texinfo.hash
delete mode 100644 package/texinfo/texinfo.mk
v2/v3: no changes
diff --git a/package/texinfo/texinfo.hash b/package/texinfo/texinfo.hash
deleted file mode 100644
index 4bdf343..0000000
--- a/package/texinfo/texinfo.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256 ac68394ce21b2420ba7ed7cec65d84aacf308cc88e9bf4716fcfff88286883d2 texinfo-6.1.tar.xz
diff --git a/package/texinfo/texinfo.mk b/package/texinfo/texinfo.mk
deleted file mode 100644
index ebd0b48..0000000
--- a/package/texinfo/texinfo.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# texinfo
-#
-################################################################################
-
-TEXINFO_VERSION = 6.1
-TEXINFO_SITE = $(BR2_GNU_MIRROR)/texinfo
-TEXINFO_SOURCE = texinfo-$(TEXINFO_VERSION).tar.xz
-TEXINFO_LICENSE = GPLv3+
-TEXINFO_LICENSE_FILES = COPYING
-
-$(eval $(host-autotools-package))
--
2.7.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v3 3/3] Revert "texinfo: new host package"
2016-10-11 12:02 ` [Buildroot] [PATCH v3 3/3] Revert "texinfo: new host package" Thomas De Schampheleire
@ 2016-10-14 14:18 ` Romain Naour
2016-10-14 18:09 ` Peter Korsgaard
1 sibling, 0 replies; 9+ messages in thread
From: Romain Naour @ 2016-10-14 14:18 UTC (permalink / raw)
To: buildroot
Hi Thomas,
Le 11/10/2016 ? 14:02, Thomas De Schampheleire a ?crit :
> From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> This reverts commit ea161cf6891c3a3a601dfce072f68ee4aed08d21.
>
> The host-texinfo dependency is no longer used by any package, after using
> another solution to the problem that required its introduction in the first
> place.
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: Romain Naour <romain.naour@gmail.com>
Best regards,
Romain
> ---
> package/texinfo/texinfo.hash | 2 --
> package/texinfo/texinfo.mk | 13 -------------
> 2 files changed, 15 deletions(-)
> delete mode 100644 package/texinfo/texinfo.hash
> delete mode 100644 package/texinfo/texinfo.mk
>
> v2/v3: no changes
>
> diff --git a/package/texinfo/texinfo.hash b/package/texinfo/texinfo.hash
> deleted file mode 100644
> index 4bdf343..0000000
> --- a/package/texinfo/texinfo.hash
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -# Locally calculated
> -sha256 ac68394ce21b2420ba7ed7cec65d84aacf308cc88e9bf4716fcfff88286883d2 texinfo-6.1.tar.xz
> diff --git a/package/texinfo/texinfo.mk b/package/texinfo/texinfo.mk
> deleted file mode 100644
> index ebd0b48..0000000
> --- a/package/texinfo/texinfo.mk
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -################################################################################
> -#
> -# texinfo
> -#
> -################################################################################
> -
> -TEXINFO_VERSION = 6.1
> -TEXINFO_SITE = $(BR2_GNU_MIRROR)/texinfo
> -TEXINFO_SOURCE = texinfo-$(TEXINFO_VERSION).tar.xz
> -TEXINFO_LICENSE = GPLv3+
> -TEXINFO_LICENSE_FILES = COPYING
> -
> -$(eval $(host-autotools-package))
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v3 3/3] Revert "texinfo: new host package"
2016-10-11 12:02 ` [Buildroot] [PATCH v3 3/3] Revert "texinfo: new host package" Thomas De Schampheleire
2016-10-14 14:18 ` Romain Naour
@ 2016-10-14 18:09 ` Peter Korsgaard
1 sibling, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2016-10-14 18:09 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:
> From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> This reverts commit ea161cf6891c3a3a601dfce072f68ee4aed08d21.
> The host-texinfo dependency is no longer used by any package, after using
> another solution to the problem that required its introduction in the first
> place.
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH v3 1/3] gdb: get rid of host-texinfo dependency
2016-10-11 12:02 [Buildroot] [PATCH v3 1/3] gdb: get rid of host-texinfo dependency Thomas De Schampheleire
2016-10-11 12:02 ` [Buildroot] [PATCH v3 2/3] binutils: get rid of host-texinfo dependency and other documentation tricks Thomas De Schampheleire
2016-10-11 12:02 ` [Buildroot] [PATCH v3 3/3] Revert "texinfo: new host package" Thomas De Schampheleire
@ 2016-10-14 13:48 ` Romain Naour
2016-10-14 18:09 ` Peter Korsgaard
3 siblings, 0 replies; 9+ messages in thread
From: Romain Naour @ 2016-10-14 13:48 UTC (permalink / raw)
To: buildroot
Hi Thomas,
Le 11/10/2016 ? 14:02, Thomas De Schampheleire a ?crit :
> From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> The host-texinfo dependency in gdb/host-gdb was added because gdb insisted
> in building info documentation in recent versions, and we want to avoid
> 'makeinfo' to be present on the build system.
>
> However, there is another solution that does not require actually building
> host-texinfo: instruct the makefiles to use a dummy makeinfo command
> ('true').
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> ---
> package/gdb/gdb.mk | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> v2: use INSTALL_TARGET_OPTS for target packages iso INSTALL_OPTS
> (INSTALL_STAGING_OPTS not needed: INSTALL_STAGING != YES)
> v3: fix INSTALL_TARGET_OPTS to include the actual 'install' make target
>
> diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
> index 1c778e9..68a91f1 100644
> --- a/package/gdb/gdb.mk
> +++ b/package/gdb/gdb.mk
> @@ -37,12 +37,11 @@ endif
> # also need ncurses.
> HOST_GDB_DEPENDENCIES = host-expat host-ncurses
>
> -# Starting with gdb 7.10, gdb wants to re-generate its documentation.
> -# We were trying to avoid that by patching the Makefiles, but it wasn't
> -# working in all situations. So, we simply add a dependency on
> -# host-texinfo in all case.
> -GDB_DEPENDENCIES += host-texinfo
> -HOST_GDB_DEPENDENCIES += host-texinfo
> +# Disable building documentation
This part doesn't apply on master, it seems you're not working on the latest
master :p
> +GDB_MAKE_OPTS += MAKEINFO=true
> +GDB_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) MAKEINFO=true install
> +HOST_GDB_MAKE_OPTS += MAKEINFO=true
> +HOST_GDB_INSTALL_OPTS += MAKEINFO=true install
Otherwise ok with the changes.
Best regards,
Romain
>
> # Apply the Xtensa specific patches
> XTENSA_CORE_NAME = $(call qstrip, $(BR2_XTENSA_CORE_NAME))
>
^ permalink raw reply [flat|nested] 9+ messages in thread* [Buildroot] [PATCH v3 1/3] gdb: get rid of host-texinfo dependency
2016-10-11 12:02 [Buildroot] [PATCH v3 1/3] gdb: get rid of host-texinfo dependency Thomas De Schampheleire
` (2 preceding siblings ...)
2016-10-14 13:48 ` [Buildroot] [PATCH v3 1/3] gdb: get rid of host-texinfo dependency Romain Naour
@ 2016-10-14 18:09 ` Peter Korsgaard
3 siblings, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2016-10-14 18:09 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:
> From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> The host-texinfo dependency in gdb/host-gdb was added because gdb insisted
> in building info documentation in recent versions, and we want to avoid
> 'makeinfo' to be present on the build system.
> However, there is another solution that does not require actually building
> host-texinfo: instruct the makefiles to use a dummy makeinfo command
> ('true').
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> ---
> package/gdb/gdb.mk | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
> v2: use INSTALL_TARGET_OPTS for target packages iso INSTALL_OPTS
> (INSTALL_STAGING_OPTS not needed: INSTALL_STAGING != YES)
> v3: fix INSTALL_TARGET_OPTS to include the actual 'install' make target
As Thomas already applied your earlier version, I've instead added a
patch to add back the 'install'.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread