[csw-devel] SF.net SVN: gar:[4721] csw/mgar/pkg/php5/trunk

[valholla at users.sourceforge.net]

Revision: 4721
          http://gar.svn.sourceforge.net/gar/?rev=4721&view=rev
Author:   valholla
Date:     2009-05-07 01:28:45 +0000 (Thu, 07 May 2009)

Log Message:
-----------
add STRIP_LIBTOOL variable and cgi sapi module

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/Makefile
    csw/mgar/pkg/php5/trunk/extensions/php5_apache2/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/php5/trunk/files/fixme.sh

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2009-05-06 16:16:56 UTC (rev 4720)
+++ csw/mgar/pkg/php5/trunk/Makefile	2009-05-07 01:28:45 UTC (rev 4721)
@@ -65,8 +65,9 @@
 EXTRA_CFLAGS = -I$(prefix)/include/ncursesw
 
 NOISALIST = 1
-DISTFILES += fixme.sh
 
+STRIP_LIBTOOL = 1
+
 CONFIGURE_ARGS += --prefix=$(prefix)/php5
 CONFIGURE_ARGS += --disable-static
 CONFIGURE_ARGS += --with-exec-dir=$(prefix)/php5/bin
@@ -92,6 +93,7 @@
 # Copy over template config files and utility scripts
 
 PI_SCRIPTS  = install-extras
+PI_SCRIPTS += install-ap2modphp5
 PI_SCRIPTS += install-modphp5
 
 post-install-modulated: $(PI_SCRIPTS)
@@ -110,23 +112,32 @@
 	@(gfind $(PHP5ROOT)/lib -name "*.a" -exec grm {} \;)
 	@$(MAKECOOKIE)
 
+install-ap2modphp5:
+	@( echo "  ==> Now Building ap2_modphp5 <==" )
+	@( if [ -f $(WORKSRC)/Makefile ]; then \
+		$(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi )
+	@( cd $(WORKSRC) && $(BUILD_ENV) \
+		./configure $(CONFIGURE_ARGS) --with-apxs2=$(prefix)/apache2/sbin/apxs)
+	@( $(GARBIN)/fixlibtool $(WORKSRC) )
+	@( $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi )
+	@( strip $(DESTDIR)$(prefix)/apache2/libexec/libphp5.so )
+	@( gfind $(DESTDIR)$(prefix)/apache*  \
+		-mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr )
+	@$(MAKECOOKIE)
+
 install-modphp5:
 	@( echo "  ==> Now Building mod_php5 <==" )
 	@( if [ -f $(WORKSRC)/Makefile ]; then \
 		$(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi )
-	@( cd $(WORKSRC) && $(BUILD_ENV) ./configure $(NEW_CONFIGURE_ARGS) )
-	@( $(DOWNLOADDIR)/fixme.sh $(WORKSRC) )
+	@( cd $(WORKSRC) && $(BUILD_ENV) \
+		./configure $(CONFIGURE_ARGS) --with-apxs=$(prefix)/apache/bin/apxs)
+	@( $(GARBIN)/fixlibtool $(WORKSRC) )
 	@( $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi )
 	@( strip $(DESTDIR)$(prefix)/apache/libexec/libphp5.so )
 	@( gfind $(DESTDIR)$(prefix)/apache*  \
 		-mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr )
 	@$(MAKECOOKIE)
 
-post-configure-modulated:
-	@(echo "~~~ Fixing Libtool ~~~")
-	@$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
-	$(DONADA)
-
 EXTFILES = $(shell find extensions/*/files/* -prune -type f)
 pre-fetch:
 	$(foreach F,$(EXTFILES),$(shell cp $(F) $(DOWNLOADDIR)))

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_apache2/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_apache2/Makefile	2009-05-06 16:16:56 UTC (rev 4720)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_apache2/Makefile	2009-05-07 01:28:45 UTC (rev 4721)
@@ -12,7 +12,6 @@
 
 STRIP_DIRS += $(DESTDIR)$(prefix)/apache2/libexec
 
-CONFIGURE_ARGS += --with-apxs2=$(prefix)/apache2/sbin/apxs
-
 PKGFILES_CSWap2modphp5 = .*/csw/apache2/.*
 
+## This is configured in a post-install from the main Makefile

Deleted: csw/mgar/pkg/php5/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/php5/trunk/files/fixme.sh	2009-05-06 16:16:56 UTC (rev 4720)
+++ csw/mgar/pkg/php5/trunk/files/fixme.sh	2009-05-07 01:28:45 UTC (rev 4721)
@@ -1,49 +0,0 @@
-#!/bin/bash
-####################################################
-#
-#  fixme.sh
-#  Intended to remove the use of libtool's 
-#  pseudo-libraries for opencsw builds.
-#
-#  Author: Mike Watters  mwatters_at_opencsw.org
-#  Initial Version: 0.1
-#
-####################################################
-
-umask 0022
-PATH=/opt/csw/bin
-
-if [ $# -ne 1 ]; then
-    gecho "USAGE: $(basename $0) WORKSRC"
-    exit 1
-fi
-BASEPATH=$1
-
-## Fix Makefiles
-for mk in $(gfind ${BASEPATH} -name Makefile -print); do
-    LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \
-        gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
-    
-    for file in ${LT_FILES}; do
-        LIB_NAME=$(ggrep 'dlname=' ${file} | \
-            gsed -e "s/.*'\(.*\)'/\1/" \
-                -e "s/^lib//" \
-                -e "s/\.so.*$//")
-        fixpath=$(gecho $file |gsed 's/\//\\\//g')
-        gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new
-        gmv Makefile.new ${mk}
-    done
-done
-
-## Fix libtool Script
-for lt in $(gfind ${BASEPATH} -name libtool -print); do
-    gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new
-    gmv ${lt}.new ${lt}
-done
-
-LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print)
-if [ -f ${LTMAIN} ]; then
-    gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
-    gmv ${LTMAIN}.new ${LTMAIN}
-fi
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.