From 3519e1e528cbbc5f2f66e532ca4d374f6c07ad9b Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Tue, 19 Oct 2004 17:26:04 +0000 Subject: [PATCH] Stefan Fiedler: dietlibc: handle forked packages Index: package/base/dietlibc/config-350.in =================================================================== [2004100717300011057] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4552 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/dietlibc/config-350.in | 2 +- package/base/dietlibc/parse-config-9 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/base/dietlibc/config-350.in b/package/base/dietlibc/config-350.in index 106fbe252..f481a8b81 100644 --- a/package/base/dietlibc/config-350.in +++ b/package/base/dietlibc/config-350.in @@ -39,7 +39,7 @@ then for i in `grep " DIETLIBC " config/$config.$swpid/packages | \ cut -f5 -d" " | sort` do - x="${i//-/_}" ; x="${x//+/_}" + x="${i//-/_}" ; x="${x//+/_}" ; x="${x#*=}" bool "Build package with dietlibc: $i" \ "ROCKCFG_DIETLIBC_${x}" 0 done diff --git a/package/base/dietlibc/parse-config-9 b/package/base/dietlibc/parse-config-9 index b9347497f..96a420461 100644 --- a/package/base/dietlibc/parse-config-9 +++ b/package/base/dietlibc/parse-config-9 @@ -49,7 +49,7 @@ function add_lib () { if [ "$ROCKCFG_DIETLIBC_ALL" = 1 -o "$pkg" = "dietlibc" ]; then pkg_dietlibc_useit=1 else - x="${pkg//-/_}" ; x="${x//+/_}" + x="${pkg//-/_}" ; x="${x//+/_}" ; x="${x#*=}" eval "pkg_dietlibc_useit=\$ROCKCFG_DIETLIBC_${x}" fi [ "$pkg_dietlibc_useit" != 1 ] && pkg_dietlibc_useit=0