diff options
Diffstat (limited to 'misc/rpm/patches/patch-ac')
| -rw-r--r-- | misc/rpm/patches/patch-ac | 66 |
1 files changed, 25 insertions, 41 deletions
diff --git a/misc/rpm/patches/patch-ac b/misc/rpm/patches/patch-ac index 66e66f0b97b..4dd5ae1f2aa 100644 --- a/misc/rpm/patches/patch-ac +++ b/misc/rpm/patches/patch-ac @@ -1,47 +1,31 @@ -$NetBSD: patch-ac,v 1.10 2004/07/24 04:43:10 grant Exp $ +$NetBSD: patch-ac,v 1.11 2013/09/13 12:41:32 ryoon Exp $ ---- configure.orig 1998-09-29 06:50:23.000000000 +1000 +--- configure.orig 2013-06-27 09:29:11.000000000 +0000 +++ configure -@@ -1565,7 +1565,6 @@ do - echo $ac_n "checking for $dir/lib in LIBS""... $ac_c" 1>&6 - echo "configure:1567: checking for $dir/lib in LIBS" >&5 - if test -d $dir/lib ; then -- addlib $dir/lib - echo "$ac_t""yes" 1>&6 - else - echo "$ac_t""no" 1>&6 -@@ -1574,7 +1573,6 @@ echo "configure:1567: checking for $dir/ - echo $ac_n "checking for $dir/include in INCPATH""... $ac_c" 1>&6 - echo "configure:1576: checking for $dir/include in INCPATH" >&5 - if test -d $dir/include ; then -- INCPATH="$INCPATH -I$dir/include" - echo "$ac_t""yes" 1>&6 - else - echo "$ac_t""no" 1>&6 -@@ -1584,12 +1582,11 @@ done - echo $ac_n "checking for /usr/ucblib in LIBS""... $ac_c" 1>&6 - echo "configure:1586: checking for /usr/ucblib in LIBS" >&5 - if test -d /usr/ucblib ; then -- if test "$build" = "mips-sni-sysv4" ; then -- addlib /usr/ccs/lib -lc -- fi -- -- addlib /usr/ucblib -- -+# if test "$build" = "mips-sni-sysv4" ; then -+# addlib /usr/ccs/lib -lc -+# fi -+# -+# addlib /usr/ucblib - echo "$ac_t""yes" 1>&6 +@@ -17093,7 +17093,7 @@ fi + if test "$cross_compiling" = "yes"; then + MYPATH=":" else - echo "$ac_t""no" 1>&6 -@@ -4065,7 +4062,7 @@ else - NBMAKEFILE= +- MYPATH=$PATH ++ MYPATH=$MYPATH fi --subdirs="popt" -+#subdirs="popt" + # Extract the first word of "7zip", so it can be a program name with args. +@@ -24310,7 +24310,7 @@ host_os_noversion=`echo "${host_os}" | s - trap '' 1 2 15 - cat > confcache <<\EOF + for provscript in ${host_cpu}-${host_os_exact}.prov ${host_os_exact}.prov ${host_os_major}.prov ${host_os_noversion}.prov none ; do { + if test -f ${srcdir}/autodeps/${provscript} ; then +- if [ ${provscript} == none ] ; then ++ if [ ${provscript} = none ] ; then + echo "*** no default provides information is available for ${host_os_noversion}" + else + echo "using ${srcdir}/autodeps/${provscript} for automatic provides generation" +@@ -24323,7 +24323,7 @@ for provscript in ${host_cpu}-${host_os_ + + for reqscript in ${host_cpu}-${host_os_exact}.req ${host_os_exact}.req ${host_os_major}.req ${host_os_noversion}.req none ; do { + if test -f ${srcdir}/autodeps/${reqscript} ; then +- if [ ${reqscript} == none ] ; then ++ if [ ${reqscript} = none ] ; then + echo "*** no default requires information is available for ${host_os_noversion}" + else + echo "using ${srcdir}/autodeps/${reqscript} for automatic requires generation" |