732d94d25f
they should be configured with --prefix=/usr and we then need to use make DESTDIR=$(STAGING_DIR) install to get things installed into the staging directory. The current situation for many packages, which use --prefix=$(STAGING_DIR) results in the staging_dir paths getting compiled into the binary itself. This also adds in a pile of libtool fixups. Between broken pkgconfig, broken libtool handling, and broken --prefix settings, its a wonder things have worked as well as they have up till now. -Erik
163 lines
4.8 KiB
Diff
163 lines
4.8 KiB
Diff
--- xc/config/cf/host.def~ Thu May 12 15:28:01 MDT 2005
|
|
+++ xc/config/cf/host.def Thu May 12 15:28:01 MDT 2005
|
|
@@ -0,0 +1,45 @@
|
|
+#define KDriveXServer YES
|
|
+#define TinyXServer YES
|
|
+#define XfbdevServer YES
|
|
+#define CrossCompiling YES
|
|
+#define ProjectRoot /usr/X11R6
|
|
+#define NothingOutsideProjectRoot YES
|
|
+
|
|
+#define HasFreetype2 YES
|
|
+#define Freetype2Dir REPLACE_STAGING_DIR
|
|
+#define HasFontconfig YES
|
|
+#define FontconfigDir REPLACE_STAGING_DIR
|
|
+#define HasLibpng YES
|
|
+#define HasZlib YES
|
|
+#define HaveLib64 NO
|
|
+#define LibDirName lib
|
|
+#define SystemUsrLibDir /usr/lib
|
|
+#define TkLibDir /usr/lib
|
|
+
|
|
+#define HasExpat YES
|
|
+#define ExpatDir REPLACE_STAGING_DIR
|
|
+#define XprtServer NO
|
|
+#define BuildXprintClients NO
|
|
+#define TouchScreen NO
|
|
+#define HasTsLib NO
|
|
+#define BuildDocs NO
|
|
+#define BuildXF86DRI NO
|
|
+#define BuildGlxExt NO
|
|
+#define BuildOSMesaLib NO
|
|
+#define BuildLBX NO
|
|
+#define BuildLowMem NO
|
|
+#define BuildIPv6 NO
|
|
+#define HasPam NO
|
|
+#define HasPamMisc NO
|
|
+#define BuildXterm NO
|
|
+#define BuildXFree86ConfigTools NO
|
|
+/*
|
|
+#define XF86CardDrivers mga glint nv tga s3virge sis rendition \
|
|
+ neomagic i740 tdfx savage \
|
|
+ cirrus vmware tseng trident chips apm \
|
|
+ GlideDriver fbdev i128 \
|
|
+ ati AgpGartDrivers DevelDrivers ark \
|
|
+ cyrix siliconmotion vesa vga \
|
|
+ XF86OSCardDrivers XF86ExtraCardDrivers
|
|
+*/
|
|
+
|
|
+#define XInputDrivers mouse keyboard
|
|
--- xc/config/cf/cross.def~ Thu May 12 15:28:01 MDT 2005
|
|
+++ xc/config/cf/cross.def Thu May 12 15:28:01 MDT 2005
|
|
@@ -1,45 +1,63 @@
|
|
-/* $XFree86: xc/config/cf/cross.def,v 1.1 2000/12/08 22:09:34 keithp Exp $ */
|
|
+/* $XFree86: xc/config/cf/cross.def,v 1.2 2001/03/30 02:15:17 keithp Exp $ */
|
|
/*
|
|
* This file contains redefinitions of some symbols to enable
|
|
* cross compilation: e.g. paths for include files and paths to
|
|
* compiler images. It will have to be edited to reflect these
|
|
* given your local configuration.
|
|
*/
|
|
-#if 0
|
|
+/* Undefine any architectures detected */
|
|
#undef i386Architecture
|
|
-#define Arm32Architecture
|
|
+#undef AMD64Architecture
|
|
+#undef PpcArchitecture
|
|
+#undef SparcArchitecture
|
|
+#undef AlphaArchitecture
|
|
+#undef Arm32Architecture
|
|
+#undef ia64Architecture
|
|
+#undef MipsArchitecture
|
|
+
|
|
+/* Cross compiling for: */
|
|
+#define REPLACE_XORG_ARCHArchitecture
|
|
+
|
|
+/* MTRR detection in linux.cf is exec'ed before cross.def, so redo it here */
|
|
+#undef HasMTRRSupport
|
|
+#if defined (i386Architecture) || defined (AMD64Architecture)
|
|
+# define HasMTRRSupport YES
|
|
+#else
|
|
+# define HasMTRRSupport NO /* no for non-ix86 */
|
|
+#endif
|
|
|
|
#undef OptimizedCDebugFlags
|
|
-#define OptimizedCDebugFlags -O2
|
|
-#define ServerCDebugFlags -O2
|
|
+#define OptimizedCDebugFlags -Os
|
|
+#define ServerCDebugFlags -Os
|
|
#undef StandardDefines
|
|
-#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE \
|
|
+#define StandardDefines -Dlinux -D__REPLACE_ARCH__ -D_POSIX_SOURCE \
|
|
-D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
|
|
#undef CcCmd
|
|
-#define StdIncDir /skiff/local/arm-linux/include
|
|
-#define PreIncDir
|
|
+#define StdIncDir REPLACE_STAGING_DIR/include
|
|
+#define PreIncDir
|
|
#undef PostIncDir
|
|
-#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include
|
|
-#define CcCmd /skiff/local/bin/arm-linux-gcc
|
|
+#define PostIncDir REPLACE_GCCINC_DIR
|
|
+#define CcCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-gcc
|
|
#undef CplusplusCmd
|
|
-#define HasCplusplus YES
|
|
-#define CplusplusCmd /skiff/local/bin/arm-linux-g++
|
|
+#define HasCplusplus NO
|
|
+#define CplusplusCmd NO
|
|
#define DoRanlibCmd YES
|
|
-#define RanlibCmd /skiff/local/bin/arm-linux-ranlib
|
|
+#define RanlibCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ranlib
|
|
#undef ExtraLoadFlags
|
|
#define ExtraLoadFlags
|
|
#define FbNoPixelAddrCode
|
|
#undef TermcapLibrary
|
|
-#define TermcapLibrary -ltermcap
|
|
+#define TermcapLibrary -lncurses
|
|
|
|
#undef LdPostLib
|
|
-#define LdPostLib -L/skiff/local/arm-linux/lib
|
|
+#define LdPostLib -LREPLACE_STAGING_DIR/REPLACE_ARCH-linux-uclibc/lib
|
|
+#undef LdCmd
|
|
+#define LdCmd REPLACE_STAGING_DIR/bin/REPLACE_ARCH-linux-ld
|
|
|
|
#undef ExtensionOSDefines
|
|
#define ExtensionOSDefines
|
|
|
|
#define ServerXdmcpDefines /**/
|
|
|
|
#define HostCcCmd cc
|
|
-#endif
|
|
#include <cross.rules>
|
|
--- xc/include/Xfuncs.h.orig 2006-07-07 17:09:16.000000000 -0600
|
|
+++ xc/include/Xfuncs.h 2006-07-07 17:11:33.000000000 -0600
|
|
@@ -44,18 +44,28 @@
|
|
#if defined(SYSV) && !defined(SCO325) && !defined(sun)
|
|
#include <memory.h>
|
|
void bcopy();
|
|
+#ifndef bzero
|
|
#define bzero(b,len) memset(b, 0, len)
|
|
+#endif
|
|
+#ifndef bcmp
|
|
#define bcmp(b1,b2,len) memcmp(b1, b2, len)
|
|
+#endif
|
|
#else
|
|
#include <string.h>
|
|
#if defined(SCO325) || defined(sun)
|
|
#include <strings.h>
|
|
#endif
|
|
#define _XFUNCS_H_INCLUDED_STRING_H
|
|
+#ifndef bcopy
|
|
#define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
|
|
+#endif
|
|
+#ifndef bzero
|
|
#define bzero(b,len) memset(b, 0, (size_t)(len))
|
|
+#endif
|
|
+#ifndef bcmp
|
|
#define bcmp(b1,b2,len) memcmp(b1, b2, (size_t)(len))
|
|
#endif
|
|
+#endif
|
|
#endif /* X_USEBFUNCS */
|
|
|
|
/* the new Xfuncs.h */
|