Changeset 4


Ignore:
Timestamp:
Dec 10, 2007 12:02:45 AM (7 years ago)
Author:
jeremyhu@…
Message:

small updates and cleanup

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/compile-all.sh

    r3 r4  
    66export ACLOCAL="aclocal -I /usr/X11/share/aclocal" 
    77 
    8 export CFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe" 
    9 export LDFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe" 
     8export CFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe -DNO_ALLOCA" 
     9export LDFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe -DNO_ALLOCA" 
     10 
     11# Parallel Make.  Change $MAKE if you don't have gmake installed 
     12MAKE="gmake" 
     13MAKE_OPTS="-j3" 
    1014 
    1115rootdir="$(pwd)" 
     
    2125        shift 
    2226        cd ${rootdir}/${d} || die "unable to find source for ${d}" 
    23         gmake distclean 
     27        ${MAKE} clean 
    2428        ./configure --prefix=/usr/X11 --mandir=/usr/X11/man --disable-dependency-tracking "${@}" || die "Configure of ${d} failed." 
    25         gmake -j5 || die "Compile of ${d} failed." 
    26         gmake install DESTDIR="${DESTDIR}" || die "Install of ${d} failed." 
     29        ${MAKE} ${MAKE_OPTS} || die "Compile of ${d} failed." 
     30        ${MAKE} install DESTDIR="${DESTDIR}" || die "Install of ${d} failed." 
    2731} 
    2832 
    29 for d in compositeproto-0.4 damageproto-1.1.0 glproto-1.4.9 inputproto-1.4.2.1 randrproto-1.2.1 renderproto-0.9.3 xfs-1.0.5 ; do 
     33# Protos 
     34for d in compositeproto-0.4 damageproto-1.1.0 glproto-1.4.9 inputproto-1.4.2.1 randrproto-1.2.1 renderproto-0.9.3 ; do 
     35        doinst $d 
     36done 
     37 
     38# Apps, git versions from 2007.12.09 
     39for d in xauth xinit lndir xfs-1.0.5; do 
    3040        doinst $d 
    3141done 
     
    3343# Libs need x86_64 and ppc64 
    3444CFLAGS="${CFLAGS} -arch x86_64 -arch ppc64" 
     45 
    3546doinst pixman-0.9.6 --disable-static 
    3647 
    37 # This -D__DARWIN__ should be fixed in 1.1.4 - in git 2007-12-28 
    38 OLD_CFLAGS=${CFLAGS}" 
    39 CFLAGS="${CFLAGS} -D__DARWIN__" 
     48# libX11-1.1.3 has libX11-apple.patch applied - see git-diff 4b91ed099554626f1ec17d5bdf7bd77ce1a70037 b57129ef324c73ee91c2a796b800c4b45f4d4855 
    4049doinst libX11-1.1.3 --disable-xf86bigfont --disable-xcb --disable-static 
    41 CFLAGS="${OLD_CFLAGS}" 
  • trunk/compile-xserver.sh

    r1 r4  
    2222MAKE_OPTS="-j3" 
    2323 
    24 export CFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe" 
    25 export LDFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe" 
     24export CFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe -DNO_ALLOCA" 
     25export LDFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe -DNO_ALLOCA" 
    2626 
    2727die() { 
     
    5151        dosign Xquartz-$1.bz2  
    5252        dosign xorg-server-$1.tar.bz2 
    53 #       ssh people.freedesktop.org mkdir w/x11-apple/releases/$1 
    54 #       scp Xquartz-$1.bz2* xorg-server-$1.tar.bz2* people.freedesktop.org:w/x11-apple/releases/$1 
    5553} 
    5654 
Note: See TracChangeset for help on using the changeset viewer.