1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
--- misc/nss-3.13.5/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100
@@ -104,6 +104,9 @@
ifeq ($(OS_TARGET),WIN95)
NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
endif
+ifdef MACOS_SDK_DIR
+NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR)
+endif
ifdef USE_DEBUG_RTL
NSPR_CONFIGURE_OPTS += --enable-debug-rtl
endif
--- misc/nss-3.13.5/mozilla/nsprpub/configure
+++ misc/build/nss-3.13.5/mozilla/nsprpub/configure
@@ -3888,7 +3889,7 @@
fi
DSO_CFLAGS=-fPIC
- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @__________________________________________________OOO/$@ -headerpad_max_install_names'
_OPTIMIZE_FLAGS=-O2
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
STRIP="$STRIP -x -S"
--- misc/nss-3.13.5/mozilla/nsprpub/lib/ds/Makefile.in
+++ misc/build/nss-3.13.5/mozilla/nsprpub/lib/ds/Makefile.in
@@ -143,7 +143,7 @@
export:: $(TARGETS)
$(INSTALL) -m 444 $(HEADERS) $(dist_includedir)
- $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
+ $(INSTALL) -m 664 $(TARGETS) $(dist_libdir)
ifdef SHARED_LIBRARY
ifeq ($(OS_ARCH),HP-UX)
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
--- misc/nss-3.13.5/mozilla/nsprpub/lib/libc/src/Makefile.in
+++ misc/build/nss-3.13.5/mozilla/nsprpub/lib/libc/src/Makefile.in
@@ -144,7 +144,7 @@
#
export:: $(TARGETS)
- $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
+ $(INSTALL) -m 664 $(TARGETS) $(dist_libdir)
ifdef SHARED_LIBRARY
ifeq ($(OS_ARCH),HP-UX)
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
--- misc/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in
+++ misc/build/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in
@@ -365,7 +365,7 @@
#
build:: $(TARGETS)
- $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
+ $(INSTALL) -m 664 $(TARGETS) $(dist_libdir)
ifdef SHARED_LIBRARY
ifeq ($(OS_ARCH),HP-UX)
$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
--- misc/nss-3.13.5/mozilla/security/coreconf/Darwin.mk
+++ misc/build/nss-3.13.5/mozilla/security/coreconf/Darwin.mk
@@ -150,7 +150,7 @@
# May override this with different compatibility and current version numbers.
DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
# May override this with -bundle to create a loadable module.
-DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
+DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @__________________________________________________OOO/$(notdir $@) -headerpad_max_install_names
MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
DLL_SUFFIX = dylib
--- misc/nss-3.13.5/mozilla/security/coreconf/rules.mk
+++ misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk
@@ -342,7 +342,7 @@
chmod +x $@
ifeq ($(OS_TARGET),Darwin)
ifdef MAPFILE
- nmedit -s $(MAPFILE) $@
+ $(NMEDIT) -s $(MAPFILE) $@
endif
endif
endif
|
