# HG changeset patch # User Rich Burridge # Date 1453221643 28800 # Node ID 4bfb8e510e744392991824093727497d3ed2fa65 # Parent 1e576eedd4d2b71626acc866233670f689087111 22567061 libotr should be temporarily 32-bit and 64-bit diff -r 1e576eedd4d2 -r 4bfb8e510e74 components/desktop/libotr/Makefile --- a/components/desktop/libotr/Makefile Fri Jan 15 19:55:20 2016 -0800 +++ b/components/desktop/libotr/Makefile Tue Jan 19 08:40:43 2016 -0800 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk @@ -50,15 +50,17 @@ automake -a -c -f ; \ autoconf ) +CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin + CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" ASLR_MODE = $(ASLR_ENABLE) -configure: $(CONFIGURE_32) +configure: $(CONFIGURE_32_and_64) -build: $(BUILD_32) +build: $(BUILD_32_and_64) -install: $(INSTALL_32) +install: $(INSTALL_32_and_64) test: $(NO_TESTS) diff -r 1e576eedd4d2 -r 4bfb8e510e74 components/desktop/libotr/libotr.p5m --- a/components/desktop/libotr/libotr.p5m Fri Jan 15 19:55:20 2016 -0800 +++ b/components/desktop/libotr/libotr.p5m Tue Jan 19 08:40:43 2016 -0800 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. # default mangler.man.stability uncommitted> @@ -60,6 +60,10 @@ file path=usr/include/libotr/tlv.h file path=usr/include/libotr/userstate.h file path=usr/include/libotr/version.h +link path=usr/lib/$(MACH64)/libotr.so target=libotr.so.5.1.0 +link path=usr/lib/$(MACH64)/libotr.so.5 target=libotr.so.5.1.0 +file path=usr/lib/$(MACH64)/libotr.so.5.1.0 +file path=usr/lib/$(MACH64)/pkgconfig/libotr.pc link path=usr/lib/libotr.so target=libotr.so.5.1.0 link path=usr/lib/libotr.so.5 target=libotr.so.5.1.0 file path=usr/lib/libotr.so.5.1.0