svn commit: r226122 - head/share/mk

[Kostik Belousov]

On Sat, Oct 08, 2011 at 08:02:43AM -0700, Stanislav Sedov wrote:
> On Oct 8, 2011, at 12:33 AM, Ed Schouten <ed at 80386.nl> wrote:
> 
> > Hi,
> > 
> > * Stanislav Sedov <stas at FreeBSD.org>, 20111008 01:43:
> >>  - ${WRKSRC} might be missing when the autotools fixup is running.
> >>    Account for this.
> > 
> > Maybe we should simplify this a bit?
> 
> Sounds good!
> I didn't think about that way of ignoring the error code.

Can you, please, also add a check for uname -r being indeed 10.0-CURRENT,
before applying the hack ?

Also, the hack does not fix perl, I have to use the following patch.

diff --git a/hints/freebsd.sh b/hints/freebsd.sh
index c661fe8..caf93eb 100644
--- a/hints/freebsd.sh
+++ b/hints/freebsd.sh
@@ -110,11 +110,11 @@ esac
 case "$osvers" in
 0.*|1.0*) ;;
 
-1*|2*)	cccdlflags='-DPIC -fpic'
+1.*|2.*)	cccdlflags='-DPIC -fpic'
 	lddlflags="-Bshareable $lddlflags"
 	;;
 
-3*|4*|5*|6*)
+3.*|4.*|5.*|6.*)
         objformat=`/usr/bin/objformat`
         if [ x$objformat = xaout ]; then
             if [ -e /usr/lib/aout ]; then
@@ -140,7 +140,7 @@ case "$osvers" in
 esac
 
 case "$osvers" in
-0*|1*|2*|3*) ;;
+0*|1.*|2.*|3.*) ;;
 
 *)
 	ccflags="${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
@@ -261,7 +261,7 @@ EOM
 	esac
 
         case "$osvers" in
-        [1-4]*)
+        [1-4].*)
 	    set `echo X "$libswanted "| sed -e 's/ c / c_r /'`
 	    shift
 	    libswanted="$*"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20111008/daa0034a/attachment.pgp