Move patch relative to FreeBSD.cf from patch-00 to patch-e.
Fix linker failures when libXThrStub.so.6 is not already installed. (PR ports/20386) PR: ports/20386 Submitted by: Peter Jeremy <peter.jeremy@ALCATEL.COM.AU>
This commit is contained in:
Jean-Marc Zucconi
parent
fd50c7d351
commit
0cba6cf607
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=31299
2 changed files with 71 additions and 61 deletions
|
|
@ -1,60 +1,3 @@
|
|||
diff -ur /usr/ports/x11/XFree86/work/xc/config/cf/FreeBSD.cf config/cf/FreeBSD.cf
|
||||
--- /usr/ports/x11/XFree86/work/xc/config/cf/FreeBSD.cf Sun Nov 8 11:19:10 1998
|
||||
+++ config/cf/FreeBSD.cf Tue Dec 8 10:10:06 1998
|
||||
diff -ur /usr/ports/x11/XFree86/work/xc/config/cf/Imake.cf config/cf/Imake.cf
|
||||
@@ -308,7 +308,12 @@
|
||||
# define AsmDefines AsmElfDefines
|
||||
#endif
|
||||
|
||||
+#ifdef i386Architecture
|
||||
#define ServerExtraDefines GccGasOption XFree86ServerDefines
|
||||
+#endif
|
||||
+#ifdef AlphaArchitecture
|
||||
+#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
|
||||
+#endif
|
||||
|
||||
#define StandardDefines -DCSRG_BASED
|
||||
|
||||
@@ -333,14 +338,14 @@
|
||||
/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
|
||||
#ifndef DefaultGcc2i386Opt
|
||||
#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
|
||||
-#define DefaultGcc2i386Opt -O2
|
||||
+#define DefaultGcc2i386Opt
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef i386Architecture
|
||||
# define OptimizedCDebugFlags DefaultGcc2i386Opt
|
||||
#else
|
||||
-# define OptimizedCDebugFlags -O2
|
||||
+# define OptimizedCDebugFlags
|
||||
#endif
|
||||
|
||||
#ifndef PreIncDir
|
||||
@@ -449,14 +454,18 @@
|
||||
#define DlLibrary /**/
|
||||
#endif
|
||||
|
||||
+#ifdef AlphaArchitecture
|
||||
+#define IoLibrary -lio
|
||||
+#else
|
||||
+#define IoLibrary /**/
|
||||
+#endif
|
||||
+
|
||||
#if BuildDynamicLoading
|
||||
-#define ServerExtraSysLibs DlLibrary
|
||||
+#define ServerExtraSysLibs DlLibrary IoLibrary
|
||||
#else
|
||||
-#define ServerExtraSysLibs /**/
|
||||
+#define ServerExtraSysLibs IoLibrary
|
||||
#endif
|
||||
|
||||
#include <bsdLib.rules>
|
||||
|
||||
-#ifdef i386Architecture
|
||||
#include <xfree86.cf>
|
||||
-#endif
|
||||
--- /usr/ports/x11/XFree86/work/xc/config/cf/Imake.cf Fri Nov 13 14:10:12 1998
|
||||
+++ config/cf/Imake.cf Tue Dec 8 10:05:49 1998
|
||||
@@ -160,6 +160,11 @@
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- config/cf/FreeBSD.cf-3.3.6 Sat Feb 12 06:36:11 2000
|
||||
+++ config/cf/FreeBSD.cf Tue Feb 15 00:25:54 2000
|
||||
--- config/cf/FreeBSD.cf.orig Fri Dec 3 10:35:04 1999
|
||||
+++ config/cf/FreeBSD.cf Fri Aug 4 04:06:42 2000
|
||||
@@ -69,7 +69,7 @@
|
||||
#define MkdirHierCmd mkdir -p
|
||||
|
||||
|
|
@ -9,5 +9,72 @@
|
|||
#define PreProcessCmd CppCmd
|
||||
#define StandardCppDefines -traditional
|
||||
#if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
|
||||
|
||||
|
||||
@@ -132,12 +132,12 @@
|
||||
* reason for FreeBSD to assume that it knows where X libraries are installed
|
||||
* and they can remove it from the list of directories they add to ld.so.cache
|
||||
* in their /etc/rc file.
|
||||
+ *
|
||||
+ * For the ELF case, we default to the ExtraLoadFlags in bsdLib.rules
|
||||
*/
|
||||
#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
|
||||
#ifndef ExtraLoadFlags
|
||||
-#if UseElfFormat
|
||||
-#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
|
||||
-#else
|
||||
+#if !UseElfFormat
|
||||
#define ExtraLoadFlags -Wl,-R,$(USRLIBDIRPATH)
|
||||
#endif
|
||||
#endif
|
||||
@@ -317,7 +317,12 @@
|
||||
# define AsmDefines AsmElfDefines
|
||||
#endif
|
||||
|
||||
+#ifdef i386Architecture
|
||||
#define ServerExtraDefines GccGasOption XFree86ServerDefines
|
||||
+#endif
|
||||
+#ifdef AlphaArchitecture
|
||||
+#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
|
||||
+#endif
|
||||
|
||||
#define StandardDefines -DCSRG_BASED
|
||||
|
||||
@@ -342,14 +347,14 @@
|
||||
/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
|
||||
#ifndef DefaultGcc2i386Opt
|
||||
#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
|
||||
-#define DefaultGcc2i386Opt -O2
|
||||
+#define DefaultGcc2i386Opt
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef i386Architecture
|
||||
# define OptimizedCDebugFlags DefaultGcc2i386Opt
|
||||
#else
|
||||
-# define OptimizedCDebugFlags -O2
|
||||
+# define OptimizedCDebugFlags
|
||||
#endif
|
||||
|
||||
#ifndef PreIncDir
|
||||
@@ -458,14 +463,18 @@
|
||||
#define DlLibrary /**/
|
||||
#endif
|
||||
|
||||
+#ifdef AlphaArchitecture
|
||||
+#define IoLibrary -lio
|
||||
+#else
|
||||
+#define IoLibrary /**/
|
||||
+#endif
|
||||
+
|
||||
#if BuildDynamicLoading
|
||||
-#define ServerExtraSysLibs DlLibrary
|
||||
+#define ServerExtraSysLibs DlLibrary IoLibrary
|
||||
#else
|
||||
-#define ServerExtraSysLibs /**/
|
||||
+#define ServerExtraSysLibs IoLibrary
|
||||
#endif
|
||||
|
||||
#include <bsdLib.rules>
|
||||
|
||||
-#ifdef i386Architecture
|
||||
#include <xfree86.cf>
|
||||
-#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue