Prechádzať zdrojové kódy

fix p5-xml-parser package, add basic perl module infrastructure (based on buildroot perl stuff)

Waldemar Brodkorb 10 rokov pred
rodič
commit
77ba10826a
3 zmenil súbory, kde vykonal 29 pridanie a 13 odobranie
  1. 16 1
      mk/perl.mk
  2. 7 0
      mk/pkg-bottom.mk
  3. 6 12
      package/p5-xml-parser/Makefile

+ 16 - 1
mk/perl.mk

@@ -1,2 +1,17 @@
 PERL_VERSION=5.18.1
-PERL_SITEDIR:=/usr/lib/perl5/site_perl/$(PERL_VERSION)/$(ADK_TARGET_CPU_ARCH)-linux
+PERL_ARCHNAME:=$(ADK_TARGET_CPU_ARCH)-linux
+PERL_SITEDIR:=/usr/lib/perl5/site_perl/$(PERL_VERSION)
+PERL_ENV:=	AR="$(TARGET_AR)" \
+		FULL_AR="$(TARGET_AR)" \
+		CC="$(TARGET_CC)" \
+		CCFLAGS="$(TARGET_CFLAGS)" \
+		LD="$(TARGET_CC)" \
+		LDDLFLAGS="-shared $(TARGET_LDFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		PERL_INC=$(STAGING_TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE \
+		DESTDIR=$(WRKINST) \
+		INSTALLDIRS=vendor \
+		INSTALLVENDORLIB=$(PERL_SITEDIR) \
+		INSTALLVENDORARCH=$(PERL_SITEDIR)/$(PERL_ARCHNAME) \
+		INSTALLVENDORBIN=/usr/bin \
+		INSTALLVENDORSCRIPT=/usr/bin

+ 7 - 0
mk/pkg-bottom.mk

@@ -53,6 +53,13 @@ else ifneq ($(filter minimal,${CONFIG_STYLE}),)
 	    env ${CONFIGURE_ENV} \
 	    ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
 	    ${CONFIGURE_ARGS} $(MAKE_TRACE)
+else ifneq ($(filter perl,${CONFIG_STYLE}),)
+	@$(CMD_TRACE) "configuring perl module... "
+	cd ${WRKBUILD}; \
+		PATH='${HOST_PATH}' \
+		PERL_MM_USE_DEFAULT=1 \
+		PERL_AUTOINSTALL=--skipdeps \
+		perl Makefile.PL $(PERL_ENV)
 else ifeq ($(strip ${CONFIG_STYLE}),)
 	@$(CMD_TRACE) "configuring... "
 	cd ${WRKBUILD}; rm -f config.{cache,status}; \

+ 6 - 12
package/p5-XML-Parser/Makefile → package/p5-xml-parser/Makefile

@@ -3,18 +3,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=		p5-XML-Parser
+PKG_NAME:=		p5-xml-parser
 PKG_VERSION:=		2.40
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		c66e9adba003d0667cc40115ccd837a5
 PKG_DESCR:=		xml parser
 PKG_SECTION:=		dev/perl
 PKG_DEPENDS:=		perl libexpat
-PKG_BUILDDEP:=		perl-host expat
+PKG_BUILDDEP:=		perl expat
 PKG_SITES:=		http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/
 
-PKG_CFLINE_P5_XML_PARSER:=	depends on ADK_BROKEN
-
 DISTFILES:=             XML-Parser-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/XML-Parser-${PKG_VERSION}
 
@@ -22,16 +20,12 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,P5_XML_PARSER,p5-xml-parser,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIG_STYLE:=		manual
-XAKE_FLAGS+=		CC="$(TARGET_CC)" CCFLAGS="$(TARGET_CFLAGS)"
-
 include $(TOPDIR)/mk/perl.mk
 
-pre-build:
-	(cd ${WRKSRC} && PATH='${HOST_PATH}' \
-		perl-host Makefile.PL \
-		EXPATLIBPATH=${STAGING_TARGET_DIR}/usr/lib \
-		EXPATINCPATH=${STAGING_TARGET_DIR}/usr/include)
+PERL_ENV+=		EXPATLIBPATH=${STAGING_TARGET_DIR}/usr/lib \
+			EXPATINCPATH=${STAGING_TARGET_DIR}/usr/include
+CONFIG_STYLE:=		perl
+XAKE_FLAGS+=		$(PERL_ENV)
 
 p5-xml-parser-install:
 	$(INSTALL_DIR) $(IDIR_P5_XML_PARSER)$(PERL_SITEDIR)