diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2014-11-29 14:56:26 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2014-11-29 14:56:26 +0000 |
| commit | 84a0cdc20eaa215476bc482849a6eaa17c920691 (patch) | |
| tree | 72f3a975219144110504aea3b5abe810b1c4ca7e | |
| parent | Add an external toolchain suitable for amd64 target (diff) | |
Really disable MULTIPLICITY if disabled in OPTIONS, and as it was always on
before, add it to the OPTIONS_DEFAULT to not change the default behavior.
Noticed by: ache
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=373622
| -rw-r--r-- | lang/perl5.14/Makefile | 6 | ||||
| -rw-r--r-- | lang/perl5.16/Makefile | 6 | ||||
| -rw-r--r-- | lang/perl5.18/Makefile | 5 | ||||
| -rw-r--r-- | lang/perl5.20/Makefile | 5 |
4 files changed, 14 insertions, 8 deletions
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile index 7fb19d7b9cdf..a2f06442063c 100644 --- a/lang/perl5.14/Makefile +++ b/lang/perl5.14/Makefile @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -29,7 +29,7 @@ CONFLICTS_INSTALL= perl5.*-* OPTIONS_DEFINE= DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \ MULTIPLICITY SITECUSTOMIZE USE_PERL -OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD USE_PERL +OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD USE_PERL MULTIPLICITY OPTIONS_SUB= GDBM_DESC= GDBM_File extension PERL_MALLOC_DESC= Use Perl malloc @@ -175,6 +175,8 @@ CONFIGURE_ARGS+= -Duse64bitint .if ${PORT_OPTIONS:MMULTIPLICITY} CONFIGURE_ARGS+= -Dusemultiplicity=y +.else +CONFIGURE_ARGS+= -Dusemultiplicity=n .endif .if ${PORT_OPTIONS:MSITECUSTOMIZE} diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile index ef4c0fbf9b41..e33e9e27a70d 100644 --- a/lang/perl5.16/Makefile +++ b/lang/perl5.16/Makefile @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -29,7 +29,7 @@ CONFLICTS_INSTALL= perl5.*-* OPTIONS_DEFINE= DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \ MULTIPLICITY SITECUSTOMIZE USE_PERL -OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD USE_PERL +OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD USE_PERL MULTIPLICITY OPTIONS_SUB= GDBM_DESC= GDBM_File extension PERL_MALLOC_DESC= Use Perl malloc @@ -175,6 +175,8 @@ CONFIGURE_ARGS+= -Duse64bitint .if ${PORT_OPTIONS:MMULTIPLICITY} CONFIGURE_ARGS+= -Dusemultiplicity=y +.else +CONFIGURE_ARGS+= -Dusemultiplicity=n .endif .if ${PORT_OPTIONS:MSITECUSTOMIZE} diff --git a/lang/perl5.18/Makefile b/lang/perl5.18/Makefile index 5772d8b68c4e..691d8458dcc2 100644 --- a/lang/perl5.18/Makefile +++ b/lang/perl5.18/Makefile @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -29,7 +29,7 @@ OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ # it seems perl malloc has problems with threaded perl on FreeBSD OPTIONS_RADIO= EXCLUSIVE OPTIONS_RADIO_EXCLUSIVE= THREADS PERL_MALLOC -OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD USE_PERL +OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD USE_PERL MULTIPLICITY EXCLUSIVE_DESC= Exclusive OPTIONS GDBM_DESC= GDBM_File extension @@ -50,6 +50,7 @@ GDBM_CONFIGURE_OFF= -Ui_gdbm GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm PERL_64BITINT_CONFIGURE_ON= -Duse64bitint MULTIPLICITY_CONFIGURE_ON= -Dusemultiplicity=y +MULTIPLICITY_CONFIGURE_OFF= -Dusemultiplicity=n SITECUSTOMIZE_CONFIGURE_ON= -Dusesitecustomize THREADS_CONFIGURE_ON= -Dusethreads=y THREADS_CONFIGURE_OFF= -Dusethreads=n diff --git a/lang/perl5.20/Makefile b/lang/perl5.20/Makefile index cde613fb7f91..69877f4142b9 100644 --- a/lang/perl5.20/Makefile +++ b/lang/perl5.20/Makefile @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -29,7 +29,7 @@ OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ # it seems perl malloc has problems with threaded perl on FreeBSD OPTIONS_RADIO= EXCLUSIVE OPTIONS_RADIO_EXCLUSIVE= THREADS PERL_MALLOC -OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD +OPTIONS_DEFAULT= PERL_64BITINT THREADS PTHREAD MULTIPLICITY EXCLUSIVE_DESC= Exclusive OPTIONS GDBM_DESC= GDBM_File extension @@ -48,6 +48,7 @@ GDBM_CONFIGURE_OFF= -Ui_gdbm GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm PERL_64BITINT_CONFIGURE_ON= -Duse64bitint MULTIPLICITY_CONFIGURE_ON= -Dusemultiplicity=y +MULTIPLICITY_CONFIGURE_OFF= -Dusemultiplicity=n SITECUSTOMIZE_CONFIGURE_ON= -Dusesitecustomize THREADS_CONFIGURE_ON= -Dusethreads=y THREADS_CONFIGURE_OFF= -Dusethreads=n |