Date: Fri, 14 Nov 2014 18:51:33 +0000 (UTC) From: Juergen Lock <nox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372572 - in head: comms/uartlirc/files emulators/kqemu-kmod-devel Message-ID: <201411141851.sAEIpXBH089776@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nox Date: Fri Nov 14 18:51:33 2014 New Revision: 372572 URL: https://svnweb.freebsd.org/changeset/ports/372572 QAT: https://qat.redports.org/buildarchive/r372572/ Log: (Attempt to) fix build on head after removal of @ symlink. (r274184) Submitted by: beefy1 via pkg-fallout Modified: head/comms/uartlirc/files/patch-Makefile head/emulators/kqemu-kmod-devel/Makefile Modified: head/comms/uartlirc/files/patch-Makefile ============================================================================== --- head/comms/uartlirc/files/patch-Makefile Fri Nov 14 18:34:00 2014 (r372571) +++ head/comms/uartlirc/files/patch-Makefile Fri Nov 14 18:51:33 2014 (r372572) @@ -1,15 +1,23 @@ --- Makefile.orig +++ Makefile -@@ -25,10 +25,10 @@ MFILES= dev/pccard/card_if.m dev/pccard/ - dev/ofw/ofw_bus_if.m isa/isa_if.m kern/bus_if.m \ +@@ -26,10 +26,10 @@ MFILES= dev/pccard/card_if.m dev/pccard/ kern/device_if.m kern/serdev_if.m --uartlirc_if.h: uartlirc_if.m -+uartlirc_if.h: uartlirc_if.m @ - ${AWK} -f @/tools/makeobjops.awk uartlirc_if.m -h + uartlirc_if.h: uartlirc_if.m +- ${AWK} -f @/tools/makeobjops.awk uartlirc_if.m -h ++ ${AWK} -f ${SYSDIR}/tools/makeobjops.awk uartlirc_if.m -h --uartlirc_if.c: uartlirc_if.m -+uartlirc_if.c: uartlirc_if.m @ - ${AWK} -f @/tools/makeobjops.awk uartlirc_if.m -c + uartlirc_if.c: uartlirc_if.m +- ${AWK} -f @/tools/makeobjops.awk uartlirc_if.m -c ++ ${AWK} -f ${SYSDIR}/tools/makeobjops.awk uartlirc_if.m -c devuart: + mkdir -p uart +@@ -43,6 +43,6 @@ devuart: + done + + clean: +- @-rm -r uart @ machine x86 *.bak *.o *.ko* *_if.[ch] pccarddevs.h ++ @-rm -r uart ${_ILINKS} *.bak *.orig *.o *.ko* *_if.[ch] pccarddevs.h + + .include <bsd.kmod.mk> Modified: head/emulators/kqemu-kmod-devel/Makefile ============================================================================== --- head/emulators/kqemu-kmod-devel/Makefile Fri Nov 14 18:34:00 2014 (r372571) +++ head/emulators/kqemu-kmod-devel/Makefile Fri Nov 14 18:51:33 2014 (r372572) @@ -60,7 +60,7 @@ post-patch: @${REINPLACE_CMD} -e '/CC=/s,gcc,${CC},' ${WRKSRC}/common/Makefile do-build: - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} beforedepend && ${LN} -sfh @/sys sys) + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} beforedepend && ${LN} -sfh machine/../../sys sys) @(cd ${BUILD_WRKSRC}/common; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${MAKE_CMD_ARGS} ${ALL_TARGET}) @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411141851.sAEIpXBH089776>