Revision: 25712
http://sourceforge.net/p/gar/code/25712
Author: cgrzemba
Date: 2016-05-18 12:12:40 +0000 (Wed, 18 May 2016)
Log Message:
-----------
mod_wsgi/trunk: add support for Apache24
Modified Paths:
--------------
csw/mgar/pkg/mod_wsgi/trunk/Makefile
Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_wsgi/trunk/Makefile 2016-05-18 01:24:51 UTC (rev
25711)
+++ csw/mgar/pkg/mod_wsgi/trunk/Makefile 2016-05-18 12:12:40 UTC (rev
25712)
@@ -18,34 +18,55 @@
GARCOMPILER = SOS12U3
-PACKAGES = CSWap2modwsgi
-CATALOGNAME_CSWap2modwsgi = ap2_modwsgi
-RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWpython
-RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWlibpython2-6-1-0
+# EXTRA_MODULATORS += PYTHON
+PYTHON=2.7
+# Python 2.6 can't build with c99 but apache24 needs for /usr/include/stdbool.h
+# MODULATIONS_PYTHON = 2.6 2.7
+MODULATIONS_PYTHON = 2.7
+
+EXTRA_MODULATORS += SAPI
+MODULATIONS_SAPI += ap24
+MODULATIONS_SAPI += ap2
+MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all
+MERGE_SCRIPTS_isa-default-sapi-ap24 = copy-all
+MERGE_SCRIPTS_isa-default-python-2.6 = copy-all
+MERGE_SCRIPTS_isa-default-python-2.7 = copy-all
+
+
+PACKAGES += CSWap24modwsgi
+SPKG_DESC_CSWap24modwsgi = $(DESCRIPTION) for Apache24
+# PKGFILES_CSWap24modwsgi += $(libdir)/apache2/modules/.*
+# PKGFILES_CSWap24modwsgi += $(PKGFILES_DOC)
+RUNTIME_DEP_PKGS_CSWap24modwsgi += CSWlibpython2-7-1-0
+RUNTIME_DEP_PKGS_CSWap24modwsgi += CSWapache24
+RUNTIME_DEP_PKGS_CSWap24modwsgi += CSWpython27
+CHECKPKG_OVERRIDES_CSWap24modwsgi +=
soname-not-part-of-filename|soname=mod_wsgi.so|filename=mod_wsgi-2.7.so
+CHECKPKG_OVERRIDES_CSWap24modwsgi += surplus-dependency|CSWpython27
+CHECKPKG_OVERRIDES_CSWap24modwsgi += surplus-dependency|CSWapache24
+
+
+PACKAGES += CSWap2modwsgi
+SPKG_DESC_CSWap2modwsgi = $(DESCRIPTION) for Apache22
+PKGFILES_CSWap2modwsgi += $(prefix)/apache2/.*
+RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWpython27
RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWlibpython2-7-1-0
RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWapache2
-CHECKPKG_OVERRIDES_CSWap2modwsgi +=
catalogname-does-not-match-pkgname|pkgname=CSWap2modwsgi|catalogname=ap2_modwsgi|expected-catalogname=ap2modwsgi
-CHECKPKG_OVERRIDES_CSWap2modwsgi += surplus-dependency|CSWpython
-
-CHECKPKG_OVERRIDES_CSWap2modwsgi +=
soname-not-part-of-filename|soname=mod_wsgi.so|filename=mod_wsgi-2.6.so
+CHECKPKG_OVERRIDES_CSWap2modwsgi += surplus-dependency|CSWpython27
CHECKPKG_OVERRIDES_CSWap2modwsgi +=
soname-not-part-of-filename|soname=mod_wsgi.so|filename=mod_wsgi-2.7.so
-EXTRA_MODULATORS += PYTHON
-MODULATIONS_PYTHON = 2.6 2.7
-
EXTRA_PAX_ARGS += -s ",^(.*)/mod_wsgi\.so,\1/mod_wsgi-$(PYTHON).so,"
+# EXTRA_BUILD_ENV += LTFLAGS=--debug
CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs
+CONFIGURE_ARGS-ap2 += --with-apxs=$(prefix)/apache2/sbin/apxs
+CONFIGURE_ARGS-ap24 += --with-apxs=$(prefix)/bin/apxs
CONFIGURE_ARGS += --with-python=$(bindir)/python$(PYTHON)
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(SAPI))
# There are no tests for this
TEST_SCRIPTS =
-MERGE_SCRIPTS_isa-default-python-2.6 = copy-all
-MERGE_SCRIPTS_isa-default-python-2.7 = copy-all
-
include gar/category.mk
post-extract:
@@ -53,6 +74,6 @@
@$(MAKECOOKIE)
-post-merge-all:
+post-merge-python-2.6:
gln -s mod_wsgi-2.6.so $(PKGROOT)/opt/csw/apache2/libexec/mod_wsgi.so
@$(MAKECOOKIE)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
