[Xorg-commit] xc/config/cf Imake.cf,1.1.4.3,1.1.4.4 Imake.tmpl,1.1.4.3,1.1.4.4 ibm.cf,1.1,1.1.4.1 ibmLib.rules,1.1.4.1,1.1.4.2 ibmLib.tmpl,1.1.4.2,1.1.4.3
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Mon Dec 15 18:00:11 EET 2003
Committed by: kaleb
Update of /cvs/xorg/xc/config/cf
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/config/cf
Modified Files:
Tag: XORG-CURRENT
Imake.cf Imake.tmpl ibm.cf ibmLib.rules ibmLib.tmpl
Log Message:
bring AIX config into the 21st Century
Index: Imake.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imake.cf,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- Imake.cf 6 Dec 2003 13:22:41 -0000 1.1.4.3
+++ Imake.cf 15 Dec 2003 16:00:01 -0000 1.1.4.4
@@ -492,7 +492,11 @@
# endif
# ifdef _IBMR2
# undef _IBMR2
-# define RsArchitecture
+# if (DefaultOSMajorVersion < 5)
+# define RsArchitecture
+# else
+# define PpcArchitecture
+# endif
# endif
#endif /* ibm */
Index: Imake.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imake.tmpl,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- Imake.tmpl 30 Nov 2003 16:46:49 -0000 1.1.4.3
+++ Imake.tmpl 15 Dec 2003 16:00:01 -0000 1.1.4.4
@@ -503,6 +503,8 @@
#define ByteOrder X_BIG_ENDIAN
#elif defined(Arm32Architecture)
#define ByteOrder X_LITTLE_ENDIAN
+#elif defined(RsArchitecture)
+#define ByteOrder X_BIG_ENDIAN
#elif defined(PpcArchitecture)
#define ByteOrder X_BIG_ENDIAN
#elif defined(HPArchitecture)
Index: ibm.cf
===================================================================
RCS file: /cvs/xorg/xc/config/cf/ibm.cf,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- ibm.cf 14 Nov 2003 15:54:29 -0000 1.1
+++ ibm.cf 15 Dec 2003 16:00:01 -0000 1.1.4.1
@@ -20,6 +20,10 @@
#endif
XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion.OSTeenyVersion)
+#if (OSMajorVersion > 4)
+# define HasSnprintf YES
+# define HasStrcasecmp YES
+#endif
#if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 2)
#define HasBSD44Sockets YES
#define HasPutenv YES
@@ -107,7 +111,11 @@
#define CppNoLineInfoOption -P
#if OSMajorVersion > 3
+#if OSMajorVersion > 4
+#define StandardDefines -DSYSV -DAIXV3 -DAIXV4 -DAIXV5 -D_ALL_SOURCE
+#else
#define StandardDefines -DSYSV -DAIXV3 -DAIXV4 -D_ALL_SOURCE
+#endif
#define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
#define ServerExtraDefines -D_IBM_LFT
#if ThreadedX
Index: ibmLib.rules
===================================================================
RCS file: /cvs/xorg/xc/config/cf/ibmLib.rules,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- ibmLib.rules 17 Nov 2003 19:03:18 -0000 1.1.4.1
+++ ibmLib.rules 15 Dec 2003 16:00:01 -0000 1.1.4.2
@@ -4,8 +4,6 @@
* AIX shared library rules
*/
-XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.6 2001/01/17 16:22:31 dawes Exp $
-
#ifndef HasSharedLibraries
# define HasSharedLibraries YES
#endif
@@ -18,8 +16,12 @@
#ifndef SharedCodeDef
# define SharedCodeDef -DSHAREDCODE
#endif
-#ifndef SharedLibraryDef
-# define SharedLibraryDef -DAIXSHLIB
+#if OSMajorVersion < 5
+# ifndef SharedLibraryDef
+# define SharedLibraryDef -DAIXSHLIB
+# endif
+#else
+# define SharedLibraryDef /**/
#endif
#ifndef ShLibIncludeFile
# define ShLibIncludeFile <ibmLib.tmpl>
@@ -32,9 +34,9 @@
#endif
#if !defined(LdPostLib) && !defined(UseInstalled) && OSMajorVersion > 3
# if ThreadedX
-# define LdPostLib -blibpath:$(USRLIBDIRPATH):/usr/lib/threads:/usr/lib:/lib
+# define LdPostLib -bnoipath -blibpath:$(USRLIBDIRPATH):/usr/lib/threads:/usr/lib:/lib
# else
-# define LdPostLib -blibpath:$(USRLIBDIRPATH):/usr/lib:/lib
+# define LdPostLib -bnoipath -blibpath:$(USRLIBDIRPATH):/usr/lib:/lib
# endif
# define SharedLibPostRef $(LDPOSTLIBS)
#endif
@@ -80,51 +82,68 @@
&& !defined(UseImports) && !defined(ImportX11)
/* we want this to be defined only when building X */
-# if OSMajorVersion < 4
+# if OSMajorVersion < 5
+# if OSMajorVersion < 4
/*
* SharedLibReferences - variables for shared libraries
*/
+# ifndef SharedLibReferences
+# define SharedLibReferences(varname,libname,libsource,revname,rev) @@\
+Concat3(DEP,varname,LIB) = /**/ @@\
+Concat(varname,LIB) = _Use(Concat(-l,libname),Concat(libsource/lib,libname.a)) @@\
+LintLibReferences(varname,libname,libsource)
+# endif
+
+# else /* OSMajorVersion < 4 */
+
+# ifndef SharedLibReferences
+# define SharedLibReferences(varname,libname,libsource,revname,rev) @@\
+Concat3(DEP,varname,LIB) = /**/ @@\
+Concat(varname,LIB) = _Use(Concat(-l,libname),Concat($(BUILDLIBDIR),/libname.imp) Concat3($(BUILDLIBDIR),/lib,libname.a)) @@\
+LintLibReferences(varname,libname,libsource)
+# endif
+
+# endif
+# else /* OSMajorVersion < 5 */
+
# ifndef SharedLibReferences
# define SharedLibReferences(varname,libname,libsource,revname,rev) @@\
Concat3(DEP,varname,LIB) = /**/ @@\
-Concat(varname,LIB) = _Use(Concat(-l,libname),Concat(libsource/lib,libname.a)) @@\
+Concat(varname,LIB) = _Use(Concat(-l,libname), Concat3($(BUILDLIBDIR),/lib,libname.so)) @@\
LintLibReferences(varname,libname,libsource)
# endif
# endif
-# if OSMajorVersion < 4
+# if OSMajorVersion < 5
+# if OSMajorVersion < 4
/*
* SharedFontLibReferences - shared font libraries
*/
-# ifndef SharedLibReferences
-# define SharedLibReferences() @@\
+# ifndef SharedFontLibReferences
+# define SharedFontLibReferences() @@\
DEPFONTLIB = /**/ @@\
FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(FONTLIBSRC)/libXfont.a) @@\
LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
+# endif
+# else
+# ifndef SharedFontLibReferences
+# define SharedFontLibReferences() @@\
+DEPFONTLIB = /**/ @@\
+FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI)/libXfont.a)) @@\
+LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
+# endif
# endif
-
-# else
-
+# else /* OSMajorVersion < 5 */
# ifndef SharedFontLibReferences
# define SharedFontLibReferences() @@\
DEPFONTLIB = /**/ @@\
-FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI
-)/libXfont.a)) @@\
+FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDI)/libXfont.so)) @@\
LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
# endif
-# else
-
-# ifndef SharedLibReferences
-# define SharedLibReferences(varname,libname,libsource,revname,rev) @@\
-Concat3(DEP,varname,LIB) = /**/ @@\
-Concat(varname,LIB) = _Use(Concat(-l,libname),Concat($(BUILDLIBDIR),/libname.imp) Concat3($(BUILDLIBDIR),/lib,libname.a)) @@\
-LintLibReferences(varname,libname,libsource)
-# endif
-
# endif
/*
@@ -173,10 +192,11 @@
* IBM uses an unusual shared object file name (shr4.o) in some libraries.
* Duplicate this behavior to preserve compatibility with IBM's libraries.
*/
-#if OSMajorVersion < 4
+#if OSMajorVersion < 5
+# if OSMajorVersion < 4
-# ifndef SharedLibraryTarget
-# define SharedLibraryTarget(libname,rev,solist,down,up) @@\
+# ifndef SharedLibraryTarget
+# define SharedLibraryTarget(libname,rev,solist,down,up) @@\
AllTarget(Concat(lib,libname.a)) @@\
@@\
Concat(lib,libname.a): solist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS) @@\
@@ -194,12 +214,12 @@
@@\
clean:: @@\
$(RM) Concat(lib,libname.a)
-# endif /* SharedLibraryTarget */
+# endif /* SharedLibraryTarget */
-#else /* OSMajorVersion >= 4 */
+# else /* OSMajorVersion < 4 */
-# ifndef SharedLibraryTarget
-# define SharedLibraryTarget(libname,rev,solist,down,up) @@\
+# ifndef SharedLibraryTarget
+# define SharedLibraryTarget(libname,rev,solist,down,up) @@\
AllTarget(Concat(lib,libname.a)) @@\
@@\
Concat(lib,libname.a): solist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS) @@\
@@ -218,23 +238,42 @@
@@\
clean:: @@\
$(RM) Concat(lib,libname.a)
-# endif /* SharedLibraryTarget */
+# endif /* SharedLibraryTarget */
+# endif /* OSMajorVersion < 4 */
+#else /* OSMajorVersion < 5 */
+# ifndef SharedLibraryTarget
+# define SharedLibraryTarget(libname,rev,solist,down,up) @@\
+AllTarget(Concat(lib,libname.so)) @@\
+ @@\
+Concat(lib,libname.so): solist $(EXTRALIBRARYDEPS) @@\
+ $(RM) $@~ @@\
+ $(AR) $*.a solist @@\
+ dump -g $*.a | sed -n -e 's/^[ ]*[0-9][0-9]*[[:space:]]*\([_[:alpha:]][[:alnum:]]*\)/\1/p' | egrep -v \\\. | sort | uniq > $*.syms @@\
+ $(LD) -bnoipath -bnoentry -bM\:SRE -bE\:$*.syms -o $@~ solist $(REQUIREDLIBS) BaseShLibReqs -lc @@\
+ $(RM) $@ $*.a $*.syms @@\
+ $(MV) $@~ $@ @@\
+ LinkBuildLibrary($@) @@\
+ @@\
+clean:: @@\
+ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-#endif
+# endif /* SharedLibraryTarget */
+#endif /* OSMajorVersion < 5 */
/*
* SharedDepLibraryTarget - generate rules to create a shared library.
*/
-#if OSMajorVersion < 4
+#if OSMajorVersion < 5
+# if OSMajorVersion < 4
-# ifndef SharedDepLibraryTarget
-# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
+# ifndef SharedDepLibraryTarget
+# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
AllTarget(Concat(lib,libname.a)) @@\
@@\
Concat(lib,libname.a): deplist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS) @@\
$(RM) $@~ shr.o shr4.o @@\
(cd down; $(AR) up/$@~ solist) @@\
- dump -g $@~ | sed -n -e 's/^[ ]*[0-9][0-9]*[ ]*\([^ .][^ ]*\)$$/\1/p' > $@.syms @@\
+ dump -g $@~ | sed -n -e 's/^[ ]*[0-9][0-9]*[ ]*\([^ .][^ ]*\)$$/\1/p' > $@.syms @@\
$(LD) -o shr.o $@~ -H512 -T512 -bM\:SRE -bE\:$@.syms $(REQUIREDLIBS) BaseShLibReqs SharedLibPostRef @@\
$(LN) shr.o shr4.o @@\
$(RM) $@~ @@\
@@ -246,12 +285,12 @@
@@\
clean:: @@\
$(RM) Concat(lib,libname.a)
-# endif /* SharedDepLibraryTarget */
+# endif /* SharedDepLibraryTarget */
-#else /* OSMajorVersion >= 4 */
+# else /* OSMajorVersion < 4 */
-# ifndef SharedDepLibraryTarget
-# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
+# ifndef SharedDepLibraryTarget
+# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
AllTarget(Concat(lib,libname.a)) @@\
@@\
Concat(lib,libname.a): deplist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS) @@\
@@ -270,9 +309,28 @@
@@\
clean:: @@\
$(RM) Concat(lib,libname.a)
-# endif /* SharedDepLibraryTarget */
+# endif /* SharedDepLibraryTarget */
-#endif
+# endif /* OSMajorVersion < 4 */
+#else /* OSMajorVersion < 5 */
+# ifndef SharedDepLibraryTarget
+# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
+AllTarget(Concat(lib,libname.so)) @@\
+ @@\
+Concat(lib,libname.so): deplist $(EXTRALIBRARYDEPS) @@\
+ $(RM) $@~ @@\
+ $(AR) $*.a solist @@\
+ dump -g $*.a | sed -n -e 's/^[ ]*[0-9][0-9]*[[:space:]]*\([_[:alpha:]][[:alnum:]]*\)/\1/p' | egrep -v \\\. | sort | uniq > $*.syms @@\
+ $(LD) -bnoipath -bnoentry -bsymbolic -bM\:SRE -bE\:$*.syms -o $@~ solist $(REQUIREDLIBS) BaseShLibReqs -lc @@\
+ $(RM) $@ $*.a $*.syms @@\
+ $(MV) $@~ $@ @@\
+ LinkBuildLibrary($@) @@\
+ @@\
+clean:: @@\
+ $(RM) Concat(lib,libname.so) Concat(lib,libname.so)
+
+# endif /* SharedDepLibraryTarget */
+#endif /* OSMajorVersion < 5 */
/*
* SharedLibraryDataTarget - generate rules to create shlib data file;
Index: ibmLib.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/ibmLib.tmpl,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- ibmLib.tmpl 26 Nov 2003 22:48:15 -0000 1.1.4.2
+++ ibmLib.tmpl 15 Dec 2003 16:00:01 -0000 1.1.4.3
@@ -31,9 +31,11 @@
#define SharedXextReqs $(XONLYLIB)
#define SharedXmuReqs $(XTOOLLIB) $(XLIB)
-#define SharedOldXReqs $(XONLYLIB)
-#define SharedXtReqs $(XONLYLIB) $(SMLIB) $(ICELIB) SharedThreadReqs
-#define SharedXawReqs $(XMULIB) $(XTOOLLIB) $(XLIB)
+#define SharedXmuuReqs $(XLIBONLY)
+#define SharedOldXReqs $(XLIBONLY)
+#define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs
+#define SharedXawReqs $(XMULIB) $(XTOOLLIB) $(XLIB) $(XPMLIB)
+#define SharedXaw6Reqs $(XMULIB) $(XTOOLLIB) $(XLIB)
#define SharedXiReqs $(XLIB)
#define SharedXtstReqs $(XLIB)
#define SharedPexReqs $(XONLYLIB)
@@ -41,6 +43,16 @@
#define SharedSMReqs $(ICELIB)
#define SharedXpReqs $(XLIB)
#define SharedXpmReqs $(XLIB)
+#define SharedDPSReqs $(XTOOLLIB) $(XLIB)
+#define SharedDPSTKReqs $(DPSLIB) $(XTOOLLIB) $(XLIB)
+#define SharedXrenderReqs $(XLIB)
+#define SharedXrandrReqs $(XRENDERLIB) $(XLIB)
+#define SharedXcursorReqs $(XRENDERLIB) $(XLIB)
+#define SharedxkbfileReqs $(XLIBONLY)
+#define SharedxkbuiReqs $(XLIBONLY) $(XKBFILELIB)
+#define SharedFontencReqs $(BUILDLIBDIR)/libz.a
+#define SharedXfontcacheReqs $(XLIB)
+#define SharedXfontReqs stubs/libfntstubs.a $(FREETYPE2LIB)
#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs
#define SharedXmReqs $(LDPRELIBS) SharedXReqs
More information about the xorg-commit
mailing list