0012-contrib-add-arch-option-for-platforms-where-the-arch.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  1. From f8d45c80b2901cb3109c5b07cdaf4953b491be66 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
  3. Date: Thu, 3 Oct 2013 18:27:43 +0200
  4. Subject: [PATCH 12/16] contrib: add arch option for platforms where the arch
  5. triplet would be ambigous
  6. ---
  7. contrib/bootstrap | 11 ++++++++++-
  8. 1 file changed, 10 insertions(+), 1 deletion(-)
  9. diff --git a/contrib/bootstrap b/contrib/bootstrap
  10. index e5c7022..cc170a2 100755
  11. --- a/contrib/bootstrap
  12. +++ b/contrib/bootstrap
  13. @@ -30,6 +30,7 @@ usage()
  14. echo " --disable-sout configure to not build stream output packages"
  15. echo " --enable-small optimize libraries for size with slight speed decrease [DANGEROUS]"
  16. echo " --disable-gpl configure to not build viral GPL code"
  17. + echo " --arch=ARCH configure to set the target architecture if host triple is ambigous"
  18. }
  19. BUILD=
  20. @@ -40,6 +41,7 @@ PKGS_DISABLE=
  21. BUILD_ENCODERS="1"
  22. BUILD_DISCS="1"
  23. GPL="1"
  24. +ARCH=
  25. if test ! -f "../../contrib/src/main.mak"
  26. then
  27. @@ -81,6 +83,9 @@ do
  28. --enable-*)
  29. PKGS_ENABLE="${PKGS_ENABLE} ${1#--enable-}"
  30. ;;
  31. + --arch=*)
  32. + ARCH="${1#--arch=}"
  33. + ;;
  34. *)
  35. echo "Unrecognized options $1"
  36. usage
  37. @@ -188,6 +193,7 @@ test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
  38. test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
  39. test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
  40. test -z "$GPL" || add_make_enabled "GPL"
  41. +test -z "$ARCH" || add_make "ARCH := $ARCH"
  42. #
  43. # Checks
  44. @@ -200,7 +206,10 @@ case "${OS}" in
  45. check_macosx_sdk
  46. add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
  47. else
  48. - add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
  49. + add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON"
  50. + if [ "$ARCH" != "arm64" ]; then
  51. + add_make_enabled "HAVE_ARMV7A"
  52. + fi
  53. fi
  54. ;;
  55. *bsd*)
  56. --
  57. 1.8.3.4 (Apple Git-47)