diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2005-04-23 18:27:20 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2005-04-23 18:27:20 +0000 |
| commit | 8c070080b064b1cbc187534de8e23623dedcf779 (patch) | |
| tree | 4394a2c96714819108dfc42b869f2e72044b87e6 | |
| parent | Fix build on 4.X. (diff) | |
- Attempt to fix build on amd64 by disabling MMX/SSE code.
gcc complains that -fPIC is needed to link the shared lib,
but I have no idea how to do this with yasm? with out disabling the
shared library and just making a static library.
Pointed out by: krismail
Notes
Notes:
svn path=/head/; revision=134017
| -rw-r--r-- | multimedia/x264-devel/files/patch-configure | 14 | ||||
| -rw-r--r-- | multimedia/x264/files/patch-configure | 14 |
2 files changed, 18 insertions, 10 deletions
diff --git a/multimedia/x264-devel/files/patch-configure b/multimedia/x264-devel/files/patch-configure index 52e8e621795f..99971cf99d35 100644 --- a/multimedia/x264-devel/files/patch-configure +++ b/multimedia/x264-devel/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Thu Apr 21 11:04:21 2005 -+++ configure Fri Apr 22 16:01:23 2005 +--- configure.orig Thu Apr 21 05:04:21 2005 ++++ configure Sat Apr 23 14:26:33 2005 @@ -22,8 +22,8 @@ debug="no" vfw="no" @@ -11,15 +11,19 @@ LDFLAGS="" AS="nasm" -@@ -75,7 +75,7 @@ +@@ -75,9 +75,9 @@ ARCH="X86" CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2" ;; - x86_64) +- ARCH="X86_64" +- CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2" + x86_64 | amd64) - ARCH="X86_64" - CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2" ++ ARCH="amd64" ++ CFLAGS="$CFLAGS" AS="yasm" + ASFLAGS="-f elf -m amd64" + ;; @@ -89,6 +89,10 @@ else CFLAGS="$CFLAGS -maltivec -mabi=altivec" diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure index 52e8e621795f..99971cf99d35 100644 --- a/multimedia/x264/files/patch-configure +++ b/multimedia/x264/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Thu Apr 21 11:04:21 2005 -+++ configure Fri Apr 22 16:01:23 2005 +--- configure.orig Thu Apr 21 05:04:21 2005 ++++ configure Sat Apr 23 14:26:33 2005 @@ -22,8 +22,8 @@ debug="no" vfw="no" @@ -11,15 +11,19 @@ LDFLAGS="" AS="nasm" -@@ -75,7 +75,7 @@ +@@ -75,9 +75,9 @@ ARCH="X86" CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2" ;; - x86_64) +- ARCH="X86_64" +- CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2" + x86_64 | amd64) - ARCH="X86_64" - CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2" ++ ARCH="amd64" ++ CFLAGS="$CFLAGS" AS="yasm" + ASFLAGS="-f elf -m amd64" + ;; @@ -89,6 +89,10 @@ else CFLAGS="$CFLAGS -maltivec -mabi=altivec" |