Re: svn commit: r309476 - head/include

2016-12-04 Thread John Baldwin 
On Saturday, December 03, 2016 05:29:12 AM Bryan Drewery wrote:
> Author: bdrewery
> Date: Sat Dec  3 05:29:12 2016
> New Revision: 309476
> URL: https://svnweb.freebsd.org/changeset/base/309476
> 
> Log:
>   Create the /usr/lib/include symlink as relative.
>   
>   This ugly code is done to avoid assuming LIBDIR is 2 components
>   deep.
>   
>   Reported by:jhb

Thanks!

For other folks: this broke the ability to use a DESTDIR installworld as
a --sysroot with a cross-compiler since the cross-compiler would follow
the /usr/include symlink in /usr/lib/include in the sysroot to the host's
/usr/include and end up using the host's headers.

-- 
John Baldwin
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r309476 - head/include

2016-12-02 Thread Bryan Drewery 
Author: bdrewery
Date: Sat Dec  3 05:29:12 2016
New Revision: 309476
URL: https://svnweb.freebsd.org/changeset/base/309476

Log:
  Create the /usr/lib/include symlink as relative.
  
  This ugly code is done to avoid assuming LIBDIR is 2 components
  deep.
  
  Reported by:  jhb

Modified:
  head/include/Makefile

Modified: head/include/Makefile
==
--- head/include/Makefile   Sat Dec  3 03:59:24 2016(r309475)
+++ head/include/Makefile   Sat Dec  3 05:29:12 2016(r309476)
@@ -108,7 +108,7 @@ NEWVERS_SH= ${SYSDIR}/conf/newvers.sh
 PARAM_H=   ${SYSDIR}/sys/param.h
 MK_OSRELDATE_SH=   ${.CURDIR}/mk-osreldate.sh
 
-SYMLINKS+= ${INCLUDEDIR} ${LIBDIR}/include
+SYMLINKS+= ${LIBDIR:C,[^/]+,..,g:C,^/,,}${INCLUDEDIR} ${LIBDIR}/include
 
 osreldate.h: ${NEWVERS_SH} ${PARAM_H} ${MK_OSRELDATE_SH}
env NEWVERS_SH=${NEWVERS_SH} PARAMFILE=${PARAM_H} SYSDIR=${SYSDIR} \
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"