wok annotate seamonkey/stuff/linux3.0.patch @ rev 12960

lostirc: update bdeps
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu May 31 20:20:10 2012 +0200 (2012-05-31)
parents
children
rev   line source
devl547@11335 1 Index: mozilla/security/coreconf/Linux.mk
devl547@11335 2 ===================================================================
devl547@11335 3 RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
devl547@11335 4 retrieving revision 1.48
devl547@11335 5 diff -u -8 -r1.48 Linux.mk
devl547@11335 6 --- mozilla/security/coreconf/Linux.mk 13 Aug 2010 01:31:13 -0000 1.48
devl547@11335 7 +++ mozilla/security/coreconf/Linux.mk 3 Jul 2011 06:00:38 -0000
devl547@11335 8 @@ -187,8 +187,20 @@
devl547@11335 9 ifeq ($(BUILD_SUN_PKG), 1)
devl547@11335 10 ifeq ($(USE_64), 1)
devl547@11335 11 RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib64:/opt/sun/private/lib'
devl547@11335 12 else
devl547@11335 13 RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib'
devl547@11335 14 endif
devl547@11335 15 endif
devl547@11335 16
devl547@11335 17 +OS_REL_CFLAGS += -DLINUX2_1
devl547@11335 18 +MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
devl547@11335 19 +
devl547@11335 20 +ifdef MAPFILE
devl547@11335 21 + MKSHLIB += -Wl,--version-script,$(MAPFILE)
devl547@11335 22 +endif
devl547@11335 23 +PROCESS_MAP_FILE = grep -v ';-' $< | \
devl547@11335 24 + sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
devl547@11335 25 +
devl547@11335 26 +ifeq ($(OS_RELEASE),2.4)
devl547@11335 27 +DEFINES += -DNO_FORK_CHECK
devl547@11335 28 +endif
devl547@11335 29 Index: mozilla/security/coreconf/config.mk
devl547@11335 30 ===================================================================
devl547@11335 31 RCS file: /cvsroot/mozilla/security/coreconf/config.mk,v
devl547@11335 32 retrieving revision 1.30
devl547@11335 33 diff -u -8 -r1.30 config.mk
devl547@11335 34 --- mozilla/security/coreconf/config.mk 25 Aug 2009 22:35:11 -0000 1.30
devl547@11335 35 +++ mozilla/security/coreconf/config.mk 3 Jul 2011 06:00:39 -0000
devl547@11335 36 @@ -58,17 +58,17 @@
devl547@11335 37 # (dependent upon <architecture> tags) #
devl547@11335 38 # #
devl547@11335 39 # We are moving towards just having a $(OS_TARGET).mk file #
devl547@11335 40 # as opposed to multiple $(OS_TARGET)$(OS_RELEASE).mk files, #
devl547@11335 41 # one for each OS release. #
devl547@11335 42 #######################################################################
devl547@11335 43
devl547@11335 44 TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
devl547@11335 45 - AIX RISCOS WINNT WIN95 WINCE
devl547@11335 46 + AIX RISCOS WINNT WIN95 WINCE Linux
devl547@11335 47
devl547@11335 48 ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
devl547@11335 49 include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
devl547@11335 50 else
devl547@11335 51 include $(CORE_DEPTH)/coreconf/$(OS_TARGET)$(OS_RELEASE).mk
devl547@11335 52 endif
devl547@11335 53
devl547@11335 54 #######################################################################