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.
22862718 pidgin-otr fails to build on userland nightly
authorRich Burridge <rich.burridge@oracle.com>
Thu, 10 Mar 2016 09:54:21 -0800
changeset 5575 14fbb1e121d8
parent 5574 9bd61b09c3ce
child 5576 33c794d84ba4
22862718 pidgin-otr fails to build on userland nightly
components/desktop/pidgin-otr/Makefile file | annotate | diff | comparison | revisions
components/desktop/pidgin-otr/pidgin-otr.p5m file | annotate | diff | comparison | revisions 
--- a/components/desktop/pidgin-otr/Makefile	Thu Mar 10 09:17:50 2016 -0800
+++ b/components/desktop/pidgin-otr/Makefile	Thu Mar 10 09:54:21 2016 -0800
@@ -57,11 +57,11 @@
 
 ASLR_MODE = $(ASLR_ENABLE)
 
-configure:	$(CONFIGURE_32_and_64)
+configure:	$(CONFIGURE_64)
 
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32_and_64)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
--- a/components/desktop/pidgin-otr/pidgin-otr.p5m	Thu Mar 10 09:17:50 2016 -0800
+++ b/components/desktop/pidgin-otr/pidgin-otr.p5m	Thu Mar 10 09:54:21 2016 -0800
@@ -37,7 +37,6 @@
     value=PSARC/2011/258
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/lib/$(MACH64)/pidgin/pidgin-otr.so
-file path=usr/lib/pidgin/pidgin-otr.so
 file path=usr/share/locale/ar/LC_MESSAGES/pidgin-otr.mo
 file path=usr/share/locale/cs/LC_MESSAGES/pidgin-otr.mo
 file path=usr/share/locale/de/LC_MESSAGES/pidgin-otr.mo
upstream/oracle/userland-gate