- new rpm-php-requires/provides scripts

[packages/php.git] / php-shared.patch

diff --git a/php-shared.patch b/php-shared.patch
index c7d30206f93bce7efae66cf4014dcb197faa2d05..db51f989e1d8ef6bf33bc4008487c1117e9be6ba 100644 (file)
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -1,12 +1,14 @@
-diff -ur php-4.0.5.orig/Makefile.in php-4.0.5/Makefile.in
---- php-4.0.5.orig/Makefile.in Sun May  6 23:07:47 2001
-+++ php-4.0.5/Makefile.in      Mon May  7 03:25:53 2001
-@@ -2,41 +2,68 @@
+diff -urN php-4_2_0RC3.org/Makefile.in php-4_2_0RC3/Makefile.in
+--- php-4_2_0RC3.org/Makefile.in       Sat Apr 13 01:18:28 2002
++++ php-4_2_0RC3/Makefile.in   Sat Apr 13 01:56:27 2002
+@@ -2,40 +2,67 @@
  ZEND_DIR = $(srcdir)/Zend
- SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
+ SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) $(CLI_DIR) . $(PEAR_DIR)
  
 -LTLIBRARY_NAME = libphp4.la
 -LTLIBRARY_SOURCES = stub.c
+-
+-LTLIBRARY_DEPENDENCIES = \
 +libexec_LTLIBRARIES = libphp_common.la libphp4.la
 +libphp4_la_NAME = libphp4.la
 +libphp_common_la_NAME = libphp_common.la
@@ -16,8 +18,7 @@ diff -ur php-4.0.5.orig/Makefile.in php-4.0.5/Makefile.in
 +libphp4_la_DEPENDENCIES = \
 +              libphp_common.la \
 +              sapi/$(PHP_SAPI)/libsapi.la
- 
--LTLIBRARY_DEPENDENCIES = \
++              
 +libphp_common_la_DEPENDENCIES = \
                Zend/libZend.la \
 -              sapi/$(PHP_SAPI)/libsapi.la \
@@ -27,12 +28,9 @@ diff -ur php-4.0.5.orig/Makefile.in php-4.0.5/Makefile.in
                $(TSRM_LIB)
  
 -LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
--LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)
+-LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS)
 +libphp4_la_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
 +libphp4_la_LIBADD = $(libphp4_la_DEPENDENCIES) $(EXTRA_LIBS)
-+
-+libphp_common_la_LDFLAGS = -rpath $(phptempdir) -release 4.0.5 -version-info 0:0:0 $(LDFLAGS) $(PHP_RPATHS)
-+libphp_common_la_LIBADD = $(libphp_common_la_DEPENDENCIES) $(EXTRA_LIBS)
  
  PROGRAM_NAME         = php
  PROGRAM_SOURCES      = stub.c
@@ -50,6 +48,9 @@ diff -ur php-4.0.5.orig/Makefile.in php-4.0.5/Makefile.in
 -include $(top_srcdir)/build/library.mk
  include $(top_srcdir)/build/program.mk
  
++libphp_common_la_LDFLAGS = -rpath $(phptempdir) -release $(PHP_VERSION) -version-info 0:0:0 $(LDFLAGS) $(PHP_RPATHS)
++libphp_common_la_LIBADD = $(libphp_common_la_DEPENDENCIES) $(EXTRA_LIBS)
++
 +libphp_common_la_OBJECTS = $(libphp_common_la_SOURCES:.c=.lo) $(libphp_common_la_OBJECTS_X)
 +
 +$(libphp_common_la_NAME): $(libphp_common_la_OBJECTS) $(libphp_common_la_DEPENDENCIES)
@@ -64,12 +65,11 @@ diff -ur php-4.0.5.orig/Makefile.in php-4.0.5/Makefile.in
 -      @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
 +      @$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la
 +      @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la
-       -@$(mkinstalldirs) $(DESTDIR)$(bindir)
+       -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
        -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
                for i in 0.0.0 0.0 0; do \
                        if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
-                               $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
-+                              break; \
++                              break;  \
 +                      fi; \
 +              done; \
 +      fi
@@ -77,6 +77,6 @@ diff -ur php-4.0.5.orig/Makefile.in php-4.0.5/Makefile.in
 +              for i in 0.0.0 0.0 0; do \
 +                      if test -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i; then \
 +                              $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); \
+                               $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
                                break; \
                        fi; \
-               done; \