Репозитории ALT
5.1: | 5.2.14.20100721-alt0.M51.1 |
4.1: | 5.2.5-alt1.M41.3 |
4.0: | 5.2.2-alt1 |
3.0: | 5.0.5-alt0.cvs20050729 |
Группа :: Разработка/Прочее
Пакет: php5
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: php-shared-1.patch
Скачать
Скачать
diff --git a/php5/Makefile.global b/php5/Makefile.global
index b4cec63..a035171 100644
--- a/php5/Makefile.global
+++ b/php5/Makefile.global
@@ -13,8 +13,12 @@ all: $(all_targets)
build-modules: $(PHP_MODULES)
-libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+libphp-$(PHP_MAJOR_VERSION).$(PHP_MINOR_VERSION).$(PHP_RELEASE_VERSION).la: $(PHP_GLOBAL_OBJS)
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(libdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+ -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
+
+libphp$(PHP_MAJOR_VERSION).la: $(PHP_SAPI_OBJS) libphp-$(PHP_MAJOR_VERSION).$(PHP_MINOR_VERSION).$(PHP_RELEASE_VERSION).la
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(libdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) libphp-$(PHP_MAJOR_VERSION).$(PHP_MINOR_VERSION).$(PHP_RELEASE_VERSION).la -o $@
-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
@@ -24,17 +28,15 @@ install: $(all_targets) $(install_targets)
install-sapi: $(OVERALL_TARGET)
@echo "Installing PHP SAPI module: $(PHP_SAPI)"
- -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
- -@if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
- for i in 0.0.0 0.0 0; do \
- if test -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
- $(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
- break; \
- fi; \
- done; \
+ -@if test -f $(INSTALL_ROOT)$(libdir)/libphp$(PHP_MAJOR_VERSION).la; then \
+ $(LIBTOOL) --silent --mode=install cp libphp$(PHP_MAJOR_VERSION).la $(INSTALL_ROOT)$(libdir)/libphp$(PHP_MAJOR_VERSION).la >/dev/null 2>&1; \
fi
@$(INSTALL_IT)
+install-shared: libphp-$(PHP_MAJOR_VERSION).$(PHP_MINOR_VERSION).$(PHP_RELEASE_VERSION).la
+ @echo "Installing PHP shared library"
+ @$(LIBTOOL) --silent --mode=install install -D -m755 libphp-$(PHP_MAJOR_VERSION).$(PHP_MINOR_VERSION).$(PHP_RELEASE_VERSION).la $(INSTALL_ROOT)$(libdir)/libphp-$(PHP_MAJOR_VERSION).$(PHP_MINOR_VERSION).$(PHP_RELEASE_VERSION).la
+
install-modules: build-modules
@test -d modules && \
$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
diff --git a/php5/configure.in b/php5/configure.in
index ea4a00d..30864e2 100644
--- a/php5/configure.in
+++ b/php5/configure.in
@@ -1278,7 +1278,7 @@ INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET)"
-install_targets="$install_modules install-build install-headers install-programs $install_pear"
+install_targets="$install_modules install-build install-headers install-programs $install_pear install-shared"
case $PHP_SAPI in
cli)