| author | Andreas Schwab <schwab@suse.de> |
| Fri, 19 Jun 2015 08:18:57 +0200 | |
| branch | firefox38 |
| changeset 858 | 0bbf4b3a4272 |
| child 869 | 0dd25a92df97 |
| permissions | -rw-r--r-- |
|
858
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
1 |
Index: mozilla/configure.in |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
2 |
=================================================================== |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
3 |
--- mozilla.orig/configure.in |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
4 |
+++ mozilla/configure.in |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
5 |
@@ -6241,7 +6241,7 @@ fi |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
6 |
|
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
7 |
dnl If we're on an ARM system which supports libjpeg-turbo's asm routines and |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
8 |
dnl --disable-libjpeg-turbo wasn't passed, use the C compiler as the assembler. |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
9 |
-if test -n "$LIBJPEG_TURBO_ARM_ASM" ; then |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
10 |
+if test -n "$LIBJPEG_TURBO_ARM_ASM" -o -n "$LIBJPEG_TURBO_ARM64_ASM" ; then |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
11 |
echo "Using $AS as the assembler for ARM code." |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
12 |
LIBJPEG_TURBO_AS=$AS |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
13 |
fi |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
14 |
@@ -6252,6 +6252,8 @@ elif test -n "$LIBJPEG_TURBO_X64_ASM"; t |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
15 |
AC_DEFINE(LIBJPEG_TURBO_X64_ASM) |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
16 |
elif test -n "$LIBJPEG_TURBO_ARM_ASM"; then |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
17 |
AC_DEFINE(LIBJPEG_TURBO_ARM_ASM) |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
18 |
+elif test -n "$LIBJPEG_TURBO_ARM64_ASM"; then |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
19 |
+ AC_DEFINE(LIBJPEG_TURBO_ARM64_ASM) |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
20 |
elif test -n "$MOZ_LIBJPEG_TURBO"; then |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
21 |
dnl Warn if we're not building the optimized routines, even though the user |
|
0bbf4b3a4272
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
22 |
dnl didn't specify --disable-libjpeg-turbo. |