diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2003-11-05 05:29:28 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2003-11-05 05:29:28 +0000 |
| commit | 038bfd68323b07d30c97ba4769dc2428a1656c61 (patch) | |
| tree | 12c1bb52beaef94ba18a9478969e452e969dee29 /x11/XFree86-4-libraries | |
| parent | Don't reference memory after free'ing it. This fixes a lockup and possible (diff) | |
Add a patch for Mesa's glheader.h to teach it about the Intel
compiler(s) (no __cdecl, INLINE means inline). Add a hunk to the
FreeBSD.cf patch to make always prepend -rpath with the -Wl, --
GCC understands it either way, but Intel's icc, for example,
does not -- and need not.
Approved by: enholt (maintainer)
Also reviewed by: netchild (icc guru)
Notes
Notes:
svn path=/head/; revision=93122
Diffstat (limited to 'x11/XFree86-4-libraries')
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-FreeBSD.cf | 13 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-glheader | 16 |
2 files changed, 27 insertions, 2 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-FreeBSD.cf b/x11/XFree86-4-libraries/files/patch-FreeBSD.cf index ca20f5373941..bc3f08d17a29 100644 --- a/x11/XFree86-4-libraries/files/patch-FreeBSD.cf +++ b/x11/XFree86-4-libraries/files/patch-FreeBSD.cf @@ -1,5 +1,5 @@ ---- config/cf/FreeBSD.cf.orig Tue Jan 14 18:52:12 2003 -+++ config/cf/FreeBSD.cf Sun Oct 12 16:14:27 2003 +--- config/cf/FreeBSD.cf Tue Jan 14 21:52:12 2003 ++++ config/cf/FreeBSD.cf Sun Nov 2 13:21:24 2003 @@ -162,11 +162,11 @@ * ld: warning: libXThrStub.so.6, needed by libX11.so, not found */ @@ -59,6 +59,15 @@ # define HasX86Support YES # define HasMMXSupport YES # define Has3DNowSupport YES +@@ -299,7 +308,7 @@ + + #ifndef SharedLibraryLoadFlags + #if UseElfFormat +-#define SharedLibraryLoadFlags -shared -rpath $(USRLIBDIRPATH) ++#define SharedLibraryLoadFlags -shared -Wl,-rpath$(USRLIBDIRPATH) + #else + #define SharedLibraryLoadFlags -Bshareable -R $(USRLIBDIRPATH) + #endif @@ -455,10 +464,8 @@ #ifdef i386Architecture #define ServerExtraDefines GccGasOption XFree86ServerDefines diff --git a/x11/XFree86-4-libraries/files/patch-glheader b/x11/XFree86-4-libraries/files/patch-glheader new file mode 100644 index 000000000000..f10ac02f2f17 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-glheader @@ -0,0 +1,16 @@ +--- extras/Mesa/src/glheader.h Wed Nov 6 12:19:39 2002 ++++ extras/Mesa/src/glheader.h Sun Nov 2 12:22:42 2003 +@@ -222,5 +222,5 @@ + */ + #ifndef _ASMAPI +-#if !defined( __GNUC__ ) && !defined( VMS ) ++#if !defined( __GNUC__ ) && !defined( VMS ) && !defined(__INTEL_COMPILER) + #define _ASMAPI __cdecl + #else +@@ -252,4 +252,6 @@ + #elif defined(__ICL) + # define INLINE __inline ++#elif defined(__INTEL_COMPILER) ++# define INLINE inline + #else + # define INLINE |