Date: Sat, 8 Oct 2011 18:23:20 +0300 From: Kostik Belousov <kostikbel@gmail.com> To: Stanislav Sedov <stas@freebsd.org> Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, Ed Schouten <ed@80386.nl>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org> Subject: Re: svn commit: r226122 - head/share/mk Message-ID: <20111008152320.GF1511@deviant.kiev.zoral.com.ua> In-Reply-To: <9549F7D2-F287-40B3-82A2-86D53C5ED667@FreeBSD.org> References: <201110072343.p97NhpFK032806@svn.freebsd.org> <20111008073318.GB91943@hoeg.nl> <9549F7D2-F287-40B3-82A2-86D53C5ED667@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Sat, Oct 08, 2011 at 08:02:43AM -0700, Stanislav Sedov wrote:
> On Oct 8, 2011, at 12:33 AM, Ed Schouten <ed@80386.nl> wrote:
>
> > Hi,
> >
> > * Stanislav Sedov <stas@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="$*"
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (FreeBSD)
iEYEARECAAYFAk6QaugACgkQC3+MBN1Mb4inXwCgvTvrj57L5Fg8LOQP75Z2vF//
2hAAmwQiAP7LnXWE8PEVl+o/SCzrGFd1
=1gNi
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111008152320.GF1511>