Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
15557510 SUNBT6832040 FastCGI does not provide C++ Application libraries
authorBrian Cameron <brian.cameron@oracle.com>
Wed, 14 Aug 2013 12:55:10 -0700
changeset 1435 6046582a044c
parent 1434 c782e620dd26
child 1436 7d0fcc0c9183
15557510 SUNBT6832040 FastCGI does not provide C++ Application libraries
components/fastcgi/Makefile file | annotate | diff | comparison | revisions
components/fastcgi/fcgi.p5m file | annotate | diff | comparison | revisions
components/fastcgi/resolve.deps file | annotate | diff | comparison | revisions 
--- a/components/fastcgi/Makefile	Wed Aug 14 10:54:58 2013 -0700
+++ b/components/fastcgi/Makefile	Wed Aug 14 12:55:10 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -47,6 +47,10 @@
 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS += CXXFLAGS="$(CFLAGS) $(studio_XREGS)"
 
+CXX += $(studio_NORUNPATH)
+
+COMPONENT_PREP_ACTION = (cd $(@D) ; touch NEWS AUTHORS ChangeLog ; autoreconf -if)
+
 # common targets
 build:     $(BUILD_32_and_64)
 
--- a/components/fastcgi/fcgi.p5m	Wed Aug 14 10:54:58 2013 -0700
+++ b/components/fastcgi/fcgi.p5m	Wed Aug 14 12:55:10 2013 -0700
@@ -45,8 +45,10 @@
 file path=usr/include/fastcgi/fcgio.h
 file path=usr/include/fastcgi/fcgios.h
 file path=usr/lib/$(MACH64)/libfcgi.so.0.0.0
+file path=usr/lib/$(MACH64)/libfcgi++.so.0.0.0
 file path=usr/lib/$(MACH64)/llib-lfcgi.ln
 file path=usr/lib/libfcgi.so.0.0.0
+file path=usr/lib/libfcgi++.so.0.0.0
 file llib-lfcgi path=usr/lib/llib-lfcgi
 file path=usr/lib/llib-lfcgi.ln
 file doc/cgi-fcgi.1 path=usr/share/man/man1/cgi-fcgi.1
@@ -57,6 +59,11 @@
 license fcgi.license license=FastCGI
 link path=usr/lib/$(MACH64)/libfcgi.so target=libfcgi.so.0.0.0
 link path=usr/lib/$(MACH64)/libfcgi.so.0 target=libfcgi.so.0.0.0
+link path=usr/lib/$(MACH64)/libfcgi++.so target=libfcgi++.so.0.0.0
+link path=usr/lib/$(MACH64)/libfcgi++.so.0 target=libfcgi++.so.0.0.0
 link path=usr/lib/libfcgi.so target=libfcgi.so.0.0.0
 link path=usr/lib/libfcgi.so.0 target=libfcgi.so.0.0.0
+link path=usr/lib/libfcgi++.so target=libfcgi++.so.0.0.0
+link path=usr/lib/libfcgi++.so.0 target=libfcgi++.so.0.0.0
 
+
--- a/components/fastcgi/resolve.deps	Wed Aug 14 10:54:58 2013 -0700
+++ b/components/fastcgi/resolve.deps	Wed Aug 14 12:55:10 2013 -0700
@@ -1,1 +1,2 @@
 system/library
+system/library/c++-runtime
upstream/oracle/userland-gate