Date: Tue, 20 Feb 2007 05:30:13 GMT From: Eygene Ryabinkin <rea-fbsd@codelabs.ru> To: freebsd-x11@FreeBSD.org Subject: Re: ports/109091: make Xorg from x11-servers/xorg-server port to work on 7-CURRENT Message-ID: <200702200530.l1K5UDcw004629@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/109091; it has been noted by GNATS. From: Eygene Ryabinkin <rea-fbsd@codelabs.ru> To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/109091: make Xorg from x11-servers/xorg-server port to work on 7-CURRENT Date: Tue, 20 Feb 2007 08:21:38 +0300 Mon, Feb 19, 2007 at 10:58:56AM +0300, Eygene Ryabinkin wrote: > > OK, I was in rush and made a mistake. Attaching the proper patch > to the files/patch-FreeBSD.cf I was in a rush again. Here is the correct version of my patch to files/patch-FreeBSD.cf that will enable the patched patch to find the file to patch ;)) --- patch-patch-FreeBSD.cf begins here --- --- patch-FreeBSD.cf.orig Mon Feb 19 10:46:16 2007 +++ patch-FreeBSD.cf Mon Feb 19 10:45:52 2007 @@ -1,5 +1,5 @@ ---- config/cf/FreeBSD.cf.orig Sun Aug 15 10:03:36 2004 -+++ config/cf/FreeBSD.cf Sun Feb 6 03:56:59 2005 +--- config/cf/FreeBSD.cf.orig Wed May 4 08:14:57 2005 ++++ config/cf/FreeBSD.cf Mon Feb 19 10:39:59 2007 @@ -78,6 +78,7 @@ #define HasIssetugid YES #define HasPoll YES @@ -59,9 +59,9 @@ # else # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) # endif -@@ -442,7 +444,9 @@ - #define AsVISOption -Av9a - #define AsOutputArchSize 64 +@@ -446,7 +448,9 @@ + #ifdef PpcArchitecture + #define XF86INT10_BUILD X86INT10_STUB #endif - +#ifdef PpcArchitecture @@ -70,7 +70,7 @@ #define StandardDefines -DCSRG_BASED #if OSMajorVersion > 1 -@@ -463,18 +467,8 @@ +@@ -467,18 +471,8 @@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif @@ -91,3 +91,18 @@ #ifndef PreIncDir # define PreIncDir /usr/include +@@ -576,6 +570,14 @@ + #if (GccMajorVersion == 2 && GccMinorVersion == 95) + #define GccOptBug295 + #endif ++ ++/* ++ * Add --export-dynamic flag for FreeBSD 7.x and later. ++ */ ++#if OSMajorVersion >= 7 ++#define ExtraLoadOptions -Wl,--export-dynamic ++#endif ++ + + #include <bsdLib.rules> + --- patch-patch-FreeBSD.cf ends here --- -- Eygene
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702200530.l1K5UDcw004629>