Attachment 609 Details for Bug 5364 – tcl-related changes

[patch] tcl-related changes

rpm-4_0-4.0.4-tclreqprov.patch (text/plain), 6.59 KB, created by Sergey Bolshakov on 2004-10-19 19:05:31 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Bolshakov

Created: 2004-10-19 19:05:31 MSD

Size: 6.59 KB

patch

obsolete

>diff -uNr rpm-4_0-4.0.4-orig/autodeps/linux.prov.in rpm-4_0-4.0.4/autodeps/linux.prov.in
>--- rpm-4_0-4.0.4-orig/autodeps/linux.prov.in	2004-06-28 02:00:51 +0400
>+++ rpm-4_0-4.0.4/autodeps/linux.prov.in	2004-10-16 14:15:30 +0400
>@@ -39,6 +39,7 @@
> FIND_PERL=
> FIND_PYTHON=
> FIND_SHELL=
>+FIND_TCL=
> 
> ParseMethod()
> {
>@@ -82,6 +83,12 @@
> 			nosh|noshell)
> 				FIND_SHELL=
> 				;;
>+			tcl)
>+				FIND_TCL=1
>+				;;
>+			notcl)
>+				FIND_TCL=
>+				;;
> 			all)
> 				FIND_LIBS=1
> 				FIND_PAM=1
>@@ -101,7 +108,7 @@
> }
> ParseMethod $RPM_FINDPROV_METHOD
> 
>-if [ -z "$FIND_LIBS" -a -z "$FIND_PAM" -a -z "$FIND_PERL" -a -z "$FIND_PYTHON" -a -z "$FIND_SHELL" ]; then
>+if [ -z "$FIND_LIBS" -a -z "$FIND_PAM" -a -z "$FIND_PERL" -a -z "$FIND_PYTHON" -a -z "$FIND_TCL" -a -z "$FIND_SHELL" ]; then
> 	# Nothing to do
> 	cat >/dev/null 2>&1
> 	exit 0
>@@ -121,6 +128,7 @@
> FOUND_PROVS=
> LIST_PERL=
> LIST_PYTHON=
>+LIST_TCL=
> 
> ListScriptProvs()
> {
>@@ -169,6 +177,13 @@
> $f"
> 		fi
> 	fi
>+
>+	if [ "${f##*/}" = "pkgIndex.tcl" ]; then
>+		if [ -n "$FIND_TCL" ]; then
>+			[ -z "$LIST_TCL" ] && LIST_TCL="$f" || LIST_TCL="$LIST_TCL
>+$f"
>+		fi
>+	fi
> }
> 
> FindPerlProvs()
>@@ -191,6 +206,17 @@
> $r"
> }
> 
>+FindTclProvs()
>+{
>+	[ -n "$FIND_TCL" -a -n "$LIST_TCL" ] || return 0
>+	[ -x "$RPM_TCLSH" ] || return 0
>+
>+	local r
>+	r="$(printf %s\\n "$LIST_TCL" |@RPMCONFIGDIR@/tcl.prov)" || return 1
>+	[ -z "$FOUND_PROVS" ] && FOUND_PROVS="$r" || FOUND_PROVS="$FOUND_PROVS
>+$r"
>+}
>+
> DEF_RPM_FINDPROV_LIB_PATH='/lib:/usr/lib:/usr/X11R6/lib'
> : ${RPM_FINDPROV_LIB_PATH:=$DEF_RPM_FINDPROV_LIB_PATH}
> 
>@@ -313,5 +339,8 @@
> # Find provides in listed python scripts and shared libraries, if any
> FindPythonProvs
> 
>+# Find provides in listed tcl index files, if any
>+FindTclProvs
>+
> # Finally sort and print them.
> printf %s "$FOUND_PROVS" |LC_COLLATE=C sort -u
>diff -uNr rpm-4_0-4.0.4-orig/autodeps/linux.req.in rpm-4_0-4.0.4/autodeps/linux.req.in
>--- rpm-4_0-4.0.4-orig/autodeps/linux.req.in	2004-05-17 18:56:07 +0400
>+++ rpm-4_0-4.0.4/autodeps/linux.req.in	2004-10-16 14:16:17 +0400
>@@ -48,6 +48,7 @@
> FIND_PYTHON=
> FIND_LIBPERL=
> FIND_SHELL=
>+FIND_TCL=
> libperl_so=
> 
> ParseMethod()
>@@ -63,6 +64,7 @@
> 				FIND_PYTHON=
> 				FIND_LIBPERL=
> 				FIND_SHELL=
>+				FIND_TCL=
> 				;;
> 			lib|library)
> 				FIND_LIBS=1
>@@ -108,6 +110,12 @@
> 			nosh|noshell)
> 				FIND_SHELL=
> 				;;
>+			tcl)
>+				FIND_TCL=1
>+				;;
>+			notcl)
>+				FIND_TCL=
>+				;;
> 			all)
> 				FIND_FILES=1
> 				FIND_LIBS=1
>@@ -116,6 +124,7 @@
> 				FIND_PERL=1
> 				FIND_LIBPERL=1
> 				FIND_SHELL=1
>+				FIND_TCL=1
> 				;;
> 			default|yes|true)
> 				ParseMethod $RPM_FINDREQ_DEFAULT_METHOD
>@@ -130,7 +139,7 @@
> ParseMethod $RPM_FINDREQ_METHOD
> 
> FIND_SCRIPT=
>-if [ -n "$FIND_SHELL" -o -n "$FIND_PERL" -o -n "$FIND_PAM" ]; then
>+if [ -n "$FIND_SHELL" -o -n "$FIND_PERL" -o -n "$FIND_PAM" -o -n "$FIND_TCL" ]; then
> 	FIND_SCRIPT=1
> fi
> 
>@@ -160,6 +169,7 @@
> FOUND_REQS=
> LIST_PERL=
> LIST_PYTHON=
>+LIST_TCL=
> 
> ListScriptReqs()
> {
>@@ -198,6 +208,11 @@
> 			[ -z "$LIST_PYTHON" ] && LIST_PYTHON="$f" || LIST_PYTHON="$LIST_PYTHON
> $f"
> 		fi
>+	elif [ -z "${f%%*.tcl}" ]; then
>+		if [ -n "$FIND_TCL" ]; then
>+			[ -z "$LIST_TCL" ] && LIST_TCL="$f" || LIST_TCL="$LIST_TCL
>+$f"
>+		fi
> 	fi
> }
> 
>@@ -222,6 +237,17 @@
> $r"
> }
> 
>+FindTclReqs()
>+{
>+	[ -n "$LIST_TCL" ] || return 0
>+	[ -x "$RPM_TCLSH" ] || return 0
>+
>+	local r
>+	r="$(printf %s\\n "$LIST_TCL" |@RPMCONFIGDIR@/tcl.req)" || return 1
>+	[ -z "$FOUND_REQS" ] && FOUND_REQS="$r" || FOUND_REQS="$FOUND_REQS
>+$r"
>+}
>+
> # Note this works for both a.out and ELF executables.
> # It also auto-generates requirements for scripts.
> 
>@@ -312,5 +338,8 @@
> # Find requires in listed python scripts, if any
> FindPythonReqs
> 
>+# Find requires in listed tcl scripts, if any
>+FindTclReqs
>+
> # Finally sort and print them.
> printf %s "$FOUND_REQS" |LC_COLLATE=C sort -u
>diff -uNr rpm-4_0-4.0.4-orig/platform.in rpm-4_0-4.0.4/platform.in
>--- rpm-4_0-4.0.4-orig/platform.in	2004-06-28 02:31:10 +0400
>+++ rpm-4_0-4.0.4/platform.in	2004-10-16 14:05:18 +0400
>@@ -233,11 +233,15 @@
> @alt@	%{?_python_compile_deep:export RPM_PYTHON_COMPILE_DEEP=\"%_python_compile_deep\"}\
> @alt@	%{?_python_compile_skip_x:export RPM_PYTHON_COMPILE_SKIP_X=\"%_python_compile_skip_x\"}\
> @alt@	%{?_python_compile_clean:export RPM_PYTHON_COMPILE_CLEAN=\"%_python_compile_clean\"}\
>+@alt@	%{?_tcl_lib_path:export RPM_TCL_LIB_PATH=\"%_tcl_lib_path\"}\
>+@alt@	%{?_tcl_req_method:export RPM_TCL_REQ_METHOD=\"%_tcl_req_method\"}\
>+@alt@	%{?_tcl_req_skip:export RPM_TCL_REQ_SKIP=\"%_tcl_req_skip\"}\
> @alt@	%{?_pkg_contents_index_all:export RPM_PKG_CONTENTS_INDEX_ALL=\"%_pkg_contents_index_all\"}\
> @alt@	%{?_pkg_contents_index_bin:export RPM_PKG_CONTENTS_INDEX_BIN=\"%_pkg_contents_index_bin\"}\
> @alt@	%{?_scripts_debug:export RPM_SCRIPTS_DEBUG=\"%_scripts_debug\"}\
> @alt@	%{?_keep_libtool_files:export RPM_KEEP_LIBTOOL_FILES=\"%_keep_libtool_files\"}\
> @alt@	%{?__python:export RPM_PYTHON=\"%__python\"}\
>+@alt@	%{?__tclsh:export RPM_TCLSH=\"%__tclsh\"}\
> @alt@	\
> @alt@	unset LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION LC_ALL ||:\
> @alt@	%{?_build_lang:export LANG=\"%_build_lang\"\
>@@ -413,10 +417,13 @@
> @alt@%_python_compile_deep	20
> @alt@%_python_compile_skip_x	1
> @alt@%_python_compile_clean	1
>+@alt@%_tcl_lib_path	""
>+@alt@%_tcl_req_method	normal
>+@alt@%_tcl_req_skip	""
> @alt@%_fixup_method	binconfig pkgconfig libtool
> @alt@%_strip_method	%{?_enable_debug:none}%{!?_enable_debug:executable shared}
>-@alt@%_findreq_default_method	files lib pam perl python shell
>-@alt@%_findprov_default_method	lib pam perl python shell
>+@alt@%_findreq_default_method	files lib pam perl python tcl shell
>+@alt@%_findprov_default_method	lib pam perl python tcl shell
> @alt@
> @alt@%_cleanup_topdir	%nil
> @alt@%_compress_topdir	%_usr
>@@ -444,6 +451,7 @@
> @alt@%set_perl_req_method()	%global _perl_req_method %*
> @alt@%set_python_req_method()	%global _python_req_method %1
> @alt@%set_python_compile_method()	%global _python_compile_method %1
>+@alt@%set_tcl_req_method()	%global _tcl_req_method %1
> @alt@
> @alt@%set_cleanup_topdir()	%global _cleanup_topdir %*
> @alt@%set_compress_topdir()	%global _compress_topdir %*
>@@ -475,6 +483,8 @@
> @alt@%add_python_lib_path()	%global _python_lib_path %_python_lib_path %*
> @alt@%add_python_compile_exclude() %global _python_compile_exclude %_python_compile_exclude %*
> @alt@%add_python_compile_include() %global _python_compile_include %_python_compile_include %*
>+@alt@%add_tcl_req_skip()	%global _tcl_req_skip %_tcl_req_skip %*
>+@alt@%add_tcl_lib_path()	%global _tcl_lib_path %_tcl_lib_path %*
> @alt@
> @alt@%add_findprov_lib_path()	%global _findprov_lib_path %_findprov_lib_path %*
> @alt@

Actions: View | Diff

Attachments on bug 5364: 609