1. openindiana
  2. oi-build

Commits

Jon Tibble  committed 409960d

Fix builds - prestable perl

  • Participants
  • Parent commits d46641a
  • Branches default

Comments (0)

Files changed (3)

File components/quilt/Makefile

View file
  • Ignore whitespace
 CONFIGURE_OPTIONS += --with-sed=/usr/gnu/bin/sed
 CONFIGURE_OPTIONS += --with-diff=/usr/gnu/bin/diff
 CONFIGURE_OPTIONS += --with-patch=/usr/gnu/bin/patch
-CONFIGURE_OPTIONS += --with-perl=/usr/perl5/$(PERL_VERSION)/bin/perl
+CONFIGURE_OPTIONS += --with-perl=$(PERL)
 CONFIGURE_OPTIONS += --with-pod2man=/usr/perl5/$(PERL_VERSION)/bin/pod2man
 CONFIGURE_OPTIONS += --with-xgettext=/usr/bin/gxgettext
 CONFIGURE_OPTIONS += --with-msgfmt=/usr/bin/gmsgfmt

File components/samba/mozldap/Makefile

View file
  • Ignore whitespace
 SRC_OFFSET =	c-sdk
 CONFIGURE_SCRIPT = $(SOURCE_DIR)/$(SRC_OFFSET)/configure
 
-RECENT_PERL =	/usr/perl5/5.12/bin/perl
+RECENT_PERL =	$(PERL)
 
 MPS_INCDIR =	$(USRINCDIR)/mps
 

File make-rules/shared-macros.mk

View file
  • Ignore whitespace
 
 # This is the default BUILD version of perl
 # Not necessarily the system's default version, i.e. /usr/bin/perl
-PERL_VERSION =  5.12
+PERL_VERSION =  5.10.0
 
-PERL_VERSIONS = 5.12
+PERL_VERSIONS = 5.10.0
 
-PERL.5.12 =     /usr/perl5/5.12/bin/perl
+PERL.5.10.0 =	/usr/perl5/5.10.0/bin/perl
 
 PERL =          $(PERL.$(PERL_VERSION))