source: scripts/untested/blfs-patches/mas-cvs-add_amd64.patch@ def3913

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since def3913 was 617118d, checked in by Jim Gifford <clfs@…>, 19 years ago

r561@server (orig r559): root | 2005-06-05 02:38:49 -0700
Fixed Directory Structure
  • Property mode set to 100644
File size: 6.0 KB

  • clients/util/mas-config.cpp 

    diff -ur mas-cvs-20050207/clients/util/mas-config.cpp mas-cvs-mod/clients/util/mas-config.cpp
    old new  
    1 #!/bin/sh
     1XCOMM!/bin/sh
    22
    3 #
    4 # mas-config.cpp - builds "mas-config" that can echo libraries,
    5 #                  includes, and defines ala gtk's gtk-config.
    6 #
     3XCOMM
     4XCOMM mas-config.cpp - builds "mas-config" that can echo libraries,
     5XCOMM                  includes, and defines ala gtk's gtk-config.
     6XCOMM
    77
    88show_usage()
    99{

  • clients/util/mas-launch.cpp 

    diff -ur mas-cvs-20050207/clients/util/mas-launch.cpp mas-cvs-mod/clients/util/mas-launch.cpp
    old new  
    1 #!/bin/bash
     1XCOMM!/bin/bash
    22
    3 # kill esound if it's running -- we can't coexist.
     3XCOMM kill esound if it's running -- we can't coexist.
    44pkill esd
    55
    66if [[ $1 == "-t" ]];

  • common/mas_endian.h 

    diff -ur mas-cvs-20050207/common/mas_endian.h mas-cvs-mod/common/mas_endian.h
    old new  
    137137#if (!defined(MAS_BIG_ENDIAN) && !defined(MAS_LITTLE_ENDIAN))
    138138
    139139#if     defined(__i386__) || defined(__ia64__) || defined(WIN32) || \
     140        defined(__amd64__) || defined(__x86_64__) || \
     141        defined(amd64__) || defined(x86_64__) || \
    140142        (defined(__alpha__) || defined(__alpha)) || \
    141143        defined(__arm__) || \
    142144        (defined(__mips__) && defined(__MIPSEL__)) || \

  • config/Imake.cf 

    diff -ur mas-cvs-20050207/config/Imake.cf mas-cvs-mod/config/Imake.cf
    old new  
    401401# ifdef i386
    402402#  define i386Architecture
    403403#  undef i386
     404# endif
    404405# ifdef __i386__
    405406#  ifndef i386Architecture
    406407#   define i386Architecture
    407408#  endif
    408409#  undef __i386__
    409410# endif /* i386 */
     411# ifdef __x86_64__
     412#  undef __x86_64__
     413#  define AMD64Architecture
     414# endif /* x86_64 */
    410415# ifdef __alpha
    411416#  define AlphaArchitecture
    412417#  undef __alpha
    413418# endif /* __alpha */
    414 #endif
    415419#endif /* linux */
    416420
    417421#ifdef __uxp__

  • config/Imake.tmpl 

    diff -ur mas-cvs-20050207/config/Imake.tmpl mas-cvs-mod/config/Imake.tmpl
    old new  
    337337# define ExportDefines
    338338#endif
    339339
     340#ifndef LibDirName
     341# define LibDirName lib
     342#endif
     343
    340344#ifndef UsrLibDir
    341345#ifdef ProjectRoot
    342 #define UsrLibDir Concat(ProjectRoot,/lib)
     346#define UsrLibDir Concat(ProjectRoot,/LibDirName)
    343347#ifndef AlternateUsrLibDir
    344348#define AlternateUsrLibDir YES
    345349#endif
    346350#else
    347 #define UsrLibDir /usr/lib
     351#define UsrLibDir Concat(/usr,/LibDirName)
    348352#ifndef AlternateUsrLibDir
    349353#define AlternateUsrLibDir NO
    350354#endif
    … …  
    597601#define GzipCmd gzip
    598602#endif
    599603#ifndef CppCmd
    600 #define CppCmd /lib/cpp
     604#define CppCmd /LibDirName/cpp
    601605#endif
    602606#ifndef CppNoLineInfoOption
    603607#define CppNoLineInfoOption /**/

  • config/linux.cf 

    diff -ur mas-cvs-20050207/config/linux.cf mas-cvs-mod/config/linux.cf
    old new  
    195195#endif
    196196#endif /* i386Architecture */
    197197
     198#ifdef AMD64Architecture
     199#define OptimizedCDebugFlags    DefaultGcc2AMD64Opt
     200#define LinuxMachineDefines     -D__x86_64__
     201#define ServerOSDefines         XFree86ServerOSDefines -DDDXTIME
     202#define ServerExtraDefines      -DGCCUSESGAS XFree86ServerDefines
     203#if UseElfFormat
     204#define HasPlugin               YES
     205#define VendorHasX11R6_3libXext YES     /* XC or XFree86 3.3.1 */
     206#endif
     207#endif /* AMD64Architecture */
     208
    198209#ifdef AlphaArchitecture
    199210#define OptimizedCDebugFlags    -O2
    200211#define LinuxMachineDefines     -D__alpha__
    … …  
    210221#define ServerExtraDefines      -DGCCUSESGAS XFree86ServerDefines
    211222#endif /* Mc68020Architecture */
    212223
     224#ifndef HaveLib64
     225# if defined (AMD64Architecture)
     226#  define HaveLib64     YES
     227# else
     228#  define HaveLib64     NO
     229# endif
     230#endif
     231
     232#if HaveLib64
     233# ifndef LibDirName
     234#  define LibDirName            lib64
     235# endif
     236#endif
     237
    213238#define StandardDefines         -Dlinux LinuxMachineDefines LinuxSourceDefines
    214239
    215240#define ConnectionFlags         -DUNIXCONN -DTCPCONN

  • config/mas.tmpl 

    diff -ur mas-cvs-20050207/config/mas.tmpl mas-cvs-mod/config/mas.tmpl
    old new  
    5757MAS_ENDIANNESS = MAS_LITTLE_ENDIAN
    5858#define MAS_WE_ARE_LITTLE_ENDIAN
    5959
     60#elif defined(AMD64Architecture)
     61MAS_ENDIANNESS = MAS_LITTLE_ENDIAN
     62#define MAS_WE_ARE_LITTLE_ENDIAN
     63
    6064#elif defined(ia64Architecture)
    6165MAS_ENDIANNESS = MAS_LITTLE_ENDIAN
    6266#define MAS_WE_ARE_LITTLE_ENDIAN

  • config/xfree86.cf 

    diff -ur mas-cvs-20050207/config/xfree86.cf mas-cvs-mod/config/xfree86.cf
    old new  
    586586#endif
    587587#endif
    588588
     589#if HasGcc2 && defined(AMD64Architecture)
     590# ifndef DefaultGcc2AMD64Opt
     591#  define DefaultGcc2AMD64Opt -O3 -fno-strength-reduce
     592# endif
     593#endif
     594
    589595#ifndef BuildLBXCompatible
    590596#define BuildLBXCompatible NO
    591597#endif

  • devices/visual/Imakefile 

    diff -ur mas-cvs-20050207/devices/visual/Imakefile mas-cvs-mod/devices/visual/Imakefile
    old new  
    1212XCOMM ################ Architecture dependent ###########################
    1313
    1414#ifdef LinuxArchitecture
    15 ARCHREQUIREDLIBS = -L/usr/X11R6/lib
     15ARCHREQUIREDLIBS = -L/usr/X11R6/LibDirName
    1616#endif
    1717
    1818#ifdef SunArchitecture
    … …  
    3434 LOCAL_LIBRARIES =
    3535   SYS_LIBRARIES =
    3636         DEPLIBS =
    37     REQUIREDLIBS = $(ARCHREQUIREDLIBS) -L/usr/local/lib -lX11 -lXext -lsrfftw -lsfftw -lm
     37    REQUIREDLIBS = $(ARCHREQUIREDLIBS) -L/usr/local/LibDirName -lX11 -lXext -lsrfftw -lsfftw -lm
    3838
    3939#include <Library.tmpl>
    4040
Note: See TracBrowser for help on using the repository browser.