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.
24460601 apache24 fails in pkgdepend on 106 nightly
authorPetr Sumbera <petr.sumbera@oracle.com>
Tue, 23 Aug 2016 02:13:19 -0700
changeset 6662 d4892a2b5644
parent 6661 04e956b11e9f
child 6663 128d4acc707a
24460601 apache24 fails in pkgdepend on 106 nightly
components/apache24/apache-dbd.p5m file | annotate | diff | comparison | revisions
components/apache24/apache-ldap.p5m file | annotate | diff | comparison | revisions 
--- a/components/apache24/apache-dbd.p5m	Tue Aug 23 08:27:57 2016 -0700
+++ b/components/apache24/apache-dbd.p5m	Tue Aug 23 02:13:19 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 # prevents "64bit file in 32bit path" errors
@@ -46,6 +46,6 @@
 license apache.license license="Apache v2.0"
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/apache2/2.4/bin/httpd
 depend type=require fmri=__TBD \
-    pkg.debug.depend.file=usr/apr-util/1.5/lib/apr-util-1/apr_dbd_mysql.so
+    pkg.debug.depend.file=usr/apr-util/1.5/lib/$(MACH64)/apr-util-1/apr_dbd_mysql.so
 depend type=require fmri=__TBD \
-    pkg.debug.depend.file=usr/apr-util/1.5/lib/apr-util-1/apr_dbd_sqlite3.so
+    pkg.debug.depend.file=usr/apr-util/1.5/lib/$(MACH64)/apr-util-1/apr_dbd_sqlite3.so
--- a/components/apache24/apache-ldap.p5m	Tue Aug 23 08:27:57 2016 -0700
+++ b/components/apache24/apache-ldap.p5m	Tue Aug 23 02:13:19 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 # prevents "64bit file in 32bit path" errors
@@ -43,4 +43,4 @@
 license apache.license license="Apache v2.0"
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/apache2/2.4/bin/httpd
 depend type=require fmri=__TBD \
-    pkg.debug.depend.file=usr/apr-util/1.5/lib/apr-util-1/apr_ldap-1.so
+    pkg.debug.depend.file=usr/apr-util/1.5/lib/$(MACH64)/apr-util-1/apr_ldap-1.so
upstream/oracle/userland-gate