Date: 05 Sep 2000 19:09:40 -0700 From: asami@FreeBSD.ORG (Satoshi - Ports Wraith - Asami) To: obrien@FreeBSD.ORG Cc: Akinori -Aki- MUSHA <knu@idaemons.org>, ports@FreeBSD.ORG, marcel@FreeBSD.ORG Subject: Re: USE_LINUX? Message-ID: <vqcg0ne9spn.fsf@silvia.hip.berkeley.edu> In-Reply-To: "David O'Brien"'s message of "Wed, 7 Jun 2000 10:12:34 -0700" References: <200006070819.BAA14744@silvia.hip.berkeley.edu> <86u2f5zy3g.wl@localhost.local.idaemons.org> <vqczooxn561.fsf@silvia.hip.berkeley.edu> <20000607101234.A80031@dragon.nuxi.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Sorry for the late reply, dug this out when I was looking at the
uncommitted patch to my bsd.port.mk....
* Date: Wed, 7 Jun 2000 10:12:34 -0700
* From: "David O'Brien" <obrien@FreeBSD.ORG>
* On Wed, Jun 07, 2000 at 03:42:30AM -0700, Satoshi - Ports Wraith - Asami wrote:
* > That's a good point. Speaking of which, I forgot to add
* > PREFIX=${LINUXBASE} to my previous patch.
* ....
* > +LINUXBASE?= ${DESTDIR}/compat/linux
*
* If I understand this right, I think this may be wrong. Won't this
* install Acroreader in /compat/linux rather than /usr/local ? Or will
* only things like the linux_devel port set USE_LINUX?
*
* > +.if defined(USE_LINUX)
* > +BUILD_DEPENDS= /compat/linux/sbin/ldconfig:${PORTSDIR}/emulators/linux_base
* > +RUN_DEPENDS= /compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/
*
* If you keep the above, should those be ${LINUXBASE} too? If not, maybe
* COMPATLINUXDIR needs to be created.
Ok, so what about the following? USE_LINUX_PREFIX will set USE_LINUX
and also change the PREFIX. USE_LINUX will only add the dependencies.
LINUXBASE is defined as /compat/linux.
Also, somebody more versed in Linux compat mode needs to check if the
dependencies are sufficient and also cook me up a nice
/etc/mtree/BSD.linux.dist. (Marcel? :)
===
Index: bsd.port.mk
===================================================================
RCS file: /usr/cvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.348
diff -u -r1.348 bsd.port.mk
--- bsd.port.mk 2000/08/25 19:50:45 1.348
+++ bsd.port.mk 2000/09/06 02:04:51
@@ -205,8 +205,10 @@
#
# X11BASE - Where X11 ports install things (default: /usr/X11R6).
# LOCALBASE - Where non-X11 ports install things (default: /usr/local).
+# LINUXBASE - Where Linux ports install things (default: /compat/linux).
# PREFIX - Where *this* port installs its files (default: ${X11BASE}
-# if USE_X_PREFIX is set, otherwise ${LOCALBASE}).
+# if USE_X_PREFIX is set, ${LINUXBASE} if USE_LINUX_PREFIX
+# is set, otherwise ${LOCALBASE}).
# MASTERDIR - Where the port finds patches, package files, etc. Define
# this is you have two or more ports that share most of the
# files (default: ${.CURDIR}).
@@ -401,8 +410,8 @@
# NO_MTREE - If set, will not invoke mtree from bsd.port.mk from
# the "install" target.
# MTREE_FILE - The name of the mtree file (default: /etc/mtree/BSD.x11.dist
-# if USE_X_PREFIX is set, /etc/mtree/BSD.local.dist
-# otherwise.)
+# if USE_X_PREFIX is set, /etc/mtree/BSD.linux.dist if
+# USE_LINUX_PREFIX is set, /etc/mtree/BSD.local.dist otherwise.)
# PLIST - Name of the `packing list' file (default: ${PKGDIR}/PLIST).
# Change this to ${WRKDIR}/PLIST or something if you
# need to write to it. (It is not a good idea for a port
@@ -548,6 +568,7 @@
.endif
LOCALBASE?= ${DESTDIR}/usr/local
X11BASE?= ${DESTDIR}/usr/X11R6
+LINUXBASE?= ${DESTDIR}/compat/linux
DISTDIR?= ${PORTSDIR}/distfiles
_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}
.if defined(USE_BZIP2)
@@ -606,8 +627,13 @@
.if defined(USE_X_PREFIX)
USE_XLIB= yes
.endif
+.if defined(USE_LINUX_PREFIX)
+USE_LINUX= yes
+.endif
.if defined(USE_X_PREFIX)
PREFIX?= ${X11BASE}
+.elif defined(USE_LINUX_PREFIX)
+PREFIX?= ${LINUXBASE}
.else
PREFIX?= ${LOCALBASE}
.endif
@@ -751,6 +783,11 @@
MAKE_ENV+= CC=${CC} CXX=${CXX}
.endif
+.if defined(USE_LINUX)
+BUILD_DEPENDS= ${LINUXBASE}/sbin/ldconfig:${PORTSDIR}/emulators/linux_base
+RUN_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
+.endif
+
.if defined(REQUIRES_MOTIF)
USE_XPM= yes
.if defined(PARALLEL_PACKAGE_BUILD)
===
Satoshi
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?vqcg0ne9spn.fsf>