22835346 wxwidgets files in /usr/bin should be 64-bit (revert config scripts)
authorPetr Sumbera <petr.sumbera@oracle.com>
Fri, 15 Apr 2016 00:25:15 -0700
changeset 5795 b6b9d57d2466
parent 5794 b6c18cf8ca81
child 5797 432ac76de3b0
22835346 wxwidgets files in /usr/bin should be 64-bit (revert config scripts)
components/wxwidgets/wxwidgets.p5m
--- a/components/wxwidgets/wxwidgets.p5m	Fri Apr 15 18:45:53 2016 -0700
+++ b/components/wxwidgets/wxwidgets.p5m	Fri Apr 15 00:25:15 2016 -0700
@@ -34,14 +34,11 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=LSARC/2008/476
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-link path=usr/bin/$(MACH32)/wx-config \
-    target=../../lib/wx/config/gtk2-unicode-release-2.8
-file usr/bin/wxrc path=usr/bin/$(MACH32)/wxrc
 link path=usr/bin/$(MACH64)/wx-config \
     target=../../lib/$(MACH64)/wx/config/gtk2-unicode-release-2.8
+# wx-config embeds 'bindir'; ensure wxrc exists in usr/bin/$(MACH64)
 link path=usr/bin/$(MACH64)/wxrc target=../wxrc
-link path=usr/bin/wx-config \
-    target=../lib/$(MACH64)/wx/config/gtk2-unicode-release-2.8
+link path=usr/bin/wx-config target=../lib/wx/config/gtk2-unicode-release-2.8
 file usr/bin/$(MACH64)/wxrc path=usr/bin/wxrc
 file path=usr/include/wx-2.8/wx/aboutdlg.h
 file path=usr/include/wx-2.8/wx/accel.h