Changeset View
Changeset View
Standalone View
Standalone View
modules/ksb/Module.pm
Show First 20 Lines • Show All 651 Lines • ▼ Show 20 Line(s) | 651 | { | |||
---|---|---|---|---|---|
652 | my $self = assert_isa(shift, 'ksb::Module'); | 652 | my $self = assert_isa(shift, 'ksb::Module'); | ||
653 | my $ctx = $self->buildContext(); | 653 | my $ctx = $self->buildContext(); | ||
654 | my $kdedir = $self->getOption('kdedir'); | 654 | my $kdedir = $self->getOption('kdedir'); | ||
655 | my $prefix = $self->installationPath(); | 655 | my $prefix = $self->installationPath(); | ||
656 | 656 | | |||
657 | # Add global set-envs and context | 657 | # Add global set-envs and context | ||
658 | $self->buildContext()->applyUserEnvironment(); | 658 | $self->buildContext()->applyUserEnvironment(); | ||
659 | 659 | | |||
660 | # Avoid moving /usr up in env vars | ||||
661 | if ($kdedir ne '/usr') { | ||||
660 | my @pkg_config_dirs = ("$kdedir/lib/pkgconfig"); | 662 | my @pkg_config_dirs = ("$kdedir/lib/pkgconfig"); | ||
661 | $ctx->prependEnvironmentValue('PKG_CONFIG_PATH', @pkg_config_dirs); | 663 | $ctx->prependEnvironmentValue('PKG_CONFIG_PATH', @pkg_config_dirs); | ||
662 | 664 | | |||
663 | my @ld_dirs = ("$kdedir/lib", $self->getOption('libpath')); | 665 | my @ld_dirs = ("$kdedir/lib", $self->getOption('libpath')); | ||
664 | $ctx->prependEnvironmentValue('LD_LIBRARY_PATH', @ld_dirs); | 666 | $ctx->prependEnvironmentValue('LD_LIBRARY_PATH', @ld_dirs); | ||
665 | 667 | | |||
666 | my @path = ("$kdedir/bin", $self->getOption('binpath')); | 668 | my @path = ("$kdedir/bin", $self->getOption('binpath')); | ||
667 | $ctx->prependEnvironmentValue('PATH', @path); | 669 | $ctx->prependEnvironmentValue('PATH', @path); | ||
670 | } | ||||
668 | 671 | | |||
669 | # Build system's environment injection | 672 | # Build system's environment injection | ||
670 | my $buildSystem = $self->buildSystem(); | 673 | my $buildSystem = $self->buildSystem(); | ||
671 | $buildSystem->prepareModuleBuildEnvironment($ctx, $self, $prefix); | 674 | $buildSystem->prepareModuleBuildEnvironment($ctx, $self, $prefix); | ||
672 | 675 | | |||
673 | # Read in user environment defines | 676 | # Read in user environment defines | ||
674 | $self->applyUserEnvironment() unless $self == $ctx; | 677 | $self->applyUserEnvironment() unless $self == $ctx; | ||
675 | } | 678 | } | ||
▲ Show 20 Lines • Show All 298 Lines • Show Last 20 Lines |