Commit bb23d227 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

vim: convert to autotargets, bump to version 7.2.446 



* Convert to autotargets package.
* Bump to version 7.2.446.

We fetch from svn to avoid having a ton of patch files.

This won't do us any good if we want vim 7.3 since the repository was
moved to mercurial. However 7.3 still has some cross-compile issues.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 1fdd8100

package/vim/configure.patch

deleted100644 → 0
+0 −19247

File deleted.

Preview size limit exceeded, changes collapsed.

package/vim/patches

deleted100644 → 0
+0 −300
Original line number Diff line number Diff line 
001

002

004

005

006

008

009

010

011

012

013

014

015

016

017

018

019

020

021

022

023

024

025

026

027

028

029

030

031

032

033

034

035

036

037

038

039

040

042

043

044

045

046

047

048

049

050

051

052

053

054

055

056

057

058

059

060

061

062

063

064

066

067

068

069

071

073

074

075

076

077

078

079

081

082

083

084

085

086

087

089

090

093

094

095

096

097

098

099

100

101

102

103

104

105

106

107

108

109

110

111

112

113

114

115

116

117

118

119

120

121

122

123

125

126ne

127

130

131

132

133

135

136

137

138

139

140

141

142

143

144

145

147

148

149

150

151

152

153

154

155

156

157

159

160

161

162

163

164

165

166

167

169

170

171

172

173

174

175

176

177

178

179

180

181

182

183

184

185

186

187

188

189

190

191

192

193

194

195

197

198

199

200

201

202

203

205

206

207

208

209

210

211

212

213

214

215

216

217

218

219

220

221

222

223

224

225

226

227

228

229

230

231

232

233

234

235

236

237

238

239

240

241

242

243

244

245

246

247

248

249

250

251

252

253

254

255

256

257

258

259

260

261

262

263

264

265

266

267

268

269

270

271

272

273

274

276

277

279

284

286

287

289

290

292

293

294

295

296

297

298

299

300

301

302

303

304

305

306

307

308

309

310

311

313

314

315

316

317

318

319

320

322

323

324

325

326

327

328

329

330

package/vim/vim.mk

+29 −77
Original line number Diff line number Diff line 
#############################################################

#

# Vim Text Editor

# vim

#

#############################################################

VIM_VERSION:=7.1

VIM_SOURCE:=vim-$(VIM_VERSION).tar.bz2

VIM_SITE:=http://ftp.vim.org/pub/vim

VIM_SOURCE_SITE:=$(VIM_SITE)/unix

VIM_PATCH_SITE:=$(VIM_SITE)/patches/7.1

VIM_DIR:=$(BUILD_DIR)/vim71

VIM_PATCHES:=$(shell sed -e 's:^:$(DL_DIR)/$(VIM_VERSION).:' package/vim/patches)

VIM_CONFIG_H:=$(VIM_DIR)/src/auto/config.h

VIM_CONFIG_MK:=$(VIM_DIR)/src/auto/config.mk



$(DL_DIR)/$(VIM_SOURCE):

	$(call DOWNLOAD,$(VIM_SOURCE_SITE),$(VIM_SOURCE))



$(DL_DIR)/$(VIM_VERSION).%:

	$(call DOWNLOAD,$(VIM_PATCH_SITE),$(notdir $@))



vim-source: $(DL_DIR)/$(VIM_SOURCE) $(VIM_PATCHES)



$(VIM_DIR)/.unpacked: $(DL_DIR)/$(VIM_SOURCE)

	$(BZCAT) $(DL_DIR)/$(VIM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

	touch $@



$(VIM_DIR)/.patched: $(VIM_DIR)/.unpacked

	@for i in $(VIM_PATCHES); do ( \

		echo "Patching with $$i"; \

		cd $(VIM_DIR); \

		patch -p0 < $$i) \

	done

	toolchain/patch-kernel.sh $(VIM_DIR) package/vim/ \*.patch

	touch $@



$(VIM_DIR)/.configured: $(VIM_DIR)/.patched

	(cd $(VIM_DIR)/src; \

		$(TARGET_CONFIGURE_OPTS) \

		$(TARGET_CONFIGURE_ARGS) \

		CFLAGS="$(TARGET_CFLAGS)" \

		STRIP="$(TARGET_STRIP)" \

		PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \

		PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \

		./configure $(QUIET) --prefix=/usr \

		--target=$(GNU_TARGET_NAME) \

		--host=$(GNU_TARGET_NAME) \

		--build=$(GNU_HOST_NAME) \

		--prefix=/usr \

		--sysconfdir=/etc \

		$(DISABLE_NLS) \

		--disable-netbeans \

		--disable-gpm \

		--disable-gui \

		--without-x \

		--with-tlib=ncurses \

	)

	touch $@

# svn r1889 == 7.2 release + patchlevel 446

VIM_SITE = https://vim.svn.sourceforge.net/svnroot/vim/branches/vim7.2

VIM_SITE_METHOD = svn

VIM_VERSION = 1889

VIM_DEPENDENCIES = ncurses

VIM_SUBDIR = src

VIM_CONF_ENV = vim_cv_toupper_broken=no \

		vim_cv_terminfo=yes \

		vim_cv_tty_group=world \

		vim_cv_tty_mode=0620 \

		vim_cv_getcwd_broken=no \

		vim_cv_stat_ignores_slash=yes \

		vim_cv_memmove_handles_overlap=yes \

		ac_cv_sizeof_int=4

VIM_CONF_OPT = --with-tlib=ncurses



define VIM_INSTALL_TARGET_CMDS

	cd $(@D)/src; \

		$(MAKE) DESTDIR=$(TARGET_DIR) installvimbin; \

		$(MAKE) DESTDIR=$(TARGET_DIR) installlinks

endef



$(VIM_DIR)/.build: $(VIM_DIR)/.configured

	(cd $(VIM_DIR)/src; \

		$(MAKE) \

	)

	touch $@

define VIM_INSTALL_RUNTIME_CMDS

	cd $(@D)/src; \

		$(MAKE) DESTDIR=$(TARGET_DIR) installrtbase; \

		$(MAKE) DESTDIR=$(TARGET_DIR) installmacros

endef



$(TARGET_DIR)/usr/bin/vim: $(VIM_DIR)/.build

	(cd $(VIM_DIR)/src; \

		$(MAKE) DESTDIR=$(TARGET_DIR) installvimbin; \

		$(MAKE) DESTDIR=$(TARGET_DIR) installlinks; \

	)

ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y)

	(cd $(VIM_DIR)/src; \

		$(MAKE) DESTDIR=$(TARGET_DIR) installrtbase; \

		$(MAKE) DESTDIR=$(TARGET_DIR) installmacros; \

	)

VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_RUNTIME_CMDS

endif



vim: host-pkg-config ncurses vim-source $(TARGET_DIR)/usr/bin/vim



#############################################################

#

# Toplevel Makefile options

#

#############################################################

ifeq ($(BR2_PACKAGE_VIM),y)

TARGETS+=vim

endif
 
$(eval $(call AUTOTARGETS,package,vim))