You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

86 lines
2.6 KiB

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