summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Waters <matthew@centricular.com>2021-07-13 13:07:28 +1000
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2021-07-13 06:12:42 +0000
commit162724eb9b02b0cc4c8149cdfdf216533847916c (patch)
tree412d5adde3310d2eb9f856ed4991c41ec24ca207
parent84fea3fdff10dbc6cdfcf5bcd1cc16dba14258f7 (diff)
ffmpeg: actually use gas-preprocessor on ios
Also pass the necessary flags for iphone minimum target version selection so that object files are built for the correct version. This may be important if some newer code/functionality cannot be used on older devices due to hardware or software limitations. Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/715>
-rw-r--r--recipes/ffmpeg.recipe3
1 files changed, 2 insertions, 1 deletions
diff --git a/recipes/ffmpeg.recipe b/recipes/ffmpeg.recipe
index 0e80cbac..0c290098 100644
--- a/recipes/ffmpeg.recipe
+++ b/recipes/ffmpeg.recipe
@@ -12,7 +12,7 @@ class Recipe(recipe.Recipe):
btype = BuildType.MAKEFILE
configure_tpl = './configure --prefix=%(prefix)s --libdir=%(libdir)s \
- --ar="$AR" --as="$CC" --cc="$CC" --ld="$CC" --nm="$NM" --ranlib="$RANLIB" \
+ --ar="$AR" --as="$AS" --cc="$CC" --ld="$CC" --nm="$NM" --ranlib="$RANLIB" \
--strip="$STRIP" --windres="$RC" \
--enable-static --enable-pic --enable-shared \
--disable-avdevice --disable-postproc --disable-swscale \
@@ -49,6 +49,7 @@ class Recipe(recipe.Recipe):
gas = self.get_env('GAS')
if gas:
self.set_env('AS', gas)
+ self.set_env('ASFLAGS', self.get_env('CPPFLAGS'))
else:
cc = self.get_env('CC')
if cc: