Attachment #281435 for bug #376835

View | Details | Raw Unified | Return to bug 376835
Collapse All | Expand All




ifeq ($(BUILD_SUN_PKG), 1)
ifeq ($(USE_64), 1)
RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib64:/opt/sun/private/lib'
else
RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib'
endif
endif

OS_REL_CFLAGS   += -DLINUX2_1
MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)

ifdef MAPFILE
	MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
PROCESS_MAP_FILE = grep -v ';-' $< | \
        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@

ifeq ($(OS_RELEASE),2.4)
# Softoken 3.13 uses NO_FORK_CHECK only.
# Softoken 3.12 uses NO_FORK_CHECK and NO_CHECK_FORK.
# Don't use NO_CHECK_FORK in new code.
DEFINES += -DNO_FORK_CHECK -DNO_CHECK_FORK
endif




#       (dependent upon <architecture> tags)                          #
#                                                                     #
#       We are moving towards just having a $(OS_TARGET).mk file      #
#       as opposed to multiple $(OS_TARGET)$(OS_RELEASE).mk files,    #
#       one for each OS release.                                      #
#######################################################################

TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
              AIX RISCOS WINNT WIN95 WINCE Linux

ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
else
include $(CORE_DEPTH)/coreconf/$(OS_TARGET)$(OS_RELEASE).mk
endif

#######################################################################

Return to bug 376835

Lines 187-194 Link Here

(-)mozilla/security/coreconf/Linux.mk (+15 lines)
187	ifeq ($(BUILD_SUN_PKG), 1)	187	ifeq ($(BUILD_SUN_PKG), 1)
188	ifeq ($(USE_64), 1)	188	ifeq ($(USE_64), 1)
189	RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib64:/opt/sun/private/lib'	189	RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib64:/opt/sun/private/lib'
190	else	190	else
191	RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib'	191	RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib'
192	endif	192	endif
193	endif	193	endif
194		194
		195	OS_REL_CFLAGS += -DLINUX2_1
		196	MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
		197
		198	ifdef MAPFILE
		199	MKSHLIB += -Wl,--version-script,$(MAPFILE)
		200	endif
		201	PROCESS_MAP_FILE = grep -v ';-' $< \| \
		202	sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
		203
		204	ifeq ($(OS_RELEASE),2.4)
		205	# Softoken 3.13 uses NO_FORK_CHECK only.
		206	# Softoken 3.12 uses NO_FORK_CHECK and NO_CHECK_FORK.
		207	# Don't use NO_CHECK_FORK in new code.
		208	DEFINES += -DNO_FORK_CHECK -DNO_CHECK_FORK
		209	endif

Lines 58-74 Link Here

(-)mozilla/security/coreconf/config.mk (-1 / +1 lines)
58	# (dependent upon <architecture> tags) #	58	# (dependent upon <architecture> tags) #
59	# #	59	# #
60	# We are moving towards just having a $(OS_TARGET).mk file #	60	# We are moving towards just having a $(OS_TARGET).mk file #
61	# as opposed to multiple $(OS_TARGET)$(OS_RELEASE).mk files, #	61	# as opposed to multiple $(OS_TARGET)$(OS_RELEASE).mk files, #
62	# one for each OS release. #	62	# one for each OS release. #
63	#######################################################################	63	#######################################################################
64		64
65	TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \	65	TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
66	AIX RISCOS WINNT WIN95 WINCE	66	AIX RISCOS WINNT WIN95 WINCE Linux
67		67
68	ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))	68	ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
69	include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk	69	include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
70	else	70	else
71	include $(CORE_DEPTH)/coreconf/$(OS_TARGET)$(OS_RELEASE).mk	71	include $(CORE_DEPTH)/coreconf/$(OS_TARGET)$(OS_RELEASE).mk
72	endif	72	endif
73		73
74	#######################################################################	74	#######################################################################