respecting CC variable, CFLAGS, LDFLAGS, omiting -Werror, fixing links, bugs #240232 #243956 #260888

Package-Manager: portage-2.1.6.13/cvs/Linux i686

1 files changed, 77 insertions, 10 deletions

diff --git a/dev-libs/vrb/files/vrb-0.5.1-configure.patch b/dev-libs/vrb/files/vrb-0.5.1-configure.patch
index c1bf5ddebdef..281efa6850e9 100644
--- a/dev-libs/vrb/files/vrb-0.5.1-configure.patch
+++ b/dev-libs/vrb/files/vrb-0.5.1-configure.patch
@@ -1,17 +1,65 @@
---- configure.old	2007-03-08 21:38:59.000000000 +0530
-+++ configure	2007-03-08 21:42:37.000000000 +0530
-@@ -341,8 +341,8 @@
+diff -NrU5 vrb-0.5.1.original/configure vrb-0.5.1/configure
+--- vrb-0.5.1.original/configure	2009-08-05 19:22:47.000000000 -0600
++++ vrb-0.5.1/configure	2009-08-05 19:57:15.000000000 -0600
+@@ -314,11 +314,11 @@
+ #-----------------------------------------------------------------------------
+ unamem=$( uname -m | tr ' ' '_' )
+ unames=$( uname -s | tr ' ' '_' )
+ unamer=$( uname -r | tr ' ' '_' )
+ 
+-gcc="gcc"
++gcc=${CC}
+ 
+ lib_cp_cmd="${gcc}"
+ pgm_cp_cmd="${gcc}"
+ 
+ lib_cc_cmd="${gcc}"
+@@ -331,23 +331,23 @@
+ pgm_ld_cmd="${gcc}"
+ 
+ lib_def=( "${lib_def[@]}" "-DARCH_${unamem}" "-DARCH=${unamem}" )
+ pgm_def=( "${pgm_def[@]}" "-DARCH_${unamem}" "-DARCH=${unamem}" )
+ 
+-lib_warn=( -Werror -Wall -Wnested-externs -Wno-cast-qual -Wno-trigraphs -Wuninitialized -Wwrite-strings )
+-pgm_warn=( -Werror -Wall -Wnested-externs -Wno-cast-qual -Wno-trigraphs -Wuninitialized -Wwrite-strings )
++lib_warn=(  -Wall -Wnested-externs -Wno-cast-qual -Wno-trigraphs -Wuninitialized -Wwrite-strings )
++pgm_warn=(  -Wall -Wnested-externs -Wno-cast-qual -Wno-trigraphs -Wuninitialized -Wwrite-strings )
+ 
+ if [[ -n "${warninline}" ]]; then
+     lib_warn=( "${lib_warn[@]}" -Winline )
      pgm_warn=( "${pgm_warn[@]}" -Winline )
  fi
  
 -lib_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -fgnu-linker -frerun-loop-opt -finline -finline-functions -fmove-all-movables )
 -pgm_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -fgnu-linker -frerun-loop-opt -finline -finline-functions -fmove-all-movables )
-+lib_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -frerun-loop-opt -finline -finline-functions )
-+pgm_feat=( -fomit-frame-pointer -funsigned-char -funsigned-bitfields -frerun-loop-opt -finline -finline-functions )
++lib_feat="${CFLAGS} ${LDFLAGS}"
++pgm_feat="${CFLAGS} ${LDFLAGS}"
  
