[PHP-DEV] Patches for buildconf and build/buildcheck.sh

[Magnus Määttä]

Hi!

I made these two patches so the buildconf script works on
Tru64.


--- buildconf   Mon Jan 13 10:34:38 2003
+++ .new..buildconf Mon Jan 13 10:33:43 2003
@@ -19,6 +19,10 @@
 echo using default Zend directory
 fi

-rm -f generated_lists
-
+rm -rf generated_lists
+osf=`uname -s`
+if test $osf = OSF1; then
+gmake -s -f build/build.mk AMFLAGS=$automake_flags ZENDDIR=$ZENDDIR
+else
 ${MAKE:-make} -s -f build/build.mk AMFLAGS=$automake_flags ZENDDIR=$ZENDDIR
+fi

--- buildcheck.sh   Mon Jan 13 10:36:27 2003
+++ .new..buildcheck.sh Mon Jan 13 10:36:39 2003
@@ -1,8 +1,8 @@
 #! /bin/sh
 #  +--+
-#  | PHP Version 4|
+#  | PHP Version 5|
 #  +--+
-#  | Copyright (c) 1997-2002 The PHP Group|
+#  | Copyright (c) 1997-2003 The PHP Group|
 #  +--+
 #  | This source file is subject to version 2.02 of the PHP license,  |
 #  | that is bundled with this package in the file LICENSE, and is|
@@ -73,6 +73,8 @@
 # libtool 1.4 or newer
 # Prefer glibtool over libtool for Mac OS X compatibility
 libtool=`which glibtool 2 /dev/null`
+osf=`uname -s`
+if test $osf = OSF1; then libtool=/usr/local/bin/libtool; if test ! -f 
+$libtool; then libtool = ; fi; fi
 if test ! -f $libtool; then libtool=`which libtool`; fi
 lt_pversion=`$libtool --version 2/dev/null|sed -n -e 's/^[^0-9]*//' -e 1's/[- 
].*//p'`
 if test $lt_pversion = ; then


/ Magnus Määttä
--- buildconf   Mon Jan 13 10:34:38 2003
+++ .new..buildconf Mon Jan 13 10:33:43 2003
@@ -19,6 +19,10 @@
 echo using default Zend directory
 fi
  
-rm -f generated_lists
-
+rm -rf generated_lists
+osf=`uname -s`
+if test $osf = OSF1; then
+gmake -s -f build/build.mk AMFLAGS=$automake_flags ZENDDIR=$ZENDDIR
+else
 ${MAKE:-make} -s -f build/build.mk AMFLAGS=$automake_flags ZENDDIR=$ZENDDIR
+fi

--- buildcheck.sh   Mon Jan 13 10:36:27 2003
+++ .new..buildcheck.sh Mon Jan 13 10:36:39 2003
@@ -1,8 +1,8 @@
 #! /bin/sh
 #  +--+
-#  | PHP Version 4|
+#  | PHP Version 5|
 #  +--+
-#  | Copyright (c) 1997-2002 The PHP Group|
+#  | Copyright (c) 1997-2003 The PHP Group|
 #  +--+
 #  | This source file is subject to version 2.02 of the PHP license,  |
 #  | that is bundled with this package in the file LICENSE, and is|
@@ -73,6 +73,8 @@
 # libtool 1.4 or newer
 # Prefer glibtool over libtool for Mac OS X compatibility
 libtool=`which glibtool 2 /dev/null`
+osf=`uname -s`
+if test $osf = OSF1; then libtool=/usr/local/bin/libtool; if test ! -f 
+$libtool; then libtool = ; fi; fi
 if test ! -f $libtool; then libtool=`which libtool`; fi
 lt_pversion=`$libtool --version 2/dev/null|sed -n -e 's/^[^0-9]*//' -e 1's/[- 
].*//p'`
 if test $lt_pversion = ; then


-- 
PHP Development Mailing List http://www.php.net/
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] Patches for buildconf and build/buildcheck.sh

[Sascha Schumann]

On Mon, 13 Jan 2003, Magnus Määttä wrote:

 Hi!

 I made these two patches so the buildconf script works on
 Tru64.

You can simply add

MAKE=gmake
export MAKE

to your .profile (or how it's called on your system).
buildconf will then use GNU make.  Although I do wonder why
you would need that -- the makefiles are supposed to work
even with Tru64's native make.

I've committed a portability fix for the use of the which
command.

- Sascha

--
PHP Development Mailing List http://www.php.net/
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] Patches for buildconf and build/buildcheck.sh

[Magnus Määttä]

 MAKE=gmake
 export MAKE
 
ahh, ok.. That worked..

 buildconf will then use GNU make.  Although I do wonder why
 you would need that -- the makefiles are supposed to work
 even with Tru64's native make.

This is the output I get when I'm running it with native make:

11:45 root@netsrv5:/php/php4 # ./buildconf
using default Zend directory
buildconf: checking installation...
buildconf: autoconf version 2.13 (ok)
buildconf: automake version 1.4 (ok)
buildconf: libtool version 1.4.3 (ok)
Make: Cannot open build/generated_lists.  Stop.
*** Exit 1
Stop.
11:46 root@netsrv5:/php/php4 #

 I've committed a portability fix for the use of the which
 command.

Also worked.

You forgot to change to PHP 5 and the copyright to 2003.

/ Magnus

-- 
PHP Development Mailing List http://www.php.net/
To unsubscribe, visit: http://www.php.net/unsub.php