Upgrade to php-4.4.4 and let it build again.

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6063 33e552b5-05e3-0310-8538-816dae2090ed

9 files changed, 192 insertions, 195 deletions

diff --git a/patches/php-4.3.11/generic/php-4.3.11-arm-cross.diff b/patches/php-4.4.4/generic/php-4.4.4-arm-cross.diff
index 1e9287dd2..1e9287dd2 100644
--- a/patches/php-4.3.11/generic/php-4.3.11-arm-cross.diff
+++ b/patches/php-4.4.4/generic/php-4.4.4-arm-cross.diff
diff --git a/rules/apache2.in b/rules/apache2.in
index d206fd3b5..2aefa4fcc 100644
--- a/rules/apache2.in
+++ b/rules/apache2.in
@@ -112,5 +112,14 @@ comment "Apache 2 Modules"
 comment "----------------------------------"
 	depends on APACHE2
 
+config APACHE2_MOD_PHP4
+	bool
+	prompt "PHP4 Module for Apache 2"
+	depends on APACHE2
+	select PHP4
+	help
+	 This module adds the PHP4 script language to the server
+	 to support dynamic website generation
+
 source "rules/apache2_mod_python.in"
 
diff --git a/rules/apache2.make b/rules/apache2.make
index 646541f2c..417871738 100644
--- a/rules/apache2.make
+++ b/rules/apache2.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: template 2922 2005-07-11 19:17:53Z rsc $
+# $Id: apache2.make,v 1.8 2006/09/26 12:11:10 michl Exp $
 #
 # Copyright (C) 2005 by Robert Schwebel
 #          
@@ -70,7 +70,9 @@ APACHE2_ENV 	:=  $(CROSS_ENV) \
 #
 # autoconf
 #
-APACHE2_AUTOCONF = $(CROSS_AUTOCONF_USR)
+APACHE2_AUTOCONF = \
+	$(CROSS_AUTOCONF_USR) \
+	--enable-so
 
 # FIXME
 # --without-apxs $(CROSS_AUTOCONF_USR)
