Skip to contentSkip to conversation

Cleanup of packages patching

PATCH New Thomas Petazzoni 3 participants 19 messages May 27, 2013 – May 31, 2013

lore
Share & tools
lore
#0 lore raw

cover Cleanup of packages patching

Hello,

In preparation for the out-of-tree support, it is important that the source tree for the host and target variants are the same. I conducted an analysis by listing all packages that had both a target and host variants, but that were using a different combination of post-extract or post-patch hooks for their host and target variants.

This patch set fixes such packages, which will make things easier in the future to introduce the out-of-tree support.

Best regards,

Thomas

Thomas Petazzoni (6):
bzip2: improve the packaging
gettext: don't patch different the host and target build
binutils: apply post-patch hook on both the host and target builds
gutenprint: ensure target and host variant have the same patch hooks
libgtk2: remove useless post-patch hook
xlib_libX11: ensure target and host variant have the same patch hooks

 package/binutils/binutils.mk                       |    1 +
 package/bzip2/bzip2-improve-build-system.patch     |   84 ++++++++++++++++++
 package/bzip2/bzip2.mk                             |   92 +++++++-------------
 ...patch => gettext-01-error_print_progname.patch} |    0
 ...patch => gettext-02-fix_rpl_gettimeofday.patch} |    0
 .../gettext-03-option-to-disable-tools.patch       |   42 +++++++++
 .../gettext/gettext-04-remove-examples-tests.patch |   20 +++++
 package/gettext/gettext-05-use-shell.patch         |   25 ++++++
 package/gettext/gettext.mk                         |   26 +++---
 package/gutenprint/gutenprint.mk                   |    1 +
 package/libgtk2/libgtk2.mk                         |    6 --
 package/x11r7/xlib_libX11/xlib_libX11.mk           |    1 +
 12 files changed, 219 insertions(+), 79 deletions(-)
 create mode 100644 package/bzip2/bzip2-improve-build-system.patch
 rename package/gettext/{gettext-error_print_progname.patch => gettext-01-error_print_progname.patch} (100%)
 rename package/gettext/{gettext-fix_rpl_gettimeofday.patch => gettext-02-fix_rpl_gettimeofday.patch} (100%)
 create mode 100644 package/gettext/gettext-03-option-to-disable-tools.patch
 create mode 100644 package/gettext/gettext-04-remove-examples-tests.patch
 create mode 100644 package/gettext/gettext-05-use-shell.patch
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/6 bzip2: improve the packaging

Instead of doing some nasty SED tricks, use a patch that modifies the bzip2 build system to make it a little bit nicer. Those SEDs were made differently for the host and target packages, which is contrary to the logic of not having any difference in the source tree between the host build and the target build.

This commit also makes sure that bzip2.mk behaves properly in a BR2_PREFER_STATIC_LIB=y context.

---
 package/bzip2/bzip2-improve-build-system.patch |   84 ++++++++++++++++++++++
 package/bzip2/bzip2.mk                         |   92 ++++++++----------------
 2 files changed, 115 insertions(+), 61 deletions(-)
 create mode 100644 package/bzip2/bzip2-improve-build-system.patch
package/bzip2/bzip2-improve-build-system.patch new file +84 -0
new file mode 100644
index 0000000..90099aa
@@ -0,0 +1,84 @@
+Improve bzip2 build system
+
+This patch makes a number of improvements to the bzip2 build system:
+
+ * Remove the BIGFILE variable that was used to force largefile
+   support. Now, the user of the Makefile is supposed to pass
+   -D_FILE_OFFSET_BITS=64 when largefile support is desired.
+
+ * Use override CFLAGS += so that additional CFLAGS can be passed on
+   the command line.
+
+ * Removed "forced" CFLAGS -O2, -g and -Winline. We don't want them by
+   default, and want the build system to use its own ones.
+
+ * When creating the symbolic links bzegrep, bzfgrep, bzless and
+   bzcmp, don't link them to an absolute path, or they'll point to
+   some path on the build machine.
+
+ * Provide an install target for the shared library, which creates the
+   appropriate symbolic links.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -20,8 +20,7 @@
+ RANLIB=ranlib
+ LDFLAGS=
+ 
+-BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
++override CFLAGS += -Wall
+ 
+ # Where you want it installed when you do 'make install'
+ PREFIX=/usr/local
+@@ -90,14 +89,14 @@
+ 	cp -f libbz2.a $(PREFIX)/lib
+ 	chmod a+r $(PREFIX)/lib/libbz2.a
+ 	cp -f bzgrep $(PREFIX)/bin/bzgrep
+-	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+-	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
++	ln -s -f bzgrep $(PREFIX)/bin/bzegrep
++	ln -s -f bzgrep $(PREFIX)/bin/bzfgrep
+ 	chmod a+x $(PREFIX)/bin/bzgrep
+ 	cp -f bzmore $(PREFIX)/bin/bzmore
+-	ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
++	ln -s -f bzmore $(PREFIX)/bin/bzless
+ 	chmod a+x $(PREFIX)/bin/bzmore
+ 	cp -f bzdiff $(PREFIX)/bin/bzdiff
+-	ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
++	ln -s -f bzdiff $(PREFIX)/bin/bzcmp
+ 	chmod a+x $(PREFIX)/bin/bzdiff
+ 	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
+ 	chmod a+r $(PREFIX)/man/man1/bzgrep.1
+Index: b/Makefile-libbz2_so
+===================================================================
+--- a/Makefile-libbz2_so
++++ b/Makefile-libbz2_so
+@@ -23,8 +23,7 @@
+ 
+ SHELL=/bin/sh
+ CC=gcc
+-BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
++override CFLAGS += -fpic -fPIC -Wall
+ 
+ OBJS= blocksort.o  \
+       huffman.o    \
+@@ -37,8 +36,11 @@
+ all: $(OBJS)
+ 	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
+ 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+-	rm -f libbz2.so.1.0
+-	ln -s libbz2.so.1.0.6 libbz2.so.1.0
++
++install:
++	install -m 0755 -D libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0.6
++	ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so
++	ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0
+ 
+ clean: 
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
package/bzip2/bzip2.mk +31 -61

122 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/6 bzip2: improve the packaging

Quoted 10 lines · Thomas Petazzoni

Instead of doing some nasty SED tricks, use a patch that modifies the bzip2 build system to make it a little bit nicer. Those SEDs were made differently for the host and target packages, which is contrary to the logic of not having any difference in the source tree between the host build and the target build.

This commit also makes sure that bzip2.mk behaves properly in a BR2_PREFER_STATIC_LIB=y context.

This patch should also fix
http://autobuild.buildroot.org/results/91e/91ef29128f9e4e68dd433bd87d61c60852e741b3/build-end.log.

(i.e static build on bfin).

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#3 lore raw

PATCH 1/6 bzip2: improve the packaging

In reply to Thomas Petazzoni
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Instead of doing some nasty SED tricks, use a patch that modifies the Thomas> bzip2 build system to make it a little bit nicer. Those SEDs were made Thomas> differently for the host and target packages, which is contrary to the Thomas> logic of not having any difference in the source tree between the host Thomas> build and the target build.

Thomas> This commit also makes sure that bzip2.mk behaves properly in a Thomas> BR2_PREFER_STATIC_LIB=y context.

Committed to next, thanks.

It would be good if you could try to push the patch upstream.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/6 bzip2: improve the packaging

Dear Peter Korsgaard,

Quoted 6 lines · Peter Korsgaard

Thomas> This commit also makes sure that bzip2.mk behaves properly in a Thomas> BR2_PREFER_STATIC_LIB=y context.

Committed to next, thanks.

It would be good if you could try to push the patch upstream.

I've just sent the patch, but I don't think there's much luck. bzip2 is one of some open-source project that's mostly "done", so there isn't much activity. Last release 2.5 years ago, no Git tree or even any VCS at all.

