Merge pull request #8361 from jandelgado/add_udptunnel_package
[feed/packages.git] / libs / nss / patches / 003-openwrt_fix.patch
1 --- a/nss/lib/dbm/src/dirent.h 2017-10-19 17:15:14.797053528 +0300
2 +++ b/nss/lib/dbm/src/dirent.h 2017-10-19 17:15:26.156310432 +0300
3 @@ -30,7 +30,7 @@
4 #define MAXNAMLEN FILENAME_MAX
5
6 #else
7 -#include <param.h>
8 +#include <sys/param.h>
9 #endif
10 #endif
11
12 --- a/nss/coreconf/rules.mk 2019-03-31 22:39:06.741609534 +0300
13 +++ b/nss/coreconf/rules.mk 2019-03-31 22:36:13.260356949 +0300
14 @@ -261,7 +261,7 @@
15 ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
16 $(AR) $(subst /,\\,$(OBJS))
17 else
18 - $(AR) $(OBJS)
19 + $(AR) rcs $@ $(OBJS)
20 endif
21 $(RANLIB) $@
22
23 --- a/nss/coreconf/arch.mk 2019-03-31 23:38:34.374931416 +0300
24 +++ b/nss/coreconf/arch.mk 2019-03-31 23:38:44.667236102 +0300
25 @@ -305,7 +305,7 @@
26 OBJDIR_NAME_COMPILER = $(COMPILER_TAG)
27 endif
28 OBJDIR_NAME_BASE = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(OBJDIR_NAME_COMPILER)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG)
29 -OBJDIR_NAME = $(OBJDIR_NAME_BASE).OBJ
30 +OBJDIR_NAME = build_dir
31
32
33 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
34 --- a/nss/coreconf/Linux.mk 2019-04-01 10:08:59.129269177 +0300
35 +++ b/nss/coreconf/Linux.mk 2019-04-01 10:09:15.557782574 +0300
36 @@ -139,6 +139,7 @@
37 DEFINES += -D_REENTRANT
38 endif
39
40 +ifndef USE_NATIVE
41 DSO_CFLAGS = -fPIC
42 DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,--gc-sections
43 # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
44 @@ -149,6 +150,7 @@
45 ZDEFS_FLAG = -Wl,-z,defs
46 DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
47 LDFLAGS += $(ARCHFLAG) -z noexecstack
48 +endif
49
50 # On Maemo, we need to use the -rpath-link flag for even the standard system
51 # library directories.
52 --- a/nss/coreconf/Linux.mk 2019-04-01 23:10:19.091912203 +0300
53 +++ b/nss/coreconf/Linux.mk 2019-04-06 14:07:13.499169075 +0300
54 @@ -140,7 +140,7 @@
55 endif
56
57 ifndef USE_NATIVE
58 -DSO_CFLAGS = -fPIC
59 +DSO_CFLAGS = $(fpic)
60 DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,--gc-sections
61 # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
62 # incorrectly reports undefined references in the libraries we link with, so
63 --- a/nss/coreconf/Linux.mk 2019-04-06 20:25:36.431663894 +0300
64 +++ b/nss/coreconf/Linux.mk 2019-04-06 20:26:23.397129525 +0300
65 @@ -107,11 +107,6 @@
66 endif
67
68 ifdef BUILD_OPT
69 -ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
70 - OPTIMIZER = -Os
71 -else
72 - OPTIMIZER = -O2
73 -endif
74 ifdef MOZ_DEBUG_SYMBOLS
75 ifdef MOZ_DEBUG_FLAGS
76 OPTIMIZER += $(MOZ_DEBUG_FLAGS)
77 --- a/nss/coreconf/UNIX.mk 2019-04-06 20:34:24.284157646 +0300
78 +++ b/nss/coreconf/UNIX.mk 2019-04-06 20:34:34.760485327 +0300
79 @@ -10,7 +10,6 @@
80 LDOPTS += -L$(SOURCE_LIB_DIR)
81
82 ifdef BUILD_OPT
83 - OPTIMIZER += -O
84 DEFINES += -UDEBUG -DNDEBUG
85 else
86 OPTIMIZER += -g