[csw-devel] SF.net SVN: gar:[19445] csw/mgar/pkg/mod_jk/trunk

wilbury at users.sourceforge.net wilbury at users.sourceforge.net
Sun Oct 14 23:46:23 CEST 2012


Revision: 19445
          http://gar.svn.sourceforge.net/gar/?rev=19445&view=rev
Author:   wilbury
Date:     2012-10-14 21:46:23 +0000 (Sun, 14 Oct 2012)
Log Message:
-----------
mod_jk/trunk: Finish recipe, fix paths and install steps.

Modified Paths:
--------------
    csw/mgar/pkg/mod_jk/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/mod_jk/trunk/files/0002-Do-not-prefix-APXSLDFLAGS-with-Wl-to-make-SUNWspro-h.patch

Modified: csw/mgar/pkg/mod_jk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_jk/trunk/Makefile	2012-10-14 20:46:26 UTC (rev 19444)
+++ csw/mgar/pkg/mod_jk/trunk/Makefile	2012-10-14 21:46:23 UTC (rev 19445)
@@ -21,10 +21,11 @@
   been ported to JK.
 endef
 
+PACKAGES = CSWap2modjk
+
 MASTER_SITES = http://www.apache.org/dist/tomcat/tomcat-connectors/jk/
 DISTFILES  = $(NAME)-$(VERSION)-src.tar.gz
 DISTFILES += httpd-jk.conf.CSW
-PACKAGING_PLATFORMS = solaris10-i386
 WORKSRC = $(WORKDIR)/$(DISTNAME)-src/native
 PATCHDIR = $(WORKDIR)/$(DISTNAME)-src
 
@@ -44,32 +45,34 @@
 DISTFILES += $(AUXCONFIG)
 
 PATCHFILES += 0001-Use-correct-paths-for-install-and-logging.patch
+PATCHFILES += 0002-Do-not-prefix-APXSLDFLAGS-with-Wl-to-make-SUNWspro-h.patch
 
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs
+CONFIGURE_ARGS += --libexecdir=$(AP2_ROOT)/libexec
+CONFIGURE_ARGS += --with-apxs=$(AP2_ROOT)/sbin/apxs
 CONFIGURE_ARGS += --enable-jni
 CONFIGURE_ARGS += --enable-prefork
 CONFIGURE_ARGS += --disable-static
 CONFIGURE_ARGS += --with-java-home=/usr/jdk/latest
 CONFIGURE_ARGS += --with-java-platform=2
 
+BUILD_DEP_PKGS_CSWap2modjk += CSWapache2-dev
+RUNTIME_DEP_PKGS_CSWap2modjk += CSWapache2
+
+LICENSE_TEXT = Apache
+
 # No test suite available
 TEST_SCRIPTS =
 
 include gar/category.mk
 
-post-extract-modulated:
-	echo $(WORKDIR)
-	echo $(WORKSRC)
+pre-install-modulated:
+	ginstall -d $(AP2_LIBEXEC)
+	ginstall -d $(DESTDIR)$(AP2_ROOT)/etc/extra
+	ginstall -d $(DESTDIR)$(datadir)/ap2modjk
+	ginstall -d $(DESTDIR)$(docdir)/ap2modjk
 	@$(MAKECOOKIE)
 
-pre-install:
-	install -d $(DESTDIR)$(prefix)/apache2/libexec
-	install -d $(DESTDIR)$(prefix)/apache2/etc/extra
-	install -d $(DESTDIR)$(datadir)/ap2modjk
-	install -d $(DESTDIR)$(docdir)/ap2modjk
-	@$(MAKECOOKIE)
-
 post-install:
 	ginstall -m 0644 \
 	  $(WORKDIR)/httpd-jk.conf.CSW $(DESTDIR)$(prefix)/apache2/etc/extra

Added: csw/mgar/pkg/mod_jk/trunk/files/0002-Do-not-prefix-APXSLDFLAGS-with-Wl-to-make-SUNWspro-h.patch
===================================================================
--- csw/mgar/pkg/mod_jk/trunk/files/0002-Do-not-prefix-APXSLDFLAGS-with-Wl-to-make-SUNWspro-h.patch	                        (rev 0)
+++ csw/mgar/pkg/mod_jk/trunk/files/0002-Do-not-prefix-APXSLDFLAGS-with-Wl-to-make-SUNWspro-h.patch	2012-10-14 21:46:23 UTC (rev 19445)
@@ -0,0 +1,45 @@
+From 879c3c18b8f8a9e8be828be3d33e8023d6c65848 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Sun, 14 Oct 2012 23:14:54 +0200
+Subject: [PATCH] Do not prefix APXSLDFLAGS with -Wl to make SUNWspro happy.
+
+---
+ native/configure | 22 ----------------------
+ 1 file changed, 22 deletions(-)
+
+diff --git a/native/configure b/native/configure
+index 0dea941..f48faf4 100755
+--- a/native/configure
++++ b/native/configure
+@@ -24042,28 +24042,6 @@ if ${TEST} -n "${LDFLAGS}" ; then
+ fi
+ 
+ 
+-  jk_new_val=""
+-  jk_val_changed=0
+-  for i in $APXSLDFLAGS; do
+-    case $i in
+-      -Wl,*)
+-        jk_new_val="$jk_new_val $i"
+-        ;;
+-      *)
+-        jk_new_val="$jk_new_val -Wl,$i"
+-        jk_val_changed=1
+-        ;;
+-    esac
+-  done
+-  if test $jk_val_changed = "1"; then
+-    { echo "$as_me:$LINENO: tokens in APXSLDFLAGS have been prefixed with '-Wl,'" >&5
+-echo "$as_me: tokens in APXSLDFLAGS have been prefixed with '-Wl,'" >&6;}
+-    APXSLDFLAGS=$jk_new_val
+-  fi
+-
+-
+-
+-
+ if ${TEST} -z "$WEBSERVER" ; then
+     { { echo "$as_me:$LINENO: error: Cannot find the WebServer" >&5
+ echo "$as_me: error: Cannot find the WebServer" >&2;}
+-- 
+1.7.12
+

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



More information about the devel mailing list