Best regards,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#5 lore raw

PATCH 1/6 bzip2: improve the packaging

Quoted 3 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

It would be good if you could try to push the patch upstream.

Thomas> I've just sent the patch, but I don't think there's much Thomas> luck. bzip2 is one of some open-source project that's mostly Thomas> "done", so there isn't much activity. Last release 2.5 years Thomas> ago, no Git tree or even any VCS at all.

Yes, I know. It's imho still worth a try though.

Thanks.

Signature · 1 line
Bye, Peter Korsgaard
#6 lore raw

PATCH 2/6 gettext: don't patch different the host and target build

In reply to Thomas Petazzoni

Until now, the gettext source code was being patched differently for the host and the target build, which is going to be incompatible with out-of-tree build. The difference is that the gettext tools could be disabled in the target build, but are always enabled on the host build.

Therefore, this commit switches the gettext package to using proper patches against the relevant configure.ac and Makefile.am files. gettext is now being autoreconfigured. Configuration options are also passed for the host variant, in order to disable the build of a large number of things we don't care about.

Finally, the two existing patches are renamed to include a number in their filename.

---
 ...patch => gettext-01-error_print_progname.patch} |    0
 ...patch => gettext-02-fix_rpl_gettimeofday.patch} |    0
 .../gettext-03-option-to-disable-tools.patch       |   42 ++++++++++++++++++++
 .../gettext/gettext-04-remove-examples-tests.patch |   20 ++++++++++
 package/gettext/gettext-05-use-shell.patch         |   25 ++++++++++++
 package/gettext/gettext.mk                         |   26 ++++++------
 6 files changed, 101 insertions(+), 12 deletions(-)
 rename package/gettext/{gettext-error_print_progname.patch => gettext-01-error_print_progname.patch} (100%)
 rename package/gettext/{gettext-fix_rpl_gettimeofday.patch => gettext-02-fix_rpl_gettimeofday.patch} (100%)
 create mode 100644 package/gettext/gettext-03-option-to-disable-tools.patch
 create mode 100644 package/gettext/gettext-04-remove-examples-tests.patch
 create mode 100644 package/gettext/gettext-05-use-shell.patch
package/gettext/gettext-01-error_print_progname.patch renamed from package/gettext/gettext-error_print_progname.patch +0 -0
similarity index 100%
rename from package/gettext/gettext-error_print_progname.patch
rename to package/gettext/gettext-01-error_print_progname.patch
package/gettext/gettext-02-fix_rpl_gettimeofday.patch renamed from package/gettext/gettext-fix_rpl_gettimeofday.patch +0 -0
similarity index 100%
rename from package/gettext/gettext-fix_rpl_gettimeofday.patch
rename to package/gettext/gettext-02-fix_rpl_gettimeofday.patch
package/gettext/gettext-03-option-to-disable-tools.patch new file +42 -0

42 lines not on this page · raw message

package/gettext/gettext-04-remove-examples-tests.patch new file +20 -0
new file mode 100644
index 0000000..f7d88d9
@@ -0,0 +1,20 @@
+Disable tests and examples
+
+This patch disables the gettext-tools tests and examples, which are
+generally not necessary.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+
+Index: b/gettext-tools/Makefile.am
+===================================================================
+--- a/gettext-tools/Makefile.am
++++ b/gettext-tools/Makefile.am
+@@ -20,7 +20,7 @@
+ ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
+ 
+-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
++SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4
+ 
+ EXTRA_DIST = misc/DISCLAIM
+ MOSTLYCLEANFILES = core *.stackdump
package/gettext/gettext-05-use-shell.patch new file +25 -0
new file mode 100644
index 0000000..5f6e2c2
@@ -0,0 +1,25 @@
+gettext-runtime: use @SHELL@ for the SHELL variable definition
+
+The gettext-runtime/Makefile.in uses an hardcoded SHELL = /bin/sh
+variable. This causes problems at build time, because libtool is then
+called with the 'sh' shell, which does not support the += construct
+that the libtool script is using.
+
+Instead, this Makefile.in should be definining SHELL = @SHELL@, just
+like all other Makefile.in of gettext.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+
+Index: b/gettext-runtime/intl/Makefile.in
+===================================================================
+--- a/gettext-runtime/intl/Makefile.in
++++ b/gettext-runtime/intl/Makefile.in
+@@ -17,7 +17,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ 
+-SHELL = /bin/sh
++SHELL = @SHELL@
+ 
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
package/gettext/gettext.mk +14 -12
index 8dc701e..9061928 100644
@@ -9,6 +9,8 @@ GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext
 GETTEXT_INSTALL_STAGING = YES
 GETTEXT_LICENSE = GPLv2+
 GETTEXT_LICENSE_FILES = COPYING
