OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 2 Rev 3
1 # 1 #
2 # Copyright (C) 2006-2013 OpenWrt.org 2 # Copyright (C) 2006-2013 OpenWrt.org
3 # 3 #
4 # This is free software, licensed under the GNU General Public License v2. 4 # This is free software, licensed under the GNU General Public License v2.
5 # See /LICENSE for more information. 5 # See /LICENSE for more information.
6 # 6 #
7   7  
8 include $(TOPDIR)/rules.mk 8 include $(TOPDIR)/rules.mk
9   9  
10 PKG_NAME:=valgrind 10 PKG_NAME:=valgrind
11 PKG_VERSION:=3.14.0 11 PKG_VERSION:=3.13.0
12 PKG_RELEASE:=1 12 PKG_RELEASE:=1
13   13  
14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
15 PKG_SOURCE_URL:=http://sourceware.org/pub/valgrind/ 15 PKG_SOURCE_URL:=http://sourceware.org/pub/valgrind/
16 PKG_HASH:=037c11bfefd477cc6e9ebe8f193bb237fe397f7ce791b4a4ce3fa1c6a520baa5 16 PKG_HASH:=d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b
17   17  
18 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> 18 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
19 PKG_LICENSE:=GPL-2.0+ 19 PKG_LICENSE:=GPL-2.0+
20 PKG_CPE_ID:=cpe:/a:valgrind:valgrind 20 PKG_CPE_ID:=cpe:/a:valgrind:valgrind
21   21  
22 PKG_FIXUP = autoreconf 22 PKG_FIXUP = autoreconf
23 PKG_INSTALL := 1 23 PKG_INSTALL := 1
24 PKG_BUILD_PARALLEL := 1 24 PKG_BUILD_PARALLEL := 1
25 PKG_USE_MIPS16:=0 25 PKG_USE_MIPS16:=0
26 PKG_SSP:=0 26 PKG_SSP:=0
27   27  
28 include $(INCLUDE_DIR)/package.mk 28 include $(INCLUDE_DIR)/package.mk
29 include $(INCLUDE_DIR)/kernel.mk 29 include $(INCLUDE_DIR)/kernel.mk
30   30  
31 define Package/valgrind 31 define Package/valgrind
32 SECTION:=devel 32 SECTION:=devel
33 CATEGORY:=Development 33 CATEGORY:=Development
34 DEPENDS:=@mips||mipsel||i386||x86_64||powerpc||arm_v7 +libpthread +librt 34 DEPENDS:=@mips||mipsel||i386||x86_64||powerpc||arm_v7 +libpthread +librt
35 TITLE:=debugging and profiling tools for Linux 35 TITLE:=debugging and profiling tools for Linux
36 URL:=http://www.valgrind.org 36 URL:=http://www.valgrind.org
37 endef 37 endef
38   38  
39 define Package/valgrind/default 39 define Package/valgrind/default
40 $(Package/valgrind) 40 $(Package/valgrind)
41 DEPENDS := valgrind 41 DEPENDS := valgrind
42 endef 42 endef
43   43  
44 define Package/valgrind-cachegrind 44 define Package/valgrind-cachegrind
45 $(Package/valgrind/default) 45 $(Package/valgrind/default)
46 TITLE += (cache profiling) 46 TITLE += (cache profiling)
47 endef 47 endef
48   48  
49 define Package/valgrind-callgrind 49 define Package/valgrind-callgrind
50 $(Package/valgrind/default) 50 $(Package/valgrind/default)
51 TITLE += (callgraph profiling) 51 TITLE += (callgraph profiling)
52 endef 52 endef
53   53  
54 define Package/valgrind-drd 54 define Package/valgrind-drd
55 $(Package/valgrind/default) 55 $(Package/valgrind/default)
56 TITLE += (thread error detection) 56 TITLE += (thread error detection)
57 endef 57 endef
58   58  
59 define Package/valgrind-massif 59 define Package/valgrind-massif
60 $(Package/valgrind/default) 60 $(Package/valgrind/default)
61 TITLE += (heap profiling) 61 TITLE += (heap profiling)
62 endef 62 endef
63   63  
64 define Package/valgrind-helgrind 64 define Package/valgrind-helgrind
65 $(Package/valgrind/default) 65 $(Package/valgrind/default)
66 TITLE += (thread debugging) 66 TITLE += (thread debugging)
67 endef 67 endef
68   68  
69 define Package/valgrind-vgdb 69 define Package/valgrind-vgdb
70 $(Package/valgrind/default) 70 $(Package/valgrind/default)
71 TITLE += (GDB interface) 71 TITLE += (GDB interface)
72 endef 72 endef
73   73  
74 define Package/valgrind/description 74 define Package/valgrind/description
75 Valgrind is an award-winning suite of tools for debugging and 75 Valgrind is an award-winning suite of tools for debugging and
76 profiling Linux programs. With the tools that come with Valgrind, 76 profiling Linux programs. With the tools that come with Valgrind,
77 you can automatically detect many memory management and threading 77 you can automatically detect many memory management and threading
78 bugs, avoiding hours of frustrating bug-hunting, making your 78 bugs, avoiding hours of frustrating bug-hunting, making your
79 programs more stable. You can also perform detailed profiling, 79 programs more stable. You can also perform detailed profiling,
80 to speed up and reduce memory use of your programs. 80 to speed up and reduce memory use of your programs.
81 endef 81 endef
82   82  
83 CPU := $(patsubst x86_64,amd64,$(patsubst x86,i386,$(patsubst um,$(ARCH),$(LINUX_KARCH)))) 83 CPU := $(patsubst x86_64,amd64,$(patsubst x86,i386,$(patsubst um,$(ARCH),$(LINUX_KARCH))))
84   84  
85 CONFIGURE_VARS += \ 85 CONFIGURE_VARS += \
86 UNAME_R=$(LINUX_VERSION) 86 UNAME_R=$(LINUX_VERSION)
87   87  
88 ifeq ($(CONFIG_ARCH_64BIT),y) 88 ifeq ($(CONFIG_ARCH_64BIT),y)
89 CONFIGURE_ARGS += \ 89 CONFIGURE_ARGS += \
90 --enable-only64bit 90 --enable-only64bit
91 BITS := 64bit 91 BITS := 64bit
92 else 92 else
93 CONFIGURE_ARGS += \ 93 CONFIGURE_ARGS += \
94 --enable-only32bit 94 --enable-only32bit
95 BITS := 32bit 95 BITS := 32bit
96 endif 96 endif
97   97  
98 CONFIGURE_ARGS += \ 98 CONFIGURE_ARGS += \
99 --enable-tls \ 99 --enable-tls \
100 --without-x \ 100 --without-x \
101 --without-mpicc \ 101 --without-mpicc \
102 --without-uiout \ 102 --without-uiout \
103 --disable-valgrindmi \ 103 --disable-valgrindmi \
104 --disable-tui \ 104 --disable-tui \
105 --disable-valgrindtk \ 105 --disable-valgrindtk \
106 --without-included-gettext \ 106 --without-included-gettext \
107 --with-pagesize=4 \ 107 --with-pagesize=4 \
108 --enable-lto -  
109   108  
110 define Package/valgrind/install 109 define Package/valgrind/install
111 $(INSTALL_DIR) $(1)/usr/bin 110 $(INSTALL_DIR) $(1)/usr/bin
112 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/valgrind* $(1)/usr/bin/ 111 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/valgrind* $(1)/usr/bin/
113 $(INSTALL_DIR) $(1)/usr/lib/valgrind 112 $(INSTALL_DIR) $(1)/usr/lib/valgrind
114 $(CP) \ 113 $(CP) \
115 ./files/default.supp \ 114 ./files/default.supp \
116 $(PKG_INSTALL_DIR)/usr/lib/valgrind/none-* \ 115 $(PKG_INSTALL_DIR)/usr/lib/valgrind/none-* \
117 $(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_core*.so \ 116 $(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_core*.so \
118 $(PKG_INSTALL_DIR)/usr/lib/valgrind/$(BITS)-core*.xml \ 117 $(PKG_INSTALL_DIR)/usr/lib/valgrind/$(BITS)-core*.xml \
119 $(PKG_INSTALL_DIR)/usr/lib/valgrind/$(BITS)-linux*.xml \ 118 $(PKG_INSTALL_DIR)/usr/lib/valgrind/$(BITS)-linux*.xml \
120 $(PKG_INSTALL_DIR)/usr/lib/valgrind/memcheck-* \ 119 $(PKG_INSTALL_DIR)/usr/lib/valgrind/memcheck-* \
121 $(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_memcheck*.so \ 120 $(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_memcheck*.so \
122 $(1)/usr/lib/valgrind/ 121 $(1)/usr/lib/valgrind/
123   122  
124 ifneq ($(ARCH),aarch64) 123 ifneq ($(ARCH),aarch64)
125 $(CP) \ 124 $(CP) \
126 $(PKG_INSTALL_DIR)/usr/lib/valgrind/$(CPU)-*.xml \ 125 $(PKG_INSTALL_DIR)/usr/lib/valgrind/$(CPU)-*.xml \
127 $(1)/usr/lib/valgrind/ 126 $(1)/usr/lib/valgrind/
128 endif 127 endif
129 endef 128 endef
130   129  
131 define Package/valgrind-cachegrind/install 130 define Package/valgrind-cachegrind/install
132 $(INSTALL_DIR) $(1)/usr/bin 131 $(INSTALL_DIR) $(1)/usr/bin
133 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cg_* $(1)/usr/bin/ 132 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cg_* $(1)/usr/bin/
134 $(INSTALL_DIR) $(1)/usr/lib/valgrind 133 $(INSTALL_DIR) $(1)/usr/lib/valgrind
135 $(CP) \ 134 $(CP) \
136 $(PKG_INSTALL_DIR)/usr/lib/valgrind/cachegrind-* \ 135 $(PKG_INSTALL_DIR)/usr/lib/valgrind/cachegrind-* \
137 $(1)/usr/lib/valgrind/ 136 $(1)/usr/lib/valgrind/
138 endef 137 endef
139   138  
140 define Package/valgrind-callgrind/install 139 define Package/valgrind-callgrind/install
141 $(INSTALL_DIR) $(1)/usr/bin 140 $(INSTALL_DIR) $(1)/usr/bin
142 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/callgrind* $(1)/usr/bin/ 141 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/callgrind* $(1)/usr/bin/
143 $(INSTALL_DIR) $(1)/usr/lib/valgrind 142 $(INSTALL_DIR) $(1)/usr/lib/valgrind
144 $(CP) \ 143 $(CP) \
145 $(PKG_INSTALL_DIR)/usr/lib/valgrind/callgrind-* \ 144 $(PKG_INSTALL_DIR)/usr/lib/valgrind/callgrind-* \
146 $(1)/usr/lib/valgrind/ 145 $(1)/usr/lib/valgrind/
147 endef 146 endef
148   147  
149 define Package/valgrind-drd/install 148 define Package/valgrind-drd/install
150 $(INSTALL_DIR) $(1)/usr/lib/valgrind 149 $(INSTALL_DIR) $(1)/usr/lib/valgrind
151 $(CP) \ 150 $(CP) \
152 $(PKG_INSTALL_DIR)/usr/lib/valgrind/drd-* \ 151 $(PKG_INSTALL_DIR)/usr/lib/valgrind/drd-* \
153 $(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_drd*.so \ 152 $(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_drd*.so \
154 $(1)/usr/lib/valgrind/ 153 $(1)/usr/lib/valgrind/
155 endef 154 endef
156   155  
157 define Package/valgrind-massif/install 156 define Package/valgrind-massif/install
158 $(INSTALL_DIR) $(1)/usr/bin 157 $(INSTALL_DIR) $(1)/usr/bin
159 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ms_print $(1)/usr/bin/ 158 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ms_print $(1)/usr/bin/
160 $(INSTALL_DIR) $(1)/usr/lib/valgrind 159 $(INSTALL_DIR) $(1)/usr/lib/valgrind
161 $(CP) \ 160 $(CP) \
162 $(PKG_INSTALL_DIR)/usr/lib/valgrind/massif-* \ 161 $(PKG_INSTALL_DIR)/usr/lib/valgrind/massif-* \
163 $(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_massif*.so \ 162 $(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_massif*.so \
164 $(1)/usr/lib/valgrind/ 163 $(1)/usr/lib/valgrind/
165 endef 164 endef
166   165  
167 define Package/valgrind-helgrind/install 166 define Package/valgrind-helgrind/install
168 $(INSTALL_DIR) $(1)/usr/lib/valgrind 167 $(INSTALL_DIR) $(1)/usr/lib/valgrind
169 $(CP) \ 168 $(CP) \
170 $(PKG_INSTALL_DIR)/usr/lib/valgrind/helgrind-* \ 169 $(PKG_INSTALL_DIR)/usr/lib/valgrind/helgrind-* \
171 $(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_helgrind*.so \ 170 $(PKG_INSTALL_DIR)/usr/lib/valgrind/vgpreload_helgrind*.so \
172 $(1)/usr/lib/valgrind/ 171 $(1)/usr/lib/valgrind/
173 endef 172 endef
174   173  
175 define Package/valgrind-vgdb/install 174 define Package/valgrind-vgdb/install
176 $(INSTALL_DIR) $(1)/usr/bin 175 $(INSTALL_DIR) $(1)/usr/bin
177 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vgdb $(1)/usr/bin/ 176 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vgdb $(1)/usr/bin/
178 endef 177 endef
179   178  
180 $(eval $(call BuildPackage,valgrind)) 179 $(eval $(call BuildPackage,valgrind))
181 $(eval $(call BuildPackage,valgrind-cachegrind)) 180 $(eval $(call BuildPackage,valgrind-cachegrind))
182 $(eval $(call BuildPackage,valgrind-callgrind)) 181 $(eval $(call BuildPackage,valgrind-callgrind))
183 $(eval $(call BuildPackage,valgrind-drd)) 182 $(eval $(call BuildPackage,valgrind-drd))
184 $(eval $(call BuildPackage,valgrind-massif)) 183 $(eval $(call BuildPackage,valgrind-massif))
185 $(eval $(call BuildPackage,valgrind-helgrind)) 184 $(eval $(call BuildPackage,valgrind-helgrind))
186 $(eval $(call BuildPackage,valgrind-vgdb)) 185 $(eval $(call BuildPackage,valgrind-vgdb))
187   186