Bladeren bron

fix perl module compile on newer host perl

Waldemar Brodkorb 10 jaren geleden
bovenliggende
commit
d35470609e
3 gewijzigde bestanden met toevoegingen van 11 en 6 verwijderingen
  1. 2 1
      mk/perl.mk
  2. 2 1
      mk/pkg-bottom.mk
  3. 7 4
      package/p5-xml-parser/Makefile

+ 2 - 1
mk/perl.mk

@@ -1,6 +1,7 @@
 PERL_VERSION=5.18.1
 PERL_ARCHNAME:=$(ADK_TARGET_CPU_ARCH)-linux
 PERL_SITEDIR:=/usr/lib/perl5/site_perl/$(PERL_VERSION)
+PERL_INCDIR:=/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE
 PERL_ENV:=	AR="$(TARGET_AR)" \
 		FULL_AR="$(TARGET_AR)" \
 		CC="$(TARGET_CC)" \
@@ -8,7 +9,7 @@ PERL_ENV:=	AR="$(TARGET_AR)" \
 		LD="$(TARGET_CC)" \
 		LDDLFLAGS="-shared $(TARGET_LDFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
-		PERL_INC=$(STAGING_TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE \
+		PERL_INC=$(STAGING_TARGET_DIR)/$(PERL_INCDIR) \
 		DESTDIR=$(WRKINST) \
 		INSTALLDIRS=vendor \
 		INSTALLVENDORLIB=$(PERL_SITEDIR) \

+ 2 - 1
mk/pkg-bottom.mk

@@ -69,7 +69,8 @@ else ifneq ($(filter perl,${CONFIG_STYLE}),)
 		PATH='${HOST_PATH}' \
 		PERL_MM_USE_DEFAULT=1 \
 		PERL_AUTOINSTALL=--skipdeps \
-		perl Makefile.PL $(PERL_ENV)
+		$(PERL_ENV) \
+		perl Makefile.PL
 else ifeq ($(strip ${CONFIG_STYLE}),)
 	@$(CMD_TRACE) "configuring... "
 	cd ${WRKBUILD}; rm -f config.{cache,status}; \

+ 7 - 4
package/p5-xml-parser/Makefile

@@ -4,14 +4,14 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		p5-xml-parser
-PKG_VERSION:=		2.40
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		c66e9adba003d0667cc40115ccd837a5
+PKG_VERSION:=		2.41
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c320d2ffa459e6cdc6f9f59c1185855e
 PKG_DESCR:=		xml parser
 PKG_SECTION:=		dev/perl
 PKG_DEPENDS:=		perl libexpat
 PKG_BUILDDEP:=		perl expat
-PKG_SITES:=		http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/
+PKG_SITES:=		http://cpan.metacpan.org/authors/id/T/TO/TODDR/
 
 DISTFILES:=             XML-Parser-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/XML-Parser-${PKG_VERSION}
@@ -27,6 +27,9 @@ PERL_ENV+=		EXPATLIBPATH=${STAGING_TARGET_DIR}/usr/lib \
 CONFIG_STYLE:=		perl
 XAKE_FLAGS+=		$(PERL_ENV)
 
+post-extract:
+	@touch $(STAGING_TARGET_DIR)/$(PERL_INCDIR)/patchlevel-debian.h
+
 p5-xml-parser-install:
 	$(INSTALL_DIR) $(IDIR_P5_XML_PARSER)$(PERL_SITEDIR)
 	$(CP) $(WRKINST)$(PERL_SITEDIR)/* \