diff mbox

perl-gd: fix build of native part

Message ID 1487144532-1818-1-git-send-email-francois.perrad@gadz.org
State Accepted
Headers show

Commit Message

Francois Perrad Feb. 15, 2017, 7:42 a.m. UTC
EUMM don't find .xs file in subdirectory (only .pm files are handled)
So, let move lib/GD.xs in the root directory.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/perl-gd/perl-gd.mk | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Thomas Petazzoni Feb. 15, 2017, 9:39 p.m. UTC | #1
Hello,

On Wed, 15 Feb 2017 08:42:12 +0100, Francois Perrad wrote:
> EUMM don't find .xs file in subdirectory (only .pm files are handled)
> So, let move lib/GD.xs in the root directory.
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

What is this fixing?

Here, the following defconfig builds just fine:

BR2_arm=y
BR2_cortex_a8=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_PERL=y
BR2_PACKAGE_PERL_GD=y
# BR2_TARGET_ROOTFS_TAR is not set

Is it just that the build succeeds, but it fails at runtime because the
native part has been built/installed ?

Isn't moving GD.xs a dirty hack ? How was it working before ?

Thanks,

Thomas
Francois Perrad Feb. 16, 2017, 11:08 a.m. UTC | #2
2017-02-15 22:39 GMT+01:00 Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>:
> Hello,
>
> On Wed, 15 Feb 2017 08:42:12 +0100, Francois Perrad wrote:
>> EUMM don't find .xs file in subdirectory (only .pm files are handled)
>> So, let move lib/GD.xs in the root directory.
>>
>> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>
> What is this fixing?
>
> Here, the following defconfig builds just fine:
>
> BR2_arm=y
> BR2_cortex_a8=y
> BR2_TOOLCHAIN_EXTERNAL=y
> BR2_INIT_NONE=y
> BR2_SYSTEM_BIN_SH_NONE=y
> # BR2_PACKAGE_BUSYBOX is not set
> BR2_PACKAGE_PERL=y
> BR2_PACKAGE_PERL_GD=y
> # BR2_TARGET_ROOTFS_TAR is not set
>
> Is it just that the build succeeds, but it fails at runtime because the
> native part has been built/installed ?

Yes.

>
> Isn't moving GD.xs a dirty hack ? How was it working before ?
>

Previously, GD.xs was in the root directory, see
http://search.cpan.org/~lds/GD-2.53/MANIFEST

François

> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Thomas Petazzoni March 1, 2017, 10:13 p.m. UTC | #3
Hello,

On Wed, 15 Feb 2017 08:42:12 +0100, Francois Perrad wrote:
> EUMM don't find .xs file in subdirectory (only .pm files are handled)
> So, let move lib/GD.xs in the root directory.
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/perl-gd/perl-gd.mk | 5 +++++
>  1 file changed, 5 insertions(+)

Applied to master, thanks. Peter, I believe this one should go to the
LTS branch. Thanks!

Thomas
Peter Korsgaard March 2, 2017, 7:16 a.m. UTC | #4
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 > Hello,
 > On Wed, 15 Feb 2017 08:42:12 +0100, Francois Perrad wrote:
 >> EUMM don't find .xs file in subdirectory (only .pm files are handled)
 >> So, let move lib/GD.xs in the root directory.
 >> 
 >> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
 >> ---
 >> package/perl-gd/perl-gd.mk | 5 +++++
 >> 1 file changed, 5 insertions(+)

 > Applied to master, thanks. Peter, I believe this one should go to the
 > LTS branch. Thanks!

Committed to 2017.02.x, thanks!
diff mbox

Patch

diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk
index ea8fd5c..2ad966c 100644
--- a/package/perl-gd/perl-gd.mk
+++ b/package/perl-gd/perl-gd.mk
@@ -12,6 +12,11 @@  PERL_GD_LICENSE = Artistic or GPLv1+
 PERL_GD_LICENSE_FILES = LICENSE
 PERL_GD_PREFER_INSTALLER = EUMM
 
+define PERL_GD_MOVE_XS
+	mv $(@D)/lib/GD.xs $(@D)/GD.xs
+endef
+PERL_GD_POST_PATCH_HOOKS += PERL_GD_MOVE_XS
+
 PERL_GD_CONF_OPTS = \
 	-options=FT,PNG \
 	-lib_gd_path=$(STAGING_DIR)/usr \