@@ -225,7 +227,7 @@ ifneq ($(PTXCONF_APACHE2_CONFIGDIR),"")
 #
 ifdef PTXCONF_APACHE2_DEFAULTCONFIG
 	@$(call install_copy, apache2, 12, 102, 0644, \
-		$(PTXDIST_TOPDIR)/projects-example/generic/httpd.con, \
+		$(PTXDIST_TOPDIR)/projects-example/generic/httpd.conf, \
 		$(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf, n)
 	@echo "installing apache's default config file..."
 # modify placeholders with data from configuration
diff --git a/rules/apache2_mod_python.in b/rules/apache2_mod_python.in
index 7e6eec0fb..5cb9d7c61 100644
--- a/rules/apache2_mod_python.in
+++ b/rules/apache2_mod_python.in
@@ -2,7 +2,7 @@
 
 config APACHE2_MOD_PYTHON
 	bool
-	prompt "Python Module for Apache 2.x"
+	prompt "Python Module for Apache 2"
 	depends on APACHE2
 	select HOST_APACHE2
 	select PYTHON24
diff --git a/rules/php.in b/rules/php.in
deleted file mode 100644
index bb8790f68..000000000
--- a/rules/php.in
+++ /dev/null
@@ -1,24 +0,0 @@
-config PHP
-	bool
-	prompt "PHP4"
-	depends on BROKEN
-	help
-	  FIXME: This item needs to be documented
-
-config PHP_CLI
-	bool
-	prompt "Build CLI version of PHP"
-	depends on PHP
-	help
-	  FIXME: This item needs to be documented
-
-config PHP_APACHE
-	bool
-	prompt "Build shared Apache 1.x module"
-	depends on PHP
-	select APACHE
-	help
-	  FIXME: This item needs to be documented
-
-comment "PHP is broken, please send a patch"
-	depends on !BROKEN
diff --git a/rules/php.make b/rules/php.make
deleted file mode 100644
index 871eec820..000000000
--- a/rules/php.make
+++ /dev/null
@@ -1,166 +0,0 @@
-# -*-makefile-*-
-# $Id: php.make,v 1.6 2005/04/29 08:40:27 michl Exp $
-#
-# Copyright (C) 2005 by Jiri Nesladek
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_PHP) += php
-
-#
-# Paths and names
-#
-PHP_VERSION	= 4.3.11
-PHP		= php-$(PHP_VERSION)
-PHP_SUFFIX	= tar.bz2
-PHP_URL		= http://de.php.net/get/$(PHP).$(PHP_SUFFIX)/from/this/mirror
-PHP_SOURCE	= $(SRCDIR)/$(PHP).$(PHP_SUFFIX)
-PHP_DIR		= $(BUILDDIR)/$(PHP)
-
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-php_get: $(STATEDIR)/php.get
-
-$(STATEDIR)/php.get: $(php_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
-$(PHP_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, PHP)
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-php_extract: $(STATEDIR)/php.extract
-
-$(STATEDIR)/php.extract: $(php_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(PHP_DIR))
-	@$(call extract, PHP)
-	@$(call patchin, PHP)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-php_prepare: $(STATEDIR)/php.prepare
-
-PHP_PATH = PATH=$(CROSS_PATH)
-PHP_ENV = \
-	$(CROSS_ENV) \
-	ac_cv_func_fopencookie=no \
-	ac_cv_func_getaddrinfo=yes \
-	LIBS=-ldl
-
-#
-# autoconf
-#
-PHP_AUTOCONF = \
-	$(CROSS_AUTOCONF_USR) \
-	--with-config-file-path=/etc \
-	--disable-all
-
-ifndef PTXCONF_PHP_CLI
-PHP_AUTOCONF += --disable-cli
-endif
-ifdef PTXCONF_PHP_APACHE
-PHP_AUTOCONF += --with-apxs=$(SYSROOT)/bin/apxs
-endif
-
-ifdef PTXCONF_VOICEBLUE_PHP_MODULE
-PHP_AUTOCONF += VOICEBLUE_DIR=$(VOICEBLUE_DIR) --with-vblue_cnf=shared
-endif
-ifdef PTXCONF_NS_PHP_MODULE
-PHP_AUTOCONF += NS_DIR=$(NS_DIR) --with-netstar_cfg=shared
-endif
-
-$(STATEDIR)/php.prepare: $(php_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(PHP_DIR)/config.cache)
-	cd $(PHP_DIR) && \
- 		$(PHP_PATH) $(PHP_ENV) \
-		./configure $(PHP_AUTOCONF)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-php_compile: $(STATEDIR)/php.compile
-
-$(STATEDIR)/php.compile: $(php_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(PHP_DIR) && $(PHP_ENV) $(PHP_PATH) make
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-php_install: $(STATEDIR)/php.install
-
-$(STATEDIR)/php.install: $(php_install_deps_default)
-	@$(call targetinfo, $@)
-	# FIXME
-	cd $(PHP_DIR) && \
-		$(PHP_ENV) $(PHP_PATH) \
-		make install-build install-headers install-programs \
-		INSTALL_ROOT=$(SYSROOT)
-	install -m 755 -D $(PHP_DIR)/scripts/php-config $(PTXCONF_PREFIX)/bin/php-config
-	install -m 755 -D $(PHP_DIR)/scripts/phpize $(PTXCONF_PREFIX)/bin/phpize
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-php_targetinstall: $(STATEDIR)/php.targetinstall
-
-$(STATEDIR)/php.targetinstall: $(php_targetinstall_deps_default)
-	@$(call targetinfo, $@)
-
-	@$(call install_init, php)
-	@$(call install_fixup, php,PACKAGE,php)
-	@$(call install_fixup, php,PRIORITY,optional)
-	@$(call install_fixup, php,VERSION,$(PHP_VERSION))
-	@$(call install_fixup, php,SECTION,base)
-	@$(call install_fixup, php,AUTHOR,"Jiri Nesladek <nesladek\@2n.cz>")
-	@$(call install_fixup, php,DEPENDS,)
-	@$(call install_fixup, php,DESCRIPTION,missing)
-
-	@$(call install_copy, php, 0, 0, 0755, /usr/lib/php)
-
-ifdef PTXCONF_PHP_APACHE
-	@$(call install_copy, php, 0, 0, 0644, $(PHP_DIR)/libs/libphp4.so, /usr/lib/apache/libphp4.so)
-endif
-ifdef PTXCONF_PHP_CLI
-	@$(call install_copy, php, 0, 0, 0755, $(PHP_DIR)/sapi/cli/php, /usr/bin/php)
-endif
-
-	@$(call install_finish, php)
-
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-php_clean:
-	rm -rf $(STATEDIR)/php.*
-	rm -rf $(IMAGEDIR)/php_*
-	rm -rf $(PHP_DIR)
-
-# vim: syntax=make
diff --git a/rules/php4.in b/rules/php4.in
new file mode 100644
index 000000000..1a70bfc05
--- /dev/null
+++ b/rules/php4.in
@@ -0,0 +1,16 @@
+config PHP4
+	bool
+	prompt "PHP4"
+	help
+	  PHP stands for "PHP: Hypertext Preprocessor" (indeed, the first word
+	  of the acronym is the acronym). It is an HTML-embedded scripting
+	  language with the goal to allow web developers to write dynamically
+	  generated pages quickly.
+
+config PHP4_CLI
+	bool
+	prompt "Build CLI version of PHP4"
+	depends on PHP4
+	help
+	  FIXME: This item needs to be documented
+
diff --git a/rules/php4.make b/rules/php4.make
new file mode 100644
index 000000000..9048bc9be
--- /dev/null
+++ b/rules/php4.make
@@ -0,0 +1,160 @@
+# -*-makefile-*-
+# $Id: php4.make,v 1.1 2006/09/26 12:11:10 michl Exp $
+#
+# Copyright (C) 2005 by Jiri Nesladek
+#          
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PHP4) += php4
+
+#
+# Paths and names
+#
+PHP4_VERSION	= 4.4.4
+PHP4		= php-$(PHP4_VERSION)
+PHP4_SUFFIX	= tar.bz2
+PHP4_URL	= http://de.php.net/get/$(PHP4).$(PHP4_SUFFIX)/from/this/mirror
+PHP4_SOURCE	= $(SRCDIR)/$(PHP4).$(PHP4_SUFFIX)
+PHP4_DIR	= $(BUILDDIR)/$(PHP4)
+
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+php4_get: $(STATEDIR)/php4.get
+
+$(STATEDIR)/php4.get: $(php4_get_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+$(PHP4_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, PHP4)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+php4_extract: $(STATEDIR)/php4.extract
+
+$(STATEDIR)/php4.extract: $(php4_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(PHP4_DIR))
+	@$(call extract, PHP4)
+	@$(call patchin, PHP4)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+php4_prepare: $(STATEDIR)/php4.prepare
+
+PHP4_PATH = PATH=$(CROSS_PATH)
+PHP4_ENV = \
+	$(CROSS_ENV) \
+	ac_cv_func_fopencookie=no \
+	ac_cv_func_getaddrinfo=yes \
+	LIBS=-ldl
+
+#
+# autoconf
+#
+PHP4_AUTOCONF = \
+	$(CROSS_AUTOCONF_USR) \
+	--with-config-file-path=/etc \
+	--with-expat-dir=$(SYSROOT) \
+	--disable-all
+
+ifndef PTXCONF_PHP4_CLI
+PHP4_AUTOCONF += --disable-cli
+endif
+ifdef PTXCONF_APACHE2_MOD_PHP4
+PHP4_AUTOCONF += --with-apxs2=$(SYSROOT)/usr/bin/apxs
+endif
+
+$(STATEDIR)/php4.prepare: $(php4_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(PHP4_DIR)/config.cache)
+	cd $(PHP4_DIR) && \
+ 		$(PHP4_PATH) $(PHP4_ENV) \
+		./configure $(PHP4_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+php4_compile: $(STATEDIR)/php4.compile
+
+$(STATEDIR)/php4.compile: $(php4_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(PHP4_DIR) && $(PHP4_ENV) $(PHP4_PATH) make
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+php4_install: $(STATEDIR)/php4.install
+
+$(STATEDIR)/php4.install: $(php4_install_deps_default)
+	@$(call targetinfo, $@)
+	# FIXME
+	cd $(PHP4_DIR) && \
+		$(PHP4_ENV) $(PHP4_PATH) \
+		make install-build install-headers install-programs \
+		INSTALL_ROOT=$(SYSROOT)
+	install -m 755 -D $(PHP4_DIR)/scripts/php4-config $(PTXCONF_PREFIX)/bin/php4-config
+	install -m 755 -D $(PHP4_DIR)/scripts/php4ize $(PTXCONF_PREFIX)/bin/php4ize
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+php4_targetinstall: $(STATEDIR)/php4.targetinstall
+
+$(STATEDIR)/php4.targetinstall: $(php4_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, php4)
+	@$(call install_fixup, php4,PACKAGE,php4)
+	@$(call install_fixup, php4,PRIORITY,optional)
+	@$(call install_fixup, php4,VERSION,$(PHP4_VERSION))
+	@$(call install_fixup, php4,SECTION,base)
+	@$(call install_fixup, php4,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, php4,DEPENDS,)
+	@$(call install_fixup, php4,DESCRIPTION,missing)
+
+	@$(call install_copy, php4, 0, 0, 0755, /usr/lib/php4)
+
+ifdef PTXCONF_PHP4_APACHE
+	@$(call install_copy, php4, 0, 0, 0644, $(PHP4_DIR)/libs/libphp44.so, /usr/lib/apache/libphp44.so)
+endif
+ifdef PTXCONF_PHP4_CLI
+	@$(call install_copy, php4, 0, 0, 0755, $(PHP4_DIR)/sapi/cli/php4, /usr/bin/php4)
+endif
+
+	@$(call install_finish, php4)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+php4_clean:
+	rm -rf $(STATEDIR)/php4.*
+	rm -rf $(IMAGEDIR)/php4_*
+	rm -rf $(PHP4_DIR)
+
+# vim: syntax=make
diff --git a/rules/scriptlanguages.in b/rules/scriptlanguages.in
index bd9bb45be..a1c286c8f 100644
--- a/rules/scriptlanguages.in
+++ b/rules/scriptlanguages.in
@@ -1,6 +1,6 @@
 comment "Scripting Languages"
 
-source "rules/php.in"
+source "rules/php4.in"
 source "rules/php-apc.in"
 source "rules/python.in"
 source "rules/python24.in"