move LDFLAG -undefined dynamic_lookup to python recipe

Fixes the compilation problems of ffmpeg and allows the removal of an
hotfix in the ffmpeg recipe.
This commit is contained in:
Ben Hagen 2015-04-28 18:19:50 +02:00
parent 77f5bf0ac3
commit ddf50b38b5
3 changed files with 1 additions and 14 deletions

View file

@ -39,18 +39,6 @@ class FFMpegRecipe(Recipe):
"--extra-ldflags={}".format(build_env["LDFLAGS"]), "--extra-ldflags={}".format(build_env["LDFLAGS"]),
*options, *options,
_env=build_env) _env=build_env)
shprint(sh.sed,
"-i.bak",
"s/HAVE_CLOSESOCKET=yes//g",
"config.mak")
shprint(sh.sed,
"-i.bak",
"s/#define HAVE_CLOSESOCKET 1//g",
"config.h")
shprint(sh.sed,
"-i.bak",
"s/%define HAVE_CLOSESOCKET 1//g",
"config.asm")
shprint(sh.make, "clean", _env=build_env) shprint(sh.make, "clean", _env=build_env)
shprint(sh.make, "-j3", _env=build_env) shprint(sh.make, "-j3", _env=build_env)
shprint(sh.make, "install") shprint(sh.make, "install")

View file

@ -40,7 +40,7 @@ class PythonRecipe(Recipe):
"CC={}".format(build_env["CC"]), "CC={}".format(build_env["CC"]),
"LD={}".format(build_env["LD"]), "LD={}".format(build_env["LD"]),
"CFLAGS={}".format(build_env["CFLAGS"]), "CFLAGS={}".format(build_env["CFLAGS"]),
"LDFLAGS={}".format(build_env["LDFLAGS"]), "LDFLAGS={} -undefined dynamic_lookup".format(build_env["LDFLAGS"]),
"--without-pymalloc", "--without-pymalloc",
"--disable-toolbox-glue", "--disable-toolbox-glue",
"--host={}-apple-darwin".format(arch), "--host={}-apple-darwin".format(arch),

View file

@ -164,7 +164,6 @@ class Arch(object):
"--sysroot", self.sysroot, "--sysroot", self.sysroot,
"-L{}/{}".format(self.ctx.dist_dir, "lib"), "-L{}/{}".format(self.ctx.dist_dir, "lib"),
"-lsqlite3", "-lsqlite3",
"-undefined", "dynamic_lookup",
self.version_min self.version_min
]) ])
return env return env