Revision: 24998
http://sourceforge.net/p/gar/code/24998
Author: cgrzemba
Date: 2015-05-20 14:15:44 +0000 (Wed, 20 May 2015)
Log Message:
-----------
lang-java/jss/branches/fromfedora: redefine map file path
Modified Paths:
--------------
csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile
csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0026-SunOS5.mk.patch
Modified: csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile 2015-05-20
12:49:20 UTC (rev 24997)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/Makefile 2015-05-20
14:15:44 UTC (rev 24998)
@@ -85,8 +85,15 @@
DISTDIR = mozilla/security/jss
LICENSE = COPYING
-OBJ_PATH_32 = $(shell uname -s)$(GAROSREL)_$(shell uname -m)_$(GARFLAVOR).OBJ
-OBJ_PATH_64 = $(shell uname -s)$(GAROSREL)_$(shell uname
-m)_64_$(GARFLAVOR).OBJ
+OS_TEST := $(shell uname -m)
+ifeq ($(OS_TEST),i86pc)
+ OS_RELEASE := $(shell uname -r)_$(OS_TEST)
+else
+ OS_RELEASE := $(shell uname -r)
+endif
+
+OBJ_PATH_32 = $(shell uname -s)$(OS_RELEASE)_$(GARFLAVOR).OBJ
+OBJ_PATH_64 = $(shell uname -s)$(OS_RELEASE)_64_$(GARFLAVOR).OBJ
OBJ_PATH = $(OBJ_PATH_$(MEMORYMODEL_$(ISA)))
CONFIGURE_ARGS_OPT += BUILD_OPT=1
@@ -100,6 +107,7 @@
CONFIGURE_ARGS_64 += USE_64=1
CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL_$(ISA)))
CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
+EXTRA_DSO_LDOPTS = $(LINKER_MAPS) -B direct
CONFIGURE_SCRIPTS =
BUILD_SCRIPTS = jss
@@ -114,7 +122,7 @@
build-jss:
(cd $(WORKSRC) && \
gmake -C mozilla/security/coreconf $(CONFIGURE_ARGS) && \
- gmake -C mozilla/security/jss $(CONFIGURE_ARGS) && \
+ gmake -C mozilla/security/jss $(CONFIGURE_ARGS)
EXTRA_DSO_LDOPTS="$(EXTRA_DSO_LDOPTS)" && \
gmake -C mozilla/security/jss javadoc $(CONFIGURE_ARGS) )
@$(MAKECOOKIE)
Modified:
csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0026-SunOS5.mk.patch
===================================================================
--- csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0026-SunOS5.mk.patch
2015-05-20 12:49:20 UTC (rev 24997)
+++ csw/mgar/pkg/lang-java/jss/branches/fromfedora/files/0026-SunOS5.mk.patch
2015-05-20 14:15:44 UTC (rev 24998)
@@ -5,7 +5,7 @@
DSO_LDOPTS += -G -h $(notdir $@)
endif
-DSO_LDOPTS += -z combreloc -z defs -z ignore
-+DSO_LDOPTS += -R'/opt/csw/lib/$$ISALIST' -M
/home/grzemba/opencsw/.buildsys/v2/gar/lib/map.solaris10 -B direct -z combreloc
-z defs -z ignore
++DSO_LDOPTS += -R'/opt/csw/lib/$$ISALIST' $(EXTRA_DSO_LDOPTS) -z combreloc -z
defs -z ignore
# -KPIC generates position independent code for use in shared libraries.
# (Similarly for -fPIC in case of gcc.)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
