Commit c009003

committed

Installer/linux/rpm: Make OL10 configure options tweak more compact.

svn:sync-xref-src-repo-rev: r169912

1 parent 5bfa344 commit c009003Copy full SHA for c009003

File tree

-8

lines changed

-8

lines changed

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#!/usr/bin/make -f`
`2`		`-# $Id: rules 110433 2025年07月28日 12:55:05Z vadim.galitsyn@oracle.com $`
	`2`	`+# $Id: rules 110447 2025年07月28日 17:37:54Z vadim.galitsyn@oracle.com $`
`3`	`3`	`## @file`
`4`	`4`	`# VirtualBox rules.`
`5`	`5`	`#`
`@@ -166,12 +166,6 @@ ifeq ($(NOQT),)`
`166`	`166`	`endif`
`167`	`167`	`endif`
`168`	`168`
`169`		`-# Workaround building issues in OL10 environment.`
`170`		`-extra_cfg_flags :=`
`171`		`-ifeq ($(rpmrel),el10)`
`172`		`- extra_cfg_flags := --build-libssl --disable-java`
`173`		`-endif`
`174`		`-`
`175`	`169`	`# EL5 ships Python 2.4 while our Python support requires Python 2.6 or later`
`176`	`170`	`cfg_flags := $(if $(NOQT),--disable-qt,) \`
`177`	`171`	`$(if $(NOSDL),--disable-vboxsdl,) \`
`@@ -188,7 +182,9 @@ cfg_flags := $(if $(NOQT),--disable-qt,) \`
`188`	`182`	`$(if $(NOWINE),,--setup-wine) \`
`189`	`183`	`$(if $(VNC),--enable-vnc,) \`
`190`	`184`	`$(if $(PATH_OUT_BASE),--out-base-dir=$(PATH_OUT_BASE),) \`
`191`		`- --disable-extpack $(extra_cfg_flags)`
	`185`	`+ $(if $(filter el10,$(rpmrel)),--build-libssl,) \`
	`186`	`+ $(if $(filter el10,$(rpmrel)),--disable-java,) \`
	`187`	`+ --disable-extpack`
`192`	`188`
`193`	`189`	`bld_flags := LOCALCFG=$(instlin)/rpm/LocalConfig.kmk \`
`194`	`190`	`PATH_OUT=$(builddir) \`

Comments

(0)