tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

x264: unbreak cross compilation on armv[67] (close #1166).

Browse Source
This commit is contained in:
Juan RP
2015-03-20 10:40:30 +01:00
parent d5bd189ab3
commit b5e0b7f1b9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
srcpkgs/x264/template
View File

@@ -14,8 +14,10 @@ distfiles="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapsho
checksum=3519e8fa3399845c7d2248d0a7297a923ac6bdc78d0ec15e85026e810670e1be checksum=3519e8fa3399845c7d2248d0a7297a923ac6bdc78d0ec15e85026e810670e1be
do_configure() { do_configure() {
if [ "$XBPS_TARGET_MACHINE" = "armv6hf" ]; then if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
args+=" --disable-asm" args+=" --disable-asm"
elif [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
export AS=$CC
fi fi
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
args+=" --host=$XBPS_CROSS_TRIPLET" args+=" --host=$XBPS_CROSS_TRIPLET"
@@ -27,7 +29,6 @@ do_configure() {
do_build() { do_build() {
make ${makejobs} make ${makejobs}
} }
do_install() { do_install() {
make DESTDIR=${DESTDIR} \ make DESTDIR=${DESTDIR} \
bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install