XDM build error (broken autoconf preprocessor test) when using clang as base c compiler (WITH_CLANG_IS_CC= in src.conf) Fix: Patch attached with submission follows:
Here's the same apporach taken by ports/166373. From a brief review clang-cpp damage is mostly cosmetic. I don't use xdm nor have /usr/bin/gcpp on my box but do have /usr/local/bin/cpp47 from lang/gcc47 (pulled as Fortran dependency).
Oops, extra newlines before shebang in scripts are hazardous.
Responsible Changed From-To: freebsd-ports-bugs->x11 Fix synopsis and assign.
A patch was just submitted to the experimental xorg repo, based on Jan Beich suggestion. It will be merged to the regular ports repo soon. -- Niclas Zeising
Author: zeising Date: Thu Sep 27 09:45:38 2012 New Revision: 304953 URL: http://svn.freebsd.org/changeset/ports/304953 Log: Fix build when clang is installed as cc (more specifically when clang-cpp is installed as cpp). This is done in a similar way as in other x11 ports with the same issue, see r301687 for details. PR: ports/172100 Submitted by: Oliver Pinter <oliver.pntr@gmail.com> (pr) Jan Beich <jbeich@tormail.org> (patch, based on) Approved by: miwi (mentor) Obtained from: xorg staging area Added: head/x11/xdm/files/patch-config-Makefile.in (contents, props changed) head/x11/xdm/files/patch-config-Xresources.cpp (contents, props changed) Modified: head/x11/xdm/Makefile Modified: head/x11/xdm/Makefile ============================================================================== --- head/x11/xdm/Makefile Thu Sep 27 09:03:05 2012 (r304952) +++ head/x11/xdm/Makefile Thu Sep 27 09:45:38 2012 (r304953) @@ -38,6 +38,8 @@ PLIST_SUB+= XDMSHELL="@comment " .endif post-patch: + @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e "s|XDMCONFIGDIR/|${PREFIX}/lib/X11/xdm/|" \ -e "s|XDMSCRIPTDIR/|${PREFIX}/lib/X11/xdm/|" \ ${WRKSRC}/config/xdm-config.cpp \ Added: head/x11/xdm/files/patch-config-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/xdm/files/patch-config-Makefile.in Thu Sep 27 09:45:38 2012 (r304953) @@ -0,0 +1,11 @@ +--- config/Makefile.in.orig 2012-09-27 10:37:59.000000000 +0200 ++++ config/Makefile.in 2012-09-27 10:38:41.000000000 +0200 +@@ -296,7 +296,7 @@ + # output lines with trailing backslashes. + # Allow XHASH to always be substituted, even in cases where XCOMM isn't. + CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ +- -e '/^\#line *[0-9][0-9]* *.*$$/d' \ ++ -e '/^$$/d' \ + -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \ + -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ + -e '/^[ ]*XHASH/s/XHASH/\#/' \ Added: head/x11/xdm/files/patch-config-Xresources.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/xdm/files/patch-config-Xresources.cpp Thu Sep 27 09:45:38 2012 (r304953) @@ -0,0 +1,14 @@ +--- config/Xresources.cpp.orig 2012-09-27 10:41:28.000000000 +0200 ++++ config/Xresources.cpp 2012-09-27 10:41:56.000000000 +0200 +@@ -60,9 +60,9 @@ + XHASHendif + #ifdef XPM + XHASHif PLANES >= 8 +-xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP ++xlogin*logoFileName: BITMAPDIR/XDM_PIXMAP + XHASHelse +-xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP ++xlogin*logoFileName: BITMAPDIR/XDM_BWPIXMAP + XHASHendif + xlogin*useShape: true + xlogin*logoPadding: 10 _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, with minor changes. Thanks!
On 9/27/12, Niclas Zeising <zeising@freebsd.org> wrote: > A patch was just submitted to the experimental xorg repo, based on Jan > Beich suggestion. It will be merged to the regular ports repo soon. Thanks! ;) > -- > Niclas Zeising >