freebsd-ports/multimedia/ffmpeg2theora/files/patch-SConstruct
Dmitry Marakasov df72cf2af7 - Pass environment through scons to allow build with ccache
PR:		200051
Submitted by:	amdmi3
Approved by:	maintainer timeout (wg, 2 weeks)
2015-05-22 10:18:59 +00:00

30 lines
941 B
Text

--- SConstruct.orig 2012-06-25 17:15:16 UTC
+++ SConstruct
@@ -37,7 +37,7 @@ opts.AddVariables(
BoolVariable('libkate', 'enable libkate support', 1),
BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
)
-env = Environment(options = opts)
+env = Environment(options = opts, ENV=os.environ, CC = Split(os.environ['CC']))
Help(opts.GenerateHelpText(env))
pkg_flags="--cflags --libs"
@@ -151,7 +151,6 @@ if not env.GetOption('clean'):
"libavcodec >= 52.30.0",
"libpostproc",
"libswscale",
- "libswresample",
"libavutil",
]
if os.path.exists("./ffmpeg"):
@@ -200,9 +199,8 @@ if not env.GetOption('clean'):
env.Append(CCFLAGS=[
'-DHAVE_ICONV'
])
- if conf.CheckLib('iconv'):
- env.Append(LIBS=['iconv'])
+ env.Append(LIBS=['m'])
if env['crossmingw']:
env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
env.Append(LIBS=['m'])