diff options
| author | Kevin Mitchell <kevmitch@math.sfu.ca> | 2014-02-11 01:18:57 -0800 |
|---|---|---|
| committer | Kevin Mitchell <kevmitch@math.sfu.ca> | 2014-02-11 01:18:57 -0800 |
| commit | 9ef6b405dea4cb92a991fb1224c623a15caa27c7 (patch) | |
| tree | 6aa284389dcc2671354b9bce321a32fa5d7d5097 | |
| parent | 2af41f5f406008c8eb6166b62a0de09b8af6f420 (diff) | |
| download | mpv-build-9ef6b405dea4cb92a991fb1224c623a15caa27c7.tar.bz2 mpv-build-9ef6b405dea4cb92a991fb1224c623a15caa27c7.tar.xz | |
add dependency on gcc-4.7 or gcc-4.8 for arm (needed for atomic builtins)
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 62b1eb8..9bddfe2 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: automake, c-compiler | gcc, debhelper (>= 7), - gcc-4.8 [powerpc powerpcspe sparc], + gcc-4.8 [powerpc powerpcspe sparc armel armhf] | gcc-4.7 [armel armhf], ladspa-sdk, libasound2-dev [linux-any], libbluray-dev, diff --git a/debian/rules b/debian/rules index 06a1a0c..c7c825f 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,9 @@ ifeq ($(DEB_HOST_ARCH_CPU),$(filter $(DEB_HOST_ARCH_CPU),powerpc sparc)) export CC=gcc-4.8 # fixes #73363 endif - +ifeq ($(DEB_HOST_ARCH_CPU),arm) + export CC=$(shell which gcc-4.8 || which gcc-4.7;) +endif # To enable parallel building: # You can either set DEB_BUILD_OPTIONS=paralell=<num-procs> in your build environment # or provide the -j<numprocs> option to debuild or dpkg-buildpackage, which |