Changeset 4

Timestamp:

12/10/07 00:02:45 (5 years ago)

Author:

jeremyhu@…

Message:

small updates and cleanup

Location:

trunk

Files:

• compile-all.sh (modified) (3 diffs)
• compile-xserver.sh (modified) (2 diffs)

trunk/compile-all.sh

@@ -6 +6 @@
 export ACLOCAL="aclocal -I /usr/X11/share/aclocal"
 
-export CFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe"
-export LDFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe"
+export CFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe -DNO_ALLOCA"
+export LDFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe -DNO_ALLOCA"
+
+# Parallel Make.  Change $MAKE if you don't have gmake installed
+MAKE="gmake"
+MAKE_OPTS="-j3"
 
 rootdir="$(pwd)"
@@ -21 +25 @@
         shift
         cd ${rootdir}/${d} || die "unable to find source for ${d}"
-        gmake distclean
+        ${MAKE} clean
         ./configure --prefix=/usr/X11 --mandir=/usr/X11/man --disable-dependency-tracking "${@}" || die "Configure of ${d} failed."
-        gmake -j5 || die "Compile of ${d} failed."
-        gmake install DESTDIR="${DESTDIR}" || die "Install of ${d} failed."
+        ${MAKE} ${MAKE_OPTS} || die "Compile of ${d} failed."
+        ${MAKE} install DESTDIR="${DESTDIR}" || die "Install of ${d} failed."
 }
 
-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
+# Protos
+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 ; do
+        doinst $d
+done
+
+# Apps, git versions from 2007.12.09
+for d in xauth xinit lndir xfs-1.0.5; do
         doinst $d
 done
@@ -33 +43 @@
 # Libs need x86_64 and ppc64
 CFLAGS="${CFLAGS} -arch x86_64 -arch ppc64"
+
 doinst pixman-0.9.6 --disable-static
 
-# This -D__DARWIN__ should be fixed in 1.1.4 - in git 2007-12-28
-OLD_CFLAGS=${CFLAGS}"
-CFLAGS="${CFLAGS} -D__DARWIN__"
+# libX11-1.1.3 has libX11-apple.patch applied - see git-diff 4b91ed099554626f1ec17d5bdf7bd77ce1a70037 b57129ef324c73ee91c2a796b800c4b45f4d4855
 doinst libX11-1.1.3 --disable-xf86bigfont --disable-xcb --disable-static
-CFLAGS="${OLD_CFLAGS}"

trunk/compile-xserver.sh

@@ -22 +22 @@
 MAKE_OPTS="-j3"
 
-export CFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe"
-export LDFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe"
+export CFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe -DNO_ALLOCA"
+export LDFLAGS="-Wall -O2 -arch i386 -arch ppc -pipe -DNO_ALLOCA"
 
 die() {
@@ -51 +51 @@
         dosign Xquartz-$1.bz2 
         dosign xorg-server-$1.tar.bz2
-#       ssh people.freedesktop.org mkdir w/x11-apple/releases/$1
-#       scp Xquartz-$1.bz2* xorg-server-$1.tar.bz2* people.freedesktop.org:w/x11-apple/releases/$1
 }