diff options
author | lofi <lofi@FreeBSD.org> | 2004-05-24 08:34:38 +0800 |
---|---|---|
committer | lofi <lofi@FreeBSD.org> | 2004-05-24 08:34:38 +0800 |
commit | a3cee10973bd642b6db40ffd39b6f1a79e2246c0 (patch) | |
tree | 87374e3808f41098afd8df68f4e50d99e8e56051 /Mk/bsd.kde.mk | |
parent | 25f26f6c7b8bd4a506344e90eea55703b6b27257 (diff) | |
download | freebsd-ports-gnome-a3cee10973bd642b6db40ffd39b6f1a79e2246c0.tar.gz freebsd-ports-gnome-a3cee10973bd642b6db40ffd39b6f1a79e2246c0.tar.zst freebsd-ports-gnome-a3cee10973bd642b6db40ffd39b6f1a79e2246c0.zip |
Move the conftargethack into the USE_KDELIBS_VER section so users of
USE_QT_VER won't get it.
Breakage of doxygen reported by: pointyhat via kris
Diffstat (limited to 'Mk/bsd.kde.mk')
-rw-r--r-- | Mk/bsd.kde.mk | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index 93552a72d46e..22fdb5e2440c 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -60,7 +60,18 @@ USE_KDELIBS_VER=2 # USE_KDELIBS_VER section .if defined(USE_KDELIBS_VER) + +## This is needed for configure scripts to figure out +## which threads lib to use + CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" + +## XXX - This really belongs into bsd.port.mk +.if !defined(_NO_KDE_CONFTARGET_HACK) +CONFIGURE_TARGET= +CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +.endif + .if ${USE_KDELIBS_VER} == CVS LIB_DEPENDS+= kwalletbackend:${PORTSDIR}/x11/kdelibs USE_QT_VER= CVS @@ -164,12 +175,6 @@ CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-l${QTNAME}" \ # End of USE_QT_VER section -# XXX - This really belongs into bsd.port.mk -.if !defined(_NO_KDE_CONFTARGET_HACK) -CONFIGURE_TARGET= -CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -.endif - # Assemble plist from parts # <alane@freebsd.org> 2002-12-06 .if defined(KDE_BUILD_PLIST) |