- lib_cp_opt=( -pipe )
- pgm_cp_opt=( -pipe )
-@@ -1268,7 +1268,7 @@
+-lib_cp_opt=( -pipe )
+-pgm_cp_opt=( -pipe )
++lib_cp_opt="${CFLAGS} ${LDFLAGS}"
++pgm_cp_opt="${CFLAGS} ${LDFLAGS}"
+ 
+ if [[ -n "${std}" ]]; then
+     lib_cp_opt=( "${lib_cp_opt[@]}" "-std=${std}" )
+     pgm_cp_opt=( "${pgm_cp_opt[@]}" "-std=${std}" )
+ fi
+@@ -375,11 +375,11 @@
+ if [[ -n "${as_verbose}" ]]; then
+     lib_as_opt=( -v "${lib_as_opt[@]}" )
+     pgm_as_opt=( -v "${pgm_as_opt[@]}" )
+ fi
+ 
+-lib_ld_opt=( -pipe -shared -nostdlib -nostartfiles )
++lib_ld_opt=("${CFLAGS} ${LDFLAGS}" -pipe -shared -nostdlib -nostartfiles)
+ pgm_ld_opt=( -pipe )
+ if [[ -n "${ld_verbose}" ]]; then
+     lib_ld_opt=( -v "${lib_ld_opt[@]}" )
+     pgm_ld_opt=( -v "${pgm_ld_opt[@]}" )
+ fi
+@@ -1266,11 +1266,11 @@
+ 	# Generate Makefile specs to compile library sources.
+ 	#----------------------------------------------------
  	class_product_src lib "${libname}" | while read srcname; do
  	    vmsg 9 "Generating Makefile section: lib ${libname} ${srcname}"
  	    srcdir=$( dirname "${srcname}" )
@@ -20,12 +68,31 @@
  	    objname=$( echo "${srcname}" | gawk -F/ '{print $NF;}' | gawk -F. 'BEGIN{OFS=".";}{$NF="o";print $0;}' )
  	    for lc in arlib solib; do
  		[[ "${lc}" = "arlib" ]] && libfeat=( -DARLIBRARY=1 )
-@@ -1398,7 +1398,7 @@
+ 		[[ "${lc}" = "solib" ]] && libfeat=( -DSOLIBRARY=1 -DfPIC=1 -fPIC )
+ 
+@@ -1352,11 +1352,11 @@
+ 	    echo -n " obj/${pgmclass}/${pgmname}/${objname}"
+ 	done
+ 	echo ""
+ 
+ 	# link, object files, libraries
+-	echo -n "${tab}\$(pgm_ld_cmd) \$(pgm_ld_opt) -o ${pgmclass}/${pgmname}"
++	echo -n "${tab}\$(pgm_ld_cmd) \$(CFLAGS) \$(LDFLAGS) \$(pgm_ld_opt) -o ${pgmclass}/${pgmname}"
+ 	class_product_obj "${pgmclass}" "${pgmname}" | while read objname; do
+ 	    echo -n " obj/${pgmclass}/${pgmname}/${objname}"
+ 	done
+ 	if [[ -z "${nosolib}" && -n "${execdynamic}" ]]; then
+ 	    echo -n " -L./lib"
+@@ -1396,11 +1396,11 @@
+ 
+ 	# compile each source file for each object needed by this executable
  	class_product_src "${pgmclass}" "${pgmname}" | while read srcname; do
  	    vmsg 9 "Generating Makefile section: ${pgmclass} ${pgmname} ${srcname}"
  	    srcdir=$( dirname "${srcname}" )
 -	    srcref="-I ${srcdir} -I ${source}/include -I- -I ./include ${srcname}"
 + 	    srcref="-iquote ${srcdir} -iquote ${source}/include -I ./include ${srcname}"
-	    objname=$( echo "${srcname}" | gawk -F/ '{print $NF;}' | gawk -F. 'BEGIN{OFS=".";}{$NF="o";print $0;}' )
+ 	    objname=$( echo "${srcname}" | gawk -F/ '{print $NF;}' | gawk -F. 'BEGIN{OFS=".";}{$NF="o";print $0;}' )
  	    echo "obj/${pgmclass}/${pgmname}/${objname}: ${srcname}"
  	    if [[ -n "${asm}" ]]; then
+ 		if [[ -n "${cpp}" ]]; then
+ 		    cppname=$( echo "${objname}" | gawk -F. 'BEGIN{OFS=".";}{$NF="i";print $0;}' )