+GETTEXT_AUTORECONF = YES
+HOST_GETTEXT_AUTORECONF = YES
 
 GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 HOST_GETTEXT_DEPENDENCIES = # we don't want the libiconv dependency
@@ -22,6 +24,18 @@ GETTEXT_CONF_OPT += \
 	--disable-native-java \
 	--disable-csharp \
 	--disable-relocatable \
+	--without-emacs \
+	--disable-tools
+
+HOST_GETTEXT_CONF_OPT = \
+	--disable-libasprintf \
+	--disable-acl \
+	--disable-openmp \
+	--disable-rpath \
+	--disable-java \
+	--disable-native-java \
+	--disable-csharp \
+	--disable-relocatable \
 	--without-emacs
 
 # Force build with NLS support, otherwise libintl is not built
@@ -42,19 +56,7 @@ define GETTEXT_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/lib/libintl*.so* $(TARGET_DIR)/usr/lib/
 endef
 endif
-# Ditch the tools since they're off and pull other dependencies
-define GETTEXT_DISABLE_TOOLS
-	$(SED) 's/runtime gettext-tools/runtime/' $(@D)/Makefile.in
-endef
 endif # GETTEXT_TOOLS = n
 
-# The tools tests build fails with full toolchain without threads
-define GETTEXT_DISABLE_TESTS
-	$(SED) 's/m4 tests/m4/' $(@D)/gettext-tools/Makefile.in
-endef
-
-GETTEXT_POST_PATCH_HOOKS += GETTEXT_DISABLE_TOOLS
-GETTEXT_POST_PATCH_HOOKS += GETTEXT_DISABLE_TESTS
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
1.7.9.5
#7 lore raw

PATCH 2/6 gettext: don't patch different the host and target build

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Until now, the gettext source code was being patched differently for Thomas> the host and the target build, which is going to be incompatible with Thomas> out-of-tree build. The difference is that the gettext tools could be Thomas> disabled in the target build, but are always enabled on the host Thomas> build.

Thomas> Therefore, this commit switches the gettext package to using proper Thomas> patches against the relevant configure.ac and Makefile.am Thomas> files. gettext is now being autoreconfigured. Configuration options Thomas> are also passed for the host variant, in order to disable the build of Thomas> a large number of things we don't care about.

Thomas> Finally, the two existing patches are renamed to include a number in Thomas> their filename.

Committed to next, thanks.

Please don't forget to send the patches upstream.

Signature · 1 line
Bye, Peter Korsgaard
#8 lore raw

PATCH 2/6 gettext: don't patch different the host and target build

Dear Peter Korsgaard,

Quoted 3 lines · Peter Korsgaard

Committed to next, thanks.

Please don't forget to send the patches upstream.

The one fixing SHELL has been merged upstream:

http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=fcff059faeba5108298ee1032a0ed6419eae16a6

The one adding the --disable-tools has been more-or-less rejected by the gettext maintainer, who suggested to only do the configure in the gettext-runtime directory when all we need is the runtime libintl:

http://lists.gnu.org/archive/html/bug-gettext/2013-05/msg00044.html

The last one (allowing to disable examples and tests for the tools) is not yet in a state ready for upstream, but I'll work on it.

Thanks,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#9 lore raw

PATCH 2/6 gettext: don't patch different the host and target build

Quoted 3 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Please don't forget to send the patches upstream.

Thomas> The one fixing SHELL has been merged upstream:

Thomas> http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=fcff059faeba5108298ee1032a0ed6419eae16a6

Thomas> The one adding the --disable-tools has been more-or-less Thomas> rejected by the gettext maintainer, who suggested to only do Thomas> the configure in the gettext-runtime directory when all we need Thomas> is the runtime libintl:

Thomas> http://lists.gnu.org/archive/html/bug-gettext/2013-05/msg00044.html

Thomas> The last one (allowing to disable examples and tests for the Thomas> tools) is not yet in a state ready for upstream, but I'll work Thomas> on it.

Great, thanks!

Signature · 1 line
Bye, Peter Korsgaard
#10 lore raw

PATCH 3/6 binutils: apply post-patch hook on both the host and target builds

In reply to Thomas Petazzoni

When a Xtensa specific patch needs to be applied, it should be applied both when doing the target and the host build.

This change is part of the effort to remove the differences between host and target post-extract and post-patch hooks, that are problematic for the out-of-tree support.

---
 package/binutils/binutils.mk |    1 +
 1 file changed, 1 insertion(+)
package/binutils/binutils.mk +1 -0
index 081be6a..a2c4150 100644
@@ -81,6 +81,7 @@ define BINUTILS_XTENSA_PRE_PATCH
 	tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(XTENSA_CORE_NAME).tar \
 		-C $(@D) --strip-components=1 binutils
 endef
+BINUTILS_PRE_PATCH_HOOKS += BINUTILS_XTENSA_PRE_PATCH
 HOST_BINUTILS_PRE_PATCH_HOOKS += BINUTILS_XTENSA_PRE_PATCH
 endif
 
Signature · 1 line
1.7.9.5
#11 lore raw

PATCH 3/6 binutils: apply post-patch hook on both the host and target builds

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> When a Xtensa specific patch needs to be applied, it should be applied Thomas> both when doing the target and the host build.

Thomas> This change is part of the effort to remove the differences between Thomas> host and target post-extract and post-patch hooks, that are Thomas> problematic for the out-of-tree support.

Committed to next, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#12 lore raw

PATCH 4/6 gutenprint: ensure target and host variant have the same patch hooks

In reply to Thomas Petazzoni

In preparation for the out-of-tree support, it is important that all packages have the same patch hooks for the host variant and the target variant (because the source tree will be shared between host and target variants when doing out-of-tree build).

In the case of gutenprint, the patch hook executed for the target just creates one directory which is needed for autoreconf to work, and the host variant is not autoreconf'ed. So there is no harm in also applying this patch hook to the host variant.

---
 package/gutenprint/gutenprint.mk |    1 +
 1 file changed, 1 insertion(+)
package/gutenprint/gutenprint.mk +1 -0
index 834d967..2431a54 100644
@@ -69,6 +69,7 @@ define GUTENPRINT_CREATE_M4_DIR
 	mkdir -p $(@D)/m4local
 endef
 GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR
+HOST_GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR
 
 define HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER
 	cp $(@D)/src/xml/xmli18n-tmp.h $(HOST_DIR)/usr/include
Signature · 1 line
1.7.9.5
#13 lore raw

PATCH 4/6 gutenprint: ensure target and host variant have the same patch hooks

Quoted 4 lines · Thomas Petazzoni

In the case of gutenprint, the patch hook executed for the target just creates one directory which is needed for autoreconf to work, and the host variant is not autoreconf'ed. So there is no harm in also applying this patch hook to the host variant.

Since autoreconf is going to be done on the source tree, you should
probably autoreconf the host variant as well.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#14 lore raw

PATCH 4/6 gutenprint: ensure target and host variant have the same patch hooks

In reply to Thomas Petazzoni
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> In preparation for the out-of-tree support, it is important that all Thomas> packages have the same patch hooks for the host variant and the target Thomas> variant (because the source tree will be shared between host and Thomas> target variants when doing out-of-tree build).

Thomas> In the case of gutenprint, the patch hook executed for the target just Thomas> creates one directory which is needed for autoreconf to work, and the Thomas> host variant is not autoreconf'ed. So there is no harm in also Thomas> applying this patch hook to the host variant.

Committed to next with HOST_GUTENPRINT_AUTORECONF = YES as pointed out by Arnout, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#15 lore raw

PATCH 5/6 libgtk2: remove useless post-patch hook

In reply to Thomas Petazzoni

There used to be a post-patch hook to apply a patch only on the host variant of libgtk2. However, after the reorganization of the patch naming policy, this was no longer working properly, so dd1848bc73ee9dfe211ca3ed3a233707e3bc5955 changed this by a patch that works on both the target and host variants.

We can therefore get rid of the useless post-patch hook.

---
 package/libgtk2/libgtk2.mk |    6 ------
 1 file changed, 6 deletions(-)
package/libgtk2/libgtk2.mk +0 -6
index b1ce99a..5881ea7 100644
@@ -175,12 +175,6 @@ HOST_LIBGTK2_CONF_OPT = \
 		--disable-cups \
 		--disable-debug
 
-define HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK
- support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) host-*.patch
-endef
-
-HOST_LIBGTK2_POST_PATCH_HOOKS += HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK
-
 define HOST_LIBGTK2_BUILD_CMDS
  $(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache
 endef
Signature · 1 line
1.7.9.5
#16 lore raw

PATCH 5/6 libgtk2: remove useless post-patch hook

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> There used to be a post-patch hook to apply a patch only on the host Thomas> variant of libgtk2. However, after the reorganization of the patch Thomas> naming policy, this was no longer working properly, so Thomas> dd1848bc73ee9dfe211ca3ed3a233707e3bc5955 changed this by a patch that Thomas> works on both the target and host variants.

Thomas> We can therefore get rid of the useless post-patch hook.

Committed to next, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#17 lore raw

PATCH 6/6 xlib_libX11: ensure target and host variant have the same patch hooks

In reply to Thomas Petazzoni

In preparation for the out-of-tree support, it is important that all packages have the same patch hooks for the host variant and the target variant (because the source tree will be shared between host and target variants when doing out-of-tree build).

In the case of the xlib_libX11 package, the post-patch hook removes some flags from the build of the makekeys utility, so that when xlib_libX11 is built for the target, the build of makekeys for the host works properly. This modification can be applied to the host variant of xlib_libX11 without any problem.

---
 package/x11r7/xlib_libX11/xlib_libX11.mk |    1 +
 1 file changed, 1 insertion(+)
package/x11r7/xlib_libX11/xlib_libX11.mk +1 -0
index 2d68f9e..5d0607b 100644
@@ -43,6 +43,7 @@ define XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS
 endef
 
 XLIB_LIBX11_POST_PATCH_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS
+HOST_XLIB_LIBX11_POST_PATCH_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
1.7.9.5
#18 lore raw

PATCH 6/6 xlib_libX11: ensure target and host variant have the same patch hooks

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> In preparation for the out-of-tree support, it is important that all Thomas> packages have the same patch hooks for the host variant and the target Thomas> variant (because the source tree will be shared between host and Thomas> target variants when doing out-of-tree build).

Thomas> In the case of the xlib_libX11 package, the post-patch hook removes Thomas> some flags from the build of the makekeys utility, so that when Thomas> xlib_libX11 is built for the target, the build of makekeys for the Thomas> host works properly. This modification can be applied to the host Thomas> variant of xlib_libX11 without any problem.

Committed to next, thanks.

Signature · 1 line
Bye, Peter Korsgaard