Date: Mon, 29 Nov 2004 16:06:04 -0500 From: "Michael Johnson" <ahze@FreeBSD.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: advocacy/74536: [PATCH] bsd.port.mk -- Move .if defined(GNU_CONFIGURE) below .include .. bsd.autotools.mk Message-ID: <1101762364.0@blueheron.ahze.net> Resent-Message-ID: <200411292110.iATLARBO004320@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74536 >Category: advocacy >Synopsis: [PATCH] bsd.port.mk -- Move .if defined(GNU_CONFIGURE) below .include .. bsd.autotools.mk >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-advocacy >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Nov 29 21:10:26 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Michael Johnson >Release: FreeBSD 5.3-STABLE i386 >Organization: >Environment: System: FreeBSD 5.3-STABLE #70: Thu Nov 11 16:03:02 EST 2004 ahze@blueheron.ahze.net:/usr/obj/usr/src/sys/GreatBlueHeron >Description: This patch moves .if defined(GNU_CONFIGURE) below .include "${PORTSDIR}/Mk/bsd.autotools.mk" so it will work with USE/WITH_LIBTOOL_ since GNU_CONFIGURE is defined in bsd.autotools.mk >How-To-Repeat: >Fix: --- bsd.port.mk.patch begins here --- Index: bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.500 diff -u -r1.500 bsd.port.mk --- bsd.port.mk 19 Nov 2004 13:45:07 -0000 1.500 +++ bsd.port.mk 29 Nov 2004 01:24:03 -0000 @@ -1597,14 +1597,6 @@ .endif # Check for correct libs .endif # USE_MYSQL -.if defined(USE_XLIB) -LIB_DEPENDS+= X11.6:${X_LIBRARIES_PORT} -# Add explicit X options to avoid problems with false positives in configure -.if defined(GNU_CONFIGURE) -CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include -.endif -.endif - # XXX: (not yet): .if defined(USE_AUTOTOOLS) .include "${PORTSDIR}/Mk/bsd.autotools.mk" # XXX: (not yet): .endif @@ -1626,6 +1618,14 @@ USE_SUBMAKE= yes .endif +.if defined(USE_XLIB) +LIB_DEPENDS+= X11.6:${X_LIBRARIES_PORT} +# Add explicit X options to avoid problems with false positives in configure +.if defined(GNU_CONFIGURE) +CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include +.endif +.endif + # Set the default for the installation of Postscript(TM)- # compatible functionality. .if !defined(WITHOUT_X11) --- bsd.port.mk.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1101762364.0>