0001-makedumpfile-replace-hardcode-CFLAGS.patch 4.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133
  1. From af97e2ad643334b4c7c3d66f971ce9ebb2b596af Mon Sep 17 00:00:00 2001
  2. From: Mingli Yu <mingli.yu@windriver.com>
  3. Date: Thu, 21 Jul 2016 18:06:21 +0800
  4. Subject: [PATCH] makedumpfile: replace hardcode CFLAGS
  5. * Create alias for target such as powerpc as powerpc32
  6. * Remove hardcode CFLAGS
  7. * Add CFLAGS_COMMON to instead of CFLAGS so can flexibly
  8. customize CFLAGS and not hardcode the CFLAGS as previously
  9. * Forcibly to link dynamic library as the poky build
  10. system doesn't build static library by default
  11. Upstream-Status: Inappropriate[oe specific]
  12. Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
  13. ---
  14. Makefile | 45 +++++++++++++++++++++++----------------------
  15. 1 file changed, 23 insertions(+), 22 deletions(-)
  16. Index: git/Makefile
  17. ===================================================================
  18. --- git.orig/Makefile
  19. +++ git/Makefile
  20. @@ -8,12 +8,6 @@ ifeq ($(strip $CC),)
  21. CC = gcc
  22. endif
  23. -CFLAGS_BASE := $(CFLAGS) -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \
  24. - -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
  25. -CFLAGS := $(CFLAGS_BASE) -DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(DATE)"'
  26. -CFLAGS_ARCH := $(CFLAGS_BASE)
  27. -# LDFLAGS = -L/usr/local/lib -I/usr/local/include
  28. -
  29. HOST_ARCH := $(shell uname -m)
  30. # Use TARGET as the target architecture if specified.
  31. # Defaults to uname -m
  32. @@ -21,29 +15,36 @@ ifeq ($(strip($TARGET)),)
  33. TARGET := $(HOST_ARCH)
  34. endif
  35. -ARCH := $(shell echo ${TARGET} | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \
  36. - -e s/arm.*/arm/ -e s/sa110/arm/ \
  37. - -e s/s390x/s390/ -e s/parisc64/parisc/ \
  38. - -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/)
  39. +ARCH := $(shell echo __${TARGET}__ | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \
  40. + -e s/arm.*/arm/ -e s/sa110/arm/ \
  41. + -e s/s390x/s390/ -e s/parisc64/parisc/ \
  42. + -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/ \
  43. + -e s/_powerpc_/_powerpc32_/)
  44. CROSS :=
  45. ifneq ($(TARGET), $(HOST_ARCH))
  46. CROSS := -U__$(HOST_ARCH)__
  47. endif
  48. -CFLAGS += -D__$(ARCH)__ $(CROSS)
  49. -CFLAGS_ARCH += -D__$(ARCH)__ $(CROSS)
  50. +CFLAGS_ARCH += -D$(ARCH) $(CROSS)
  51. -ifeq ($(ARCH), powerpc64)
  52. -CFLAGS += -m64
  53. +ifeq ($(ARCH), __powerpc64__)
  54. CFLAGS_ARCH += -m64
  55. endif
  56. -ifeq ($(ARCH), powerpc32)
  57. -CFLAGS += -m32
  58. +ifeq ($(ARCH), __powerpc32__)
  59. CFLAGS_ARCH += -m32
  60. endif
  61. +CFLAGS_ARCH += $(CFLAGS) \
  62. + -D_FILE_OFFSET_BITS=64 \
  63. + -D_LARGEFILE_SOURCE \
  64. + -D_LARGEFILE64_SOURCE
  65. +
  66. +CFLAGS_COMMON = $(CFLAGS_ARCH) \
  67. + -DVERSION='"$(VERSION)"' \
  68. + -DRELEASE_DATE='"$(DATE)"'
  69. +
  70. SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h
  71. SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c
  72. OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
  73. @@ -52,12 +53,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
  74. LIBS = -ldw -lbz2 -ldl -lelf -lz
  75. ifneq ($(LINKTYPE), dynamic)
  76. -LIBS := -static $(LIBS) -llzma
  77. +LIBS := $(LIBS) -llzma
  78. endif
  79. ifeq ($(USELZO), on)
  80. LIBS := -llzo2 $(LIBS)
  81. -CFLAGS += -DUSELZO
  82. +CFLAGS_COMMON += -DUSELZO
  83. endif
  84. ifeq ($(USESNAPPY), on)
  85. @@ -65,7 +66,7 @@ LIBS := -lsnappy $(LIBS)
  86. ifneq ($(LINKTYPE), dynamic)
  87. LIBS := $(LIBS) -lstdc++
  88. endif
  89. -CFLAGS += -DUSESNAPPY
  90. +CFLAGS_COMMON += -DUSESNAPPY
  91. endif
  92. LIBS := -lpthread $(LIBS)
  93. @@ -90,14 +91,14 @@ LIBS := $(LIBS) $(call try-run,\
  94. all: makedumpfile
  95. $(OBJ_PART): $(SRC_PART)
  96. - $(CC) $(CFLAGS) -c -o ./$@ $(VPATH)$(@:.o=.c)
  97. + $(CC) $(CFLAGS_COMMON) -c -o ./$@ $(VPATH)$(@:.o=.c)
  98. $(OBJ_ARCH): $(SRC_ARCH)
  99. @mkdir -p $(@D)
  100. $(CC) $(CFLAGS_ARCH) -c -o ./$@ $(VPATH)$(@:.o=.c)
  101. makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
  102. - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS)
  103. + $(CC) $(CFLAGS_COMMON) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS)
  104. echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8
  105. grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8
  106. mv temp.8 makedumpfile.8
  107. @@ -108,7 +109,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(
  108. gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz
  109. eppic_makedumpfile.so: extension_eppic.c
  110. - $(CC) $(CFLAGS) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo
  111. + $(CC) $(CFLAGS_COMMON) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo
  112. clean:
  113. rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz