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