Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

Commit

Permalink
subversion: Fix build with PERL_MM_OPT set
Browse files Browse the repository at this point in the history
Without this change, the build aborts in Makefile.pl with the following
error: "Only one of PREFIX or INSTALL_BASE can be given. Not both."
PERL_MB_OPT and PERL_MM_OPT usually get set from the shell's profile, if
the user configured the CPAN shell to install modules to the users HOME.

Closes #46091.

Signed-off-by: Dominyk Tiller <dominyktiller@gmail.com>
  • Loading branch information
felixbuenemann authored and DomT4 committed Nov 22, 2015
1 parent 5460632 commit adaf83b
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Library/Formula/subversion.rb
Expand Up @@ -75,6 +75,11 @@ def install
inreplace "SConstruct", "unique=1", "unique=0"

ENV.universal_binary if build.universal?

# Fix perl bindings Makefile.pl failing with:
# Only one of PREFIX or INSTALL_BASE can be given. Not both.
ENV.delete "PERL_MM_OPT"

# scons ignores our compiler and flags unless explicitly passed
args = %W[PREFIX=#{serf_prefix} GSSAPI=/usr CC=#{ENV.cc}
CFLAGS=#{ENV.cflags} LINKFLAGS=#{ENV.ldflags}
Expand Down

0 comments on commit adaf83b

Please sign in to comment.