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.

103 lines
3.0 KiB

  1. From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001
  2. From: Mingli Yu <Mingli.Yu@windriver.com>
  3. Date: Fri, 16 Nov 2018 13:52:49 +0800
  4. Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME
  5. Remove _BUILD_STRING and _BUILD_TIME to avoid
  6. adding timestamp to _pl_bld.h which can result
  7. in adding timestamp in library file such as
  8. libnspr4.so.
  9. $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so
  10. [snip]
  11. 0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49
  12. [snip]
  13. Upstream-Status: Pending
  14. Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
  15. ---
  16. lib/ds/Makefile.in | 8 +-------
  17. lib/libc/src/Makefile.in | 8 +-------
  18. lib/prstreams/Makefile.in | 8 +-------
  19. pr/src/Makefile.in | 8 +-------
  20. 4 files changed, 4 insertions(+), 28 deletions(-)
  21. diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in
  22. index e737791..b578476 100644
  23. --- a/nspr/lib/ds/Makefile.in
  24. +++ b/nspr/lib/ds/Makefile.in
  25. @@ -110,13 +110,7 @@ GARBAGE += $(TINC)
  26. $(TINC):
  27. @$(MAKE_OBJDIR)
  28. - @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
  29. - @if test ! -z "$(SH_NOW)"; then \
  30. - $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
  31. - else \
  32. - true; \
  33. - fi
  34. - @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
  35. + @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
  36. $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
  37. diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in
  38. index e8a6d9f..978ed28 100644
  39. --- a/nspr/lib/libc/src/Makefile.in
  40. +++ b/nspr/lib/libc/src/Makefile.in
  41. @@ -112,13 +112,7 @@ GARBAGE += $(TINC)
  42. $(TINC):
  43. @$(MAKE_OBJDIR)
  44. - @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
  45. - @if test ! -z "$(SH_NOW)"; then \
  46. - $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
  47. - else \
  48. - true; \
  49. - fi
  50. - @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
  51. + @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
  52. $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
  53. diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in
  54. index aeb2944..f318097 100644
  55. --- a/nspr/lib/prstreams/Makefile.in
  56. +++ b/nspr/lib/prstreams/Makefile.in
  57. @@ -110,13 +110,7 @@ endif
  58. $(TINC):
  59. @$(MAKE_OBJDIR)
  60. - @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
  61. - @if test ! -z "$(SH_NOW)"; then \
  62. - $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
  63. - else \
  64. - true; \
  65. - fi
  66. - @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
  67. + @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
  68. $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
  69. diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
  70. index 19c5a69..b4ac31c 100644
  71. --- a/nspr/pr/src/Makefile.in
  72. +++ b/nspr/pr/src/Makefile.in
  73. @@ -310,13 +310,7 @@ GARBAGE += $(TINC)
  74. $(TINC):
  75. @$(MAKE_OBJDIR)
  76. - @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
  77. - @if test ! -z "$(SH_NOW)"; then \
  78. - $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
  79. - else \
  80. - true; \
  81. - fi
  82. - @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
  83. + @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
  84. $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC)
  85. --
  86. 2.7.4