Revision: 25917
http://sourceforge.net/p/gar/code/25917
Author: cgrzemba
Date: 2016-08-30 10:17:26 +0000 (Tue, 30 Aug 2016)
Log Message:
-----------
lang-java/jss/trunk: refine OBJ path for i386, relax check pkg overrides
Modified Paths:
--------------
csw/mgar/pkg/lang-java/jss/trunk/Makefile
Modified: csw/mgar/pkg/lang-java/jss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/jss/trunk/Makefile 2016-08-30 09:54:17 UTC (rev
25916)
+++ csw/mgar/pkg/lang-java/jss/trunk/Makefile 2016-08-30 10:17:26 UTC (rev
25917)
@@ -42,10 +42,8 @@
RUNTIME_DEP_PKGS_CSWjss4 += CSWlibnssdbm3
RUNTIME_DEP_PKGS_CSWjss4 += CSWlibfreebl3
RUNTIME_DEP_PKGS_CSWjss4 += CSWlibssl3
-CHECKPKG_OVERRIDES_CSWjss4 +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libjss4.so|soname=libjss4.so|pkgname=CSWjss4|expected=CSWlibjss4
-CHECKPKG_OVERRIDES_CSWjss4 +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libjss4.so|soname=libjss4.so|pkgname=CSWjss4|expected=CSWlibjss4
-CHECKPKG_OVERRIDES_CSWjss4 +=
soname-equals-filename|file=/opt/csw/lib/libjss4.so
-CHECKPKG_OVERRIDES_CSWjss4 +=
soname-equals-filename|file=/opt/csw/lib/sparcv9/libjss4.so
+CHECKPKG_OVERRIDES_CSWjss4 += shared-lib-pkgname-mismatch
+CHECKPKG_OVERRIDES_CSWjss4 += soname-equals-filename
CHECKPKG_OVERRIDES_CSWjss4 += surplus-dependency|CSWlibfreebl3
CHECKPKG_OVERRIDES_CSWjss4 += surplus-dependency|CSWlibnssdbm3
CHECKPKG_OVERRIDES_CSWjss4 += surplus-dependency|CSWlibsoftokn3
@@ -65,6 +63,7 @@
RELEASE_TREE=$(WORKDIR)/release
USE_64=$(if $(filter 64,$(MEMORYMODEL)),1,0)
MM_OBJ=$(if $(filter 64,$(MEMORYMODEL)),_64)
+GARCH_OBJ=$(if $(filter i386,$(GARCH)),_i86pc)
EXTRA_BUILD_EXPORTS += JAVA_HOME
EXTRA_BUILD_EXPORTS += NSPR_INCLUDE_DIR
@@ -101,5 +100,5 @@
@ginstall -d $(DESTDIR)$(datadir)/java
@ginstall -d $(DESTDIR)$(libdir)
@gcp -fp $(WORKDIR)/dist/release/no-policy/classes/xpclass.jar
$(DESTDIR)$(datadir)/java/$(CATALOGNAME_CSWjss4).jar
- @gcp -fp
$(WORKDIR)/dist/release/no-policy/SunOS5.10$(MM_OBJ)_OPT.OBJ/lib/lib$(CATALOGNAME_CSWjss4).so
$(DESTDIR)$(libdir)
+ @gcp -fp
$(WORKDIR)/dist/release/no-policy/SunOS5.10$(GARCH_OBJ)$(MM_OBJ)_OPT.OBJ/lib/lib$(CATALOGNAME_CSWjss4).so
$(DESTDIR)$(libdir)
@$(MAKECOOKIE)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
