aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormi <mi@FreeBSD.org>2003-11-05 13:29:28 +0800
committermi <mi@FreeBSD.org>2003-11-05 13:29:28 +0800
commitfbb3c3bd99e6a19f73b284b4ddd218a8f80fb07e (patch)
treef530e38ed8c1b9df9458dec192c488dfac7d8e1b
parent44f85cb214036eb071d16f8d50d10e5dfd4d8a0e (diff)
downloadfreebsd-ports-gnome-fbb3c3bd99e6a19f73b284b4ddd218a8f80fb07e.tar.gz
freebsd-ports-gnome-fbb3c3bd99e6a19f73b284b4ddd218a8f80fb07e.tar.zst
freebsd-ports-gnome-fbb3c3bd99e6a19f73b284b4ddd218a8f80fb07e.zip
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)
-rw-r--r--x11/XFree86-4-libraries/files/patch-FreeBSD.cf13
-rw-r--r--x11/XFree86-4-libraries/files/patch-glheader16
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