packages: vim/vim.spec - rel 3 - glibc fixed, hacks not needed anymore

[baggins]

Author: baggins                      Date: Thu Aug 19 07:52:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- glibc fixed, hacks not needed anymore

---- Files affected:
packages/vim:
   vim.spec (1.522 -> 1.523) 

---- Diffs:

================================================================
Index: packages/vim/vim.spec
diff -u packages/vim/vim.spec:1.522 packages/vim/vim.spec:1.523
--- packages/vim/vim.spec:1.522	Tue Aug 17 23:37:42 2010
+++ packages/vim/vim.spec	Thu Aug 19 09:52:05 2010
@@ -1,11 +1,6 @@
 # $Revision$, $Date$
 # TODO
 # - evim manuals not installed if no gui is built, move to -gui packages?
-# - fix glibc so that static work without hacks
-#
-# NOTE
-# - static package is not quite static, it must be linked with shared glibc
-#   because of glibc nss brokeness wrt all static linking (see TODO)
 #
 # Conditional build:
 %bcond_without	static		# don't build static version
@@ -46,7 +41,7 @@
 Summary(uk.UTF-8):	Visual editor IMproved - Єдино Вірний Редактор :)
 Name:		vim
 Version:	%{ver}.%{patchlevel}
-Release:	2
+Release:	3
 Epoch:		4
 License:	Charityware
 Group:		Applications/Editors/Vim
@@ -763,7 +758,6 @@
 build() {
 	set -x
 	local target=$1
-	local shlink
 	shift
 
 	%{__make} distclean
@@ -788,24 +782,11 @@
 		"$@"
 
 	%{__make} vim
-	# Hack around glibc brokeness wrt static linking and NSS (Name Service Shit)
-	if [ "$target" = "vim.static" ]; then
-		echo "s| -l\([^ ]\+\)| %{_libdir}/lib\1.a|g" >>auto/link.sed
-		rm -f vim
-		%{__make} vim
-		shlink=$(ldd ./vim | grep -v "linux-\(gate\|vdso\)\|libc.so\|ld-linux.*" || :)
-		if [ -n "$shlink" ]; then
-			echo "Looks like static link failed!"
-			echo "These libs should be linked static:"
-			echo $shlink
-			return 1
-		fi
-	fi
 	mv -f vim bin/$target
 }
 
 %if %{with static}
-#LDFLAGS="%{rpmldflags} -static"
+LDFLAGS="%{rpmldflags} -static"
 build vim.static \
 	--disable-gui \
 	--without-x \
@@ -819,7 +800,7 @@
 	--disable-multibyte \
 	--disable-nls
 
-#LDFLAGS="%{rpmldflags}"
+LDFLAGS="%{rpmldflags}"
 %endif
 
 build vim.ncurses \
@@ -1396,6 +1377,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.523  2010/08/19 07:52:05  baggins
+- rel 3
+- glibc fixed, hacks not needed anymore
+
 Revision 1.522  2010/08/17 21:37:42  adamg
 - drop ko.utf-8 locale; release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim/vim.spec?r1=1.522&r2=1.523&f=u