]> granicus.if.org Git - handbrake/commitdiff
flatpak: fix x264 link errors in latest flatpak Sdk
authorJohn Stebbins <jstebbins.hb@gmail.com>
Fri, 4 Jan 2019 21:58:11 +0000 (14:58 -0700)
committerJohn Stebbins <jstebbins.hb@gmail.com>
Sat, 5 Jan 2019 17:07:22 +0000 (10:07 -0700)
Latest flatpak freedesktop Sdk gcc uses PIE by default which requires
that we build x264 with PIC

contrib/x264/module.defs

index 4d7dd1dc0024268ae10d786a1b14294bf3b9b622..ea8899e01cabd1bfb18e646cad321f78eb0ac575 100644 (file)
@@ -18,3 +18,7 @@ ifeq (1,$(BUILD.cross))
     X264.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver ?extra)"
     X264.CONFIGURE.env.LDFLAGS = LDFLAGS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver)"
 endif
+
+ifeq (1,$(FEATURE.flatpak))
+    X264.CONFIGURE.extra += --enable-pic
+endif