Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Jun 2013 09:33:54 GMT
From:      "r4721@tormail.org" <r4721@tormail.org>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/179952: [patch] make emulators/kqemu-kmod-devel respect ${CC}
Message-ID:  <201306250933.r5P9XsC4025757@oldred.freebsd.org>
Resent-Message-ID: <201306250940.r5P9e0Hn041159@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         179952
>Category:       ports
>Synopsis:       [patch] make emulators/kqemu-kmod-devel respect ${CC}
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 25 09:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     r4721@tormail.org
>Release:        
>Organization:
>Environment:
>Description:
some work towards getting this port to build in a WITHOUT_GCC world.

* switch to new header style
* add LICENSE
* remove 7.x bug workarounds, freebsd 7 is no more supported
* respect ${CC} instead of using 'gcc'
* switch to optionsng
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: emulators/kqemu-kmod-devel/Makefile
===================================================================
--- emulators/kqemu-kmod-devel/Makefile	(revision 321722)
+++ emulators/kqemu-kmod-devel/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	kqemu-kmod
-# Date created:				2005/10/25
-# Whom:					nork@FreeBSD.org
-#
+# Created by: nork@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	kqemu
 PORTVERSION=	1.4.0.p1
@@ -20,6 +16,9 @@
 MAINTAINER=	nox@FreeBSD.org
 COMMENT=	Kernel Accelerator for QEMU CPU Emulator (development version)
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 ONLY_FOR_ARCHS=	i386 amd64
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -37,6 +36,7 @@
 PLIST_FILES+=	"@cwd /"
 PLIST_FILES+=	${KMODDIR:C,^/,,}/kqemu.ko
 PLIST_FILES+=	"@unexec kldxref ${KMODDIR}"
+PLIST_FILES+=	"@cwd ${PREFIX}"
 
 MAKEFILE=	Makefile.freebsd
 
@@ -56,28 +56,9 @@
 IGNORE=		requires kernel source to be installed
 .endif
 
-.if ${OSVERSION} >= 700024 && ${OSVERSION} < 700053 && !defined(NOKSE)
-# XXX this is wrong if you have `nooption KSE' in your kernel config,
-# please define NOKSE in that case (no longer a problem after attilio's
-# Sun Jul 22 21:35:44 2007 UTC commit removing the KSE ABI incompatiblity)
-CFLAGS+=	-DKSE
-.endif
+CFLAGS+=	${DEBUG_FLAGS}
 
-CFLAGS+=       ${DEBUG_FLAGS}
-
-post-extract:
-.if ${OSVERSION} >= 700024 && ${OSVERSION} < 700053 && !defined(NOKSE)
-	@${ECHO_MSG} "Compiling with -DKSE."
-	@${ECHO_MSG} "If this is wrong (i.e. you have \`nooption KSE' in your kernel config),"
-	@${ECHO_MSG} "then please define NOKSE."
-.endif
-
-# 7.1 and head have seperate gdts also on amd64 now so the tss fixup code
-# is no longer needed there
 post-patch:
-.if ${OSVERSION} >= 701100 && (${OSVERSION} < 800000 || ${OSVERSION} >= 800046)
-	@cd ${WRKSRC} && ${PATCH} -R --quiet < ${FILESDIR}/patch-tssworkaround
-.endif
 # Apply extra patches from the qemu-devel list; in the unlikely case that
 # these cause regressions please define WITHOUT_EXTRA_PATCHES and post
 # details about your host _and_ guest on freebsd-emulation@freebsd.org
@@ -87,6 +68,7 @@
 		${PATCH} -d ${WRKSRC} --quiet <$$i;\
 	done
 .endif
+	@${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)
@@ -97,7 +79,7 @@
 	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 	${MKDIR} ${PREFIX}/include/kqemu
 	${INSTALL_DATA} ${WRKSRC}/kqemu.h ${PREFIX}/include/kqemu
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/kqemu-doc.html ${WRKSRC}/kqemu-tech.html \
 		${DOCSDIR}


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306250933.r5P9XsC4025757>