Date: Fri, 23 Nov 2007 11:58:10 +0200 From: Vasil Dimov <vd@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: portmgr@FreeBSD.org Subject: ports/118212: [patch] USE_LINUX is not defined if USE_LINUX_PREFIX and USE_LDCONFIG Message-ID: <20071123095810.GA55692@polejan.hw.v5d.org> Resent-Message-ID: <200711231000.lANA06eK034249@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118212
>Category: ports
>Synopsis: [patch] USE_LINUX is not defined if USE_LINUX_PREFIX and USE_LDCONFIG
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 23 10:00:06 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Vasil Dimov
>Release: FreeBSD 6.2-STABLE i386
>Organization:
N/A
>Environment:
>Description:
USE_LINUX is automatically defined when USE_LINUX_PREFIX and
INSTALLS_SHLIB are defined but it is not when USE_LDCONFIG is defined
instead of INSTALLS_SHLIB.
>How-To-Repeat:
(any port would do for the test, ports-mgmt/portsearch in this example)
% cd /usr/ports/ports-mgmt/portsearch
% make USE_LINUX_PREFIX=y INSTALLS_SHLIB=y -V USE_LINUX
yes
%
% make USE_LINUX_PREFIX=y USE_LDCONFIG=y -V USE_LINUX
%
After the fix:
% make USE_LINUX_PREFIX=y USE_LDCONFIG=y -V USE_LINUX
yes
%
>Fix:
--- bsd.port.mk-linux.diff begins here ---
--- bsd.port.mk.orig 2007-11-23 11:48:29.000000000 +0200
+++ bsd.port.mk 2007-11-23 11:51:32.000000000 +0200
@@ -468,7 +468,8 @@
# or a sound server which supports the FreeBSD native one),
# use the default or the X11 prefix if it's a leaf port
# (e.g. a game or program).
-# Implies NO_MTREE=yes, and, if INSTALLS_SHLIB is defined:
+# Implies NO_MTREE=yes, and, if INSTALLS_SHLIB
+# or USE_LDCONFIG is defined:
# - USE_LINUX=yes
# - appropriate invocation of the Linux ldconfig
# USE_LINUX_RPM - Set to yes to pull in variables and targets useful to Linux
@@ -1777,7 +1778,7 @@
. endif
.endif
-.if defined(USE_LINUX_PREFIX) && defined(INSTALLS_SHLIB)
+.if defined(USE_LINUX_PREFIX) && (defined(INSTALLS_SHLIB) || defined(USE_LDCONFIG))
# we need ${LINUXBASE}/sbin/ldconfig
USE_LINUX?= yes
.endif
--- bsd.port.mk-linux.diff ends here ---
--
Vasil Dimov
moc.elcaro@vomid.lisav Software Developer @ Oracle/Innobase Oy
gro.DSBeerF@dv Committer @ FreeBSD.org
gro.d5v@dv Home @ Sofia, Bulgaria
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071123095810.GA55692>