* [Buildroot] [V2 1/4] libxml-parser-perl: restore it like before perl infra
2014-10-11 6:36 [Buildroot] [V2 0/4] host-perl Francois Perrad
@ 2014-10-11 6:36 ` Francois Perrad
2014-10-11 6:36 ` [Buildroot] [V2 2/4] perl: add host variant Francois Perrad
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Francois Perrad @ 2014-10-11 6:36 UTC (permalink / raw)
To: buildroot
intltool uses this package,
and we don't want that it depends on host-perl,
but on system perl
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/intltool/intltool.mk | 5 +++-
package/libxml-parser-perl/libxml-parser-perl.mk | 34 ++++++++++++++++++++++++
package/metacity/metacity.mk | 2 +-
package/perl-xml-parser/perl-xml-parser.mk | 17 ------------
4 files changed, 39 insertions(+), 19 deletions(-)
create mode 100644 package/libxml-parser-perl/libxml-parser-perl.mk
delete mode 100644 package/perl-xml-parser/perl-xml-parser.mk
diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk
index 5c2dca8..a7afe0d 100644
--- a/package/intltool/intltool.mk
+++ b/package/intltool/intltool.mk
@@ -9,7 +9,10 @@ INTLTOOL_SITE = https://launchpad.net/intltool/trunk/$(INTLTOOL_VERSION)/+downlo
INTLTOOL_LICENSE = GPLv2+
INTLTOOL_LICENSE_FILES = COPYING
-HOST_INTLTOOL_DEPENDENCIES = host-gettext host-perl-xml-parser
+HOST_INTLTOOL_DEPENDENCIES = host-gettext host-libxml-parser-perl
+HOST_INTLTOOL_CONF_OPTS = \
+ PERL=`which perl` \
+ PERL5LIB=$(HOST_DIR)/usr/lib/perl
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
new file mode 100644
index 0000000..a07f0a0
--- /dev/null
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# libxml-parser-perl
+#
+################################################################################
+
+LIBXML_PARSER_PERL_VERSION = 2.41
+LIBXML_PARSER_PERL_SOURCE = XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz
+LIBXML_PARSER_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR
+LIBXML_PARSER_PERL_DEPENDENCIES = expat
+LIBXML_PARSER_PERL_LICENSE = Artistic or GPLv1+
+LIBXML_PARSER_PERL_RUN_PERL = `which perl`
+
+define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
+ (cd $(@D) ; \
+ $(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \
+ PREFIX=$(HOST_DIR)/usr \
+ EXPATLIBPATH=$(HOST_DIR)/usr/lib \
+ EXPATINCPATH=$(HOST_DIR)/usr/include \
+ INSTALLDIRS=site \
+ INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \
+ INSTALLSITEARCH=$(HOST_DIR)/usr/lib/perl \
+ )
+endef
+
+define HOST_LIBXML_PARSER_PERL_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_LIBXML_PARSER_PERL_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+$(eval $(host-generic-package))
diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
index f7e8b92..1d3e143 100644
--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@@ -19,7 +19,7 @@ METACITY_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
METACITY_DEPENDENCIES = libgtk2 \
xlib_libX11 \
- host-perl-xml-parser \
+ host-libxml-parser-perl \
xlib_libXcomposite \
xlib_libXfixes \
xlib_libXrender \
diff --git a/package/perl-xml-parser/perl-xml-parser.mk b/package/perl-xml-parser/perl-xml-parser.mk
deleted file mode 100644
index 21c9162..0000000
--- a/package/perl-xml-parser/perl-xml-parser.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################################################
-#
-# perl-xml-parser
-#
-################################################################################
-
-PERL_XML_PARSER_VERSION = 2.41
-PERL_XML_PARSER_SOURCE = XML-Parser-$(PERL_XML_PARSER_VERSION).tar.gz
-PERL_XML_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR
-PERL_XML_PARSER_DEPENDENCIES = expat
-PERL_XML_PARSER_LICENSE = Artistic or GPLv1+
-
-HOST_PERL_XML_PARSER_CONF_OPTS = \
- EXPATLIBPATH=$(HOST_DIR)/usr/lib \
- EXPATINCPATH=$(HOST_DIR)/usr/include
-
-$(eval $(host-perl-package))
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [V2 2/4] perl: add host variant
2014-10-11 6:36 [Buildroot] [V2 0/4] host-perl Francois Perrad
2014-10-11 6:36 ` [Buildroot] [V2 1/4] libxml-parser-perl: restore it like before perl infra Francois Perrad
@ 2014-10-11 6:36 ` Francois Perrad
2014-10-11 6:36 ` [Buildroot] [V2 3/4] pkg-perl: refactor with host-perl Francois Perrad
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Francois Perrad @ 2014-10-11 6:36 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/perl/perl.mk | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 1816a9e..16a8d68 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -126,7 +126,25 @@ endef
PERL_POST_INSTALL_STAGING_HOOKS += PERL_ADD_CORE_H
+HOST_PERL_CONF_OPTS = \
+ -des \
+ -Dprefix="$(HOST_DIR)/usr" \
+ -Dcc="$(HOSTCC)"
+
+define HOST_PERL_CONFIGURE_CMDS
+ (cd $(@D); HOSTCC='$(HOSTCC_NOCACHE)' ./Configure $(HOST_PERL_CONF_OPTS))
+endef
+
+define HOST_PERL_BUILD_CMDS
+ $(MAKE) -C $(@D)
+endef
+
+define HOST_PERL_INSTALL_CMDS
+ $(MAKE) -C $(@D) INSTALL_DEPENDENCE='' install
+endef
+
$(eval $(generic-package))
+$(eval $(host-generic-package))
define PERL_FINALIZE_TARGET
rm -rf $(TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)/pod
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [V2 3/4] pkg-perl: refactor with host-perl
2014-10-11 6:36 [Buildroot] [V2 0/4] host-perl Francois Perrad
2014-10-11 6:36 ` [Buildroot] [V2 1/4] libxml-parser-perl: restore it like before perl infra Francois Perrad
2014-10-11 6:36 ` [Buildroot] [V2 2/4] perl: add host variant Francois Perrad
@ 2014-10-11 6:36 ` Francois Perrad
2014-10-11 6:36 ` [Buildroot] [V2 4/4] perl: remove useless hacks Francois Perrad
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Francois Perrad @ 2014-10-11 6:36 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/Makefile.in | 3 ---
package/pkg-perl.mk | 23 +++++++++++------------
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/package/Makefile.in b/package/Makefile.in
index 7d9943c..2f26144 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -232,9 +232,6 @@ HOST_LDFLAGS += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/
HOSTCC_VERSION := $(shell $(HOSTCC_NOCCACHE) --version | \
sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p')
-HOST_PERL_ARCHNAME := $(shell perl -MConfig -e "print Config->{archname}")
-export PERL5LIB := $(HOST_DIR)/usr/lib/perl5/$(HOST_PERL_ARCHNAME):$(HOST_DIR)/usr/lib/perl5
-
TARGET_CONFIGURE_OPTS = PATH=$(BR_PATH) \
AR="$(TARGET_AR)" \
AS="$(TARGET_AS)" \
diff --git a/package/pkg-perl.mk b/package/pkg-perl.mk
index 808d2ce..f41a2f9 100644
--- a/package/pkg-perl.mk
+++ b/package/pkg-perl.mk
@@ -20,6 +20,7 @@
################################################################################
PERL_ARCHNAME = $(ARCH)-linux
+PERL_RUN = $(HOST_DIR)/usr/bin/perl
################################################################################
# inner-perl-package -- defines how the configuration, compilation and
@@ -38,6 +39,8 @@ PERL_ARCHNAME = $(ARCH)-linux
define inner-perl-package
+$(2)_DEPENDENCIES += host-perl
+
#
# Configure step. Only define it if not already defined by the package
# .mk file. And take care of the differences between host and target
@@ -51,7 +54,7 @@ define $(2)_CONFIGURE_CMDS
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
$$($(2)_CONF_ENV) \
PERL_MM_USE_DEFAULT=1 \
- perl Build.PL \
+ $$(PERL_RUN) Build.PL \
--config ar="$$(TARGET_AR)" \
--config full_ar="$$(TARGET_AR)" \
--config cc="$$(TARGET_CC)" \
@@ -74,7 +77,7 @@ define $(2)_CONFIGURE_CMDS
$$($(2)_CONF_ENV) \
PERL_MM_USE_DEFAULT=1 \
PERL_AUTOINSTALL=--skipdeps \
- perl Makefile.PL \
+ $$(PERL_RUN) Makefile.PL \
AR="$$(TARGET_AR)" \
FULL_AR="$$(TARGET_AR)" \
CC="$$(TARGET_CC)" \
@@ -101,17 +104,13 @@ define $(2)_CONFIGURE_CMDS
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
$$($(2)_CONF_ENV) \
PERL_MM_USE_DEFAULT=1 \
- perl Build.PL \
- --install_base $$(HOST_DIR)/usr \
- --installdirs vendor \
+ $$(PERL_RUN) Build.PL \
$$($(2)_CONF_OPTS); \
else \
$$($(2)_CONF_ENV) \
PERL_MM_USE_DEFAULT=1 \
PERL_AUTOINSTALL=--skipdeps \
- perl Makefile.PL \
- INSTALL_BASE=$$(HOST_DIR)/usr \
- INSTALLDIRS=vendor \
+ $$(PERL_RUN) Makefile.PL \
$$($(2)_CONF_OPTS); \
fi
endef
@@ -129,7 +128,7 @@ ifeq ($(4),target)
# Build package for target
define $(2)_BUILD_CMDS
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
- perl Build $$($(2)_BUILD_OPTS) build; \
+ $$(PERL_RUN) Build $$($(2)_BUILD_OPTS) build; \
else \
$$(MAKE1) \
PERL_INC=$$(STAGING_DIR)/usr/lib/perl5/$$(PERL_VERSION)/$$(PERL_ARCHNAME)/CORE \
@@ -141,7 +140,7 @@ else
# Build package for host
define $(2)_BUILD_CMDS
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
- perl Build $$($(2)_BUILD_OPTS) build; \
+ $$(PERL_RUN) Build $$($(2)_BUILD_OPTS) build; \
else \
$$(MAKE1) $$($(2)_BUILD_OPTS) pure_all; \
fi
@@ -156,7 +155,7 @@ endif
ifndef $(2)_INSTALL_CMDS
define $(2)_INSTALL_CMDS
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
- perl Build $$($(2)_INSTALL_TARGET_OPTS) install; \
+ $$(PERL_RUN) Build $$($(2)_INSTALL_TARGET_OPTS) install; \
else \
$$(MAKE1) $$($(2)_INSTALL_TARGET_OPTS) pure_install; \
fi
@@ -170,7 +169,7 @@ endif
ifndef $(2)_INSTALL_TARGET_CMDS
define $(2)_INSTALL_TARGET_CMDS
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
- perl Build $$($(2)_INSTALL_TARGET_OPTS) install; \
+ $$(PERL_RUN) Build $$($(2)_INSTALL_TARGET_OPTS) install; \
else \
$$(MAKE1) $$($(2)_INSTALL_TARGET_OPTS) pure_install; \
fi
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [V2 4/4] perl: remove useless hacks
2014-10-11 6:36 [Buildroot] [V2 0/4] host-perl Francois Perrad
` (2 preceding siblings ...)
2014-10-11 6:36 ` [Buildroot] [V2 3/4] pkg-perl: refactor with host-perl Francois Perrad
@ 2014-10-11 6:36 ` Francois Perrad
2014-10-17 9:49 ` [Buildroot] [V2 0/4] host-perl Peter Korsgaard
2014-10-17 14:27 ` Peter Korsgaard
5 siblings, 0 replies; 8+ messages in thread
From: Francois Perrad @ 2014-10-11 6:36 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/perl-gd/Config.in | 2 --
package/perl-gdgraph/Config.in | 1 -
.../perl-gdgraph-01-fix-Makefile-PL.patch | 24 --------------------
package/perl/perl.mk | 26 ----------------------
4 files changed, 53 deletions(-)
delete mode 100644 package/perl-gdgraph/perl-gdgraph-01-fix-Makefile-PL.patch
diff --git a/package/perl-gd/Config.in b/package/perl-gd/Config.in
index 3434507..7c85cfc 100644
--- a/package/perl-gd/Config.in
+++ b/package/perl-gd/Config.in
@@ -1,8 +1,6 @@
config BR2_PACKAGE_PERL_GD
bool "perl-gd"
depends on !BR2_PREFER_STATIC_LIB
- # Does not build on machines having a old host perl
- depends on BR2_BROKEN
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_FREETYPE
diff --git a/package/perl-gdgraph/Config.in b/package/perl-gdgraph/Config.in
index 972a5c5..e722c06 100644
--- a/package/perl-gdgraph/Config.in
+++ b/package/perl-gdgraph/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_PERL_GDGRAPH
bool "perl-gdgraph"
depends on !BR2_PREFER_STATIC_LIB
- depends on BR2_BROKEN # perl-gd
select BR2_PACKAGE_PERL_GD
select BR2_PACKAGE_PERL_GDTEXTUTIL
help
diff --git a/package/perl-gdgraph/perl-gdgraph-01-fix-Makefile-PL.patch b/package/perl-gdgraph/perl-gdgraph-01-fix-Makefile-PL.patch
deleted file mode 100644
index e95a64e..0000000
--- a/package/perl-gdgraph/perl-gdgraph-01-fix-Makefile-PL.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-partial revert to 1.47 in order to work with an old perl 5.10.1
-
-With old ExtUtils::MakeMaker, AUTHOR takes a string/number not a ARRAY reference.
-See http://api.metacpan.org/source/RUZ/GDGraph-1.48/CHANGES
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/Makefile.PL
-===================================================================
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -19,11 +19,7 @@
-
- ($] >= 5.005 ?
- ('ABSTRACT' => 'Produces charts with GD',
-- 'AUTHOR' => [
-- 'Martien Verbruggen <mgjv@tradingpost.com.au>',
-- 'Benjamin Warfield <bwarfield@cpan.org>',
-- 'Ruslan Zakirov <Ruslan.Zakirov@gmail.com>',
-- ]
-+ 'AUTHOR' => 'Martien Verbruggen <mgjv@tradingpost.com.au>',
- ):()
- ),
-
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 16a8d68..3ce55a8 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -100,32 +100,6 @@ define PERL_INSTALL_TARGET_CMDS
$(MAKE1) -C $(@D) DESTDIR="$(TARGET_DIR)" install.perl
endef
-# perl infra: fix for Perl XS packages configured by Makefile.PL
-#
-# ExtUtils::MakeMaker adds all the header files used by the perl as
-# dependencies to the generated Makefile. This means that the generated
-# Makefile will depend on the system's header files.
-#
-# Usually this is not a problem, because when building the target package,
-# these header files will indeed be found in $(STAGING_DIR). However, some
-# distro's add an extra header file to the system's perl. This header is
-# also included in the generated Makefile, which makes the build fail
-# because it doesn't exist in $(STAGING_DIR).
-#
-# As a work-around, explicitly create this header file in $(STAGING_DIR).
-# It doesn't hurt to create it even if the system perl doesn't need it.
-#
-define PERL_ADD_CORE_H
- touch $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE/patchlevel-debian.h
- touch $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE/patchlevel-gentoo.h
- touch $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE/cc_runtime.h
- touch $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE/fakethr.h
- touch $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE/perlsfio.h
- touch $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE/vutil.h
-endef
-
-PERL_POST_INSTALL_STAGING_HOOKS += PERL_ADD_CORE_H
-
HOST_PERL_CONF_OPTS = \
-des \
-Dprefix="$(HOST_DIR)/usr" \
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [V2 0/4] host-perl
2014-10-11 6:36 [Buildroot] [V2 0/4] host-perl Francois Perrad
` (3 preceding siblings ...)
2014-10-11 6:36 ` [Buildroot] [V2 4/4] perl: remove useless hacks Francois Perrad
@ 2014-10-17 9:49 ` Peter Korsgaard
2014-10-17 14:27 ` Peter Korsgaard
5 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2014-10-17 9:49 UTC (permalink / raw)
To: buildroot
>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:
> perl infrastructure using a host-perl instead of the system perl
> V1 -> V2:
> - rebase the serie
> - XML-Parser doesn't use the infrastructure
> Note: no test done for metacity
> Francois Perrad (4):
> libxml-parser-perl: restore it like before perl infra
> perl: add host variant
> pkg-perl: refactor with host-perl
> perl: remove useless hacks
Committed series, thanks. I cannot say that I fully understand all the
perl stuff, but as you're the expert.. ;)
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread* [Buildroot] [V2 0/4] host-perl
2014-10-11 6:36 [Buildroot] [V2 0/4] host-perl Francois Perrad
` (4 preceding siblings ...)
2014-10-17 9:49 ` [Buildroot] [V2 0/4] host-perl Peter Korsgaard
@ 2014-10-17 14:27 ` Peter Korsgaard
2014-10-18 7:25 ` François Perrad
5 siblings, 1 reply; 8+ messages in thread
From: Peter Korsgaard @ 2014-10-17 14:27 UTC (permalink / raw)
To: buildroot
>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:
> perl infrastructure using a host-perl instead of the system perl
> V1 -> V2:
> - rebase the serie
> - XML-Parser doesn't use the infrastructure
> Note: no test done for metacity
> Francois Perrad (4):
> libxml-parser-perl: restore it like before perl infra
> perl: add host variant
> pkg-perl: refactor with host-perl
> perl: remove useless hacks
It seems to cause a number of autobuild failures, could you take a look please?
http://autobuild.buildroot.net/results/688/6881a8f6366085f89bea0d8b3a77fa23af26f3b7/build-end.log
http://autobuild.buildroot.net/results/d68/d68143ec7745854c97df6c5221b03ff586dec1b1/build-end.log
http://autobuild.buildroot.net/results/aaf/aaf91380953ebb84c582b38b46cfb180ff6862cb/build-end.